Skip to content

[improvement](statistics)Use min row count of all replicas as tablet/table row count. #41894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2024
Merged

[improvement](statistics)Use min row count of all replicas as tablet/table row count. #41894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,23 @@ public long getRowCount(boolean singleReplica) {
return singleReplica ? Double.valueOf(s.average().orElse(0)).longValue() : s.sum();
}

// Get the least row count among all valid replicas.
// The replica with the least row count is the most accurate one. Because it performs most compaction.
public long getMinReplicaRowCount(long version) {
long minRowCount = Long.MAX_VALUE;
long maxReplicaVersion = 0;
for (Replica r : replicas) {
if (r.isAlive()
&& r.checkVersionCatchUp(version, false)
&& (r.getVersion() > maxReplicaVersion
|| r.getVersion() == maxReplicaVersion && r.getRowCount() < minRowCount)) {
minRowCount = r.getRowCount();
maxReplicaVersion = r.getVersion();
}
}
return minRowCount == Long.MAX_VALUE ? 0 : minRowCount;
}

/**
* A replica is healthy only if
* 1. the backend is available
Expand Down
11 changes: 9 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,18 @@ protected void runAfterCatalogReady() {
Long tabletDataSize = 0L;
Long tabletRemoteDataSize = 0L;

Long tabletRowCount = 0L;
Long tabletRowCount = Long.MAX_VALUE;

boolean tabletReported = false;
for (Replica replica : tablet.getReplicas()) {
LOG.debug("Table {} replica {} current version {}, report version {}",
olapTable.getName(), replica.getId(),
replica.getVersion(), replica.getLastReportVersion());
// Replica with less row count is more accurate than the others
// when replicas' version are identical. Because less row count
// means this replica does more compaction than the others.
if (replica.checkVersionCatchUp(version, false)
&& replica.getRowCount() >= tabletRowCount) {
&& replica.getRowCount() < tabletRowCount) {
// 1. If replica version and reported replica version are all equal to
// PARTITION_INIT_VERSION, set tabletReported to true, which indicates this
// tablet is empty for sure when previous report.
Expand Down Expand Up @@ -173,6 +176,10 @@ protected void runAfterCatalogReady() {
tableDataSize += tabletDataSize;
tableRemoteDataSize += tabletRemoteDataSize;

// When all BEs are down, avoid set Long.MAX_VALUE to index and table row count. Use 0.
if (tabletRowCount == Long.MAX_VALUE) {
tabletRowCount = 0L;
}
tableRowCount += tabletRowCount;
indexRowCount += tabletRowCount;
// Only when all tablets of this index are reported, we set indexReported to true.
Expand Down
5 changes: 3 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/statistics/OlapAnalysisTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ protected ResultRow collectBasicStat() {
Map<String, String> params = buildSqlParams();
StringSubstitutor stringSubstitutor = new StringSubstitutor(params);
String sql = stringSubstitutor.replace(BASIC_STATS_TEMPLATE);
ResultRow resultRow = null;
ResultRow resultRow;
try (AutoCloseConnectContext r = StatisticsUtil.buildConnectContext(false)) {
stmtExecutor = new StmtExecutor(r.connectContext, sql);
resultRow = stmtExecutor.executeInternalQuery().get(0);
Expand Down Expand Up @@ -321,7 +321,8 @@ protected Pair<List<Long>, Long> calcActualSampleTablets(boolean forPartitionCol
int seekTid = (int) ((i + seek) % ids.size());
long tabletId = ids.get(seekTid);
sampleTabletIds.add(tabletId);
actualSampledRowCount += materializedIndex.getTablet(tabletId).getRowCount(true);
actualSampledRowCount += materializedIndex.getTablet(tabletId)
.getMinReplicaRowCount(p.getVisibleVersion());
if (actualSampledRowCount >= sampleRows && !forPartitionColumn) {
enough = true;
break;
Expand Down
36 changes: 36 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/catalog/TabletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,40 @@ public void testTabletColocateHealthStatus() {
Pair.of(1L, false), Pair.of(2L, false), Pair.of(3L, false), Pair.of(4L, true)
);
}

@Test
public void testGetMinReplicaRowCount() {
Tablet t = new Tablet(1);
long row = t.getMinReplicaRowCount(1);
Assert.assertEquals(0, row);

Replica r1 = new Replica(1, 1, 10, 0, 0, 0, 100, ReplicaState.NORMAL, 0, 10);
t.addReplica(r1);
row = t.getMinReplicaRowCount(10);
Assert.assertEquals(100, row);

row = t.getMinReplicaRowCount(11);
Assert.assertEquals(0, row);

Replica r2 = new Replica(2, 2, 10, 0, 0, 0, 110, ReplicaState.NORMAL, 0, 10);
Replica r3 = new Replica(3, 3, 10, 0, 0, 0, 90, ReplicaState.NORMAL, 0, 10);
t.addReplica(r2);
t.addReplica(r3);
row = t.getMinReplicaRowCount(11);
Assert.assertEquals(0, row);
row = t.getMinReplicaRowCount(9);
Assert.assertEquals(90, row);

r3.setBad(true);
row = t.getMinReplicaRowCount(9);
Assert.assertEquals(100, row);

r3.setBad(false);
row = t.getMinReplicaRowCount(9);
Assert.assertEquals(90, row);

r2.updateVersion(11);
row = t.getMinReplicaRowCount(9);
Assert.assertEquals(110, row);
}
}
Loading