This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 84c1f5692e [Fix](autobucket) use single replica partition size to calc
bucket number #24045
84c1f5692e is described below
commit 84c1f5692e1d50fe3cbcf6e53c6009995cc68d43
Author: camby <zhuxiaol...@baidu.com>
AuthorDate: Fri Sep 8 14:54:02 2023 +0800
[Fix](autobucket) use single replica partition size to calc bucket number
#24045
---
.../src/main/java/org/apache/doris/analysis/ShowDataStmt.java | 2 +-
.../src/main/java/org/apache/doris/catalog/MaterializedIndex.java | 4 ++--
fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java | 6 +++---
fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java | 8 ++++----
.../java/org/apache/doris/clone/DynamicPartitionScheduler.java | 2 +-
.../main/java/org/apache/doris/common/proc/PartitionsProcDir.java | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java
index 1f7fe5d2b0..ac359d1eb7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowDataStmt.java
@@ -264,7 +264,7 @@ public class ShowDataStmt extends ShowStmt {
long indexRemoteSize = 0;
for (Partition partition : olapTable.getAllPartitions()) {
MaterializedIndex mIndex = partition.getIndex(indexId);
- indexSize += mIndex.getDataSize();
+ indexSize += mIndex.getDataSize(false);
indexReplicaCount += mIndex.getReplicaCount();
indexRowCount += mIndex.getRowCount();
indexRemoteSize += mIndex.getRemoteDataSize();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndex.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndex.java
index bcd8128f30..094aebc6fc 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndex.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MaterializedIndex.java
@@ -171,10 +171,10 @@ public class MaterializedIndex extends MetaObject
implements Writable, GsonPostP
this.rollupFinishedVersion = -1L;
}
- public long getDataSize() {
+ public long getDataSize(boolean singleReplica) {
long dataSize = 0;
for (Tablet tablet : getTablets()) {
- dataSize += tablet.getDataSize(false);
+ dataSize += tablet.getDataSize(singleReplica);
}
return dataSize;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index b94440225b..290a6dd660 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -1167,7 +1167,7 @@ public class OlapTable extends Table {
long dataSize = 0;
for (Map.Entry<Long, Partition> entry : idToPartition.entrySet()) {
rowCount += entry.getValue().getBaseIndex().getRowCount();
- dataSize += entry.getValue().getBaseIndex().getDataSize();
+ dataSize += entry.getValue().getBaseIndex().getDataSize(false);
}
if (rowCount > 0) {
return dataSize / rowCount;
@@ -1180,7 +1180,7 @@ public class OlapTable extends Table {
public long getDataLength() {
long dataSize = 0;
for (Map.Entry<Long, Partition> entry : idToPartition.entrySet()) {
- dataSize += entry.getValue().getBaseIndex().getDataSize();
+ dataSize += entry.getValue().getBaseIndex().getDataSize(false);
}
return dataSize;
}
@@ -1556,7 +1556,7 @@ public class OlapTable extends Table {
public long getDataSize() {
long dataSize = 0;
for (Partition partition : getAllPartitions()) {
- dataSize += partition.getDataSize();
+ dataSize += partition.getDataSize(false);
}
return dataSize;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
index 53eb659735..a970d1798d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java
@@ -253,15 +253,15 @@ public class Partition extends MetaObject implements
Writable {
return indices;
}
- public long getAllDataSize() {
- return getDataSize() + getRemoteDataSize();
+ public long getAllDataSize(boolean singleReplica) {
+ return getDataSize(singleReplica) + getRemoteDataSize();
}
// this is local data size
- public long getDataSize() {
+ public long getDataSize(boolean singleReplica) {
long dataSize = 0;
for (MaterializedIndex mIndex :
getMaterializedIndices(IndexExtState.VISIBLE)) {
- dataSize += mIndex.getDataSize();
+ dataSize += mIndex.getDataSize(singleReplica);
}
return dataSize;
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java
b/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java
index 191cc529bf..53f44070d9 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java
@@ -210,7 +210,7 @@ public class DynamicPartitionScheduler extends MasterDaemon
{
ArrayList<Long> partitionSizeArray = Lists.newArrayList();
for (Partition partition : partitions) {
if (partition.getVisibleVersion() >= 2) {
- partitionSizeArray.add(partition.getAllDataSize());
+ partitionSizeArray.add(partition.getAllDataSize(true));
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/PartitionsProcDir.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/PartitionsProcDir.java
index 95878c9208..11dd8d4c18 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/PartitionsProcDir.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/PartitionsProcDir.java
@@ -292,7 +292,7 @@ public class PartitionsProcDir implements ProcDirInterface {
partitionInfo.add(TimeUtils.longToTimeString(partition.getLastCheckTime()));
- long dataSize = partition.getDataSize();
+ long dataSize = partition.getDataSize(false);
Pair<Double, String> sizePair =
DebugUtil.getByteUint(dataSize);
String readableSize =
DebugUtil.DECIMAL_FORMAT_SCALE_3.format(sizePair.first) + " "
+ sizePair.second;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
