This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new e11546b4e2 [Fix](autobucket) use single replica partition size to calc
bucket number #24045 (#24198)
e11546b4e2 is described below
commit e11546b4e2131c6a789aebe5267aae986606b14e
Author: camby <[email protected]>
AuthorDate: Mon Sep 11 21:09:09 2023 +0800
[Fix](autobucket) use single replica partition size to calc bucket number
#24045 (#24198)
cherry-pick #24045 to branch-1.2-lts
---
.../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 | 4 ++--
.../main/java/org/apache/doris/clone/DynamicPartitionScheduler.java | 2 +-
.../main/java/org/apache/doris/common/proc/PartitionsProcDir.java | 2 +-
6 files changed, 10 insertions(+), 10 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 ce19a53135..f18a86b5cc 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
@@ -243,7 +243,7 @@ public class ShowDataStmt extends ShowStmt {
long indexRowCount = 0;
for (Partition partition : olapTable.getAllPartitions()) {
MaterializedIndex mIndex = partition.getIndex(indexId);
- indexSize += mIndex.getDataSize();
+ indexSize += mIndex.getDataSize(false);
indexReplicaCount += mIndex.getReplicaCount();
indexRowCount += mIndex.getRowCount();
}
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 1ea42cca2b..4d7a20106f 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 271efbc461..d880ce0504 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
@@ -1026,7 +1026,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;
@@ -1039,7 +1039,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;
}
@@ -1396,7 +1396,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 f74e1a35fc..92d3f5ad23 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,10 +253,10 @@ public class Partition extends MetaObject implements
Writable {
return indices;
}
- 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 eac10bb2d0..a556c463e9 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.getDataSize());
+ partitionSizeArray.add(partition.getDataSize(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 cb78140a26..6a506cecc0 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: [email protected]
For additional commands, e-mail: [email protected]
