This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new bb9eae7f120 [fix](planner) Fix table sample not take effect #29594
(#29619)
bb9eae7f120 is described below
commit bb9eae7f120817490a44d38a0a6786e44c8dfb3e
Author: Xinyi Zou <[email protected]>
AuthorDate: Mon Jan 8 14:23:24 2024 +0800
[fix](planner) Fix table sample not take effect #29594 (#29619)
---
.../doris/nereids/glue/translator/PhysicalPlanTranslator.java | 1 -
fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
index a554df0ac15..907b844e784 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
@@ -645,7 +645,6 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
if (olapScan.getTableSample().isPresent()) {
olapScanNode.setTableSample(new
TableSample(olapScan.getTableSample().get().isPercent,
olapScan.getTableSample().get().sampleValue,
olapScan.getTableSample().get().seek));
- olapScanNode.computeSampleTabletIds();
}
// TODO: remove this switch?
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
index 11ec7b7f2d8..7d807d9542b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
@@ -550,7 +550,6 @@ public class OlapScanNode extends ScanNode {
computePartitionInfo();
}
computeTupleState(analyzer);
- computeSampleTabletIds();
/**
* Compute InAccurate cardinality before mv selector and tablet
pruning.
@@ -922,6 +921,7 @@ public class OlapScanNode extends ScanNode {
Preconditions.checkState(selectedIndexId != -1);
// compute tablet info by selected index id and selected partition ids
long start = System.currentTimeMillis();
+ computeSampleTabletIds();
computeTabletInfo();
LOG.debug("distribution prune cost: {} ms",
(System.currentTimeMillis() - start));
}
@@ -944,9 +944,7 @@ public class OlapScanNode extends ScanNode {
long selectedRows = 0;
long totalSampleRows = 0;
List<Long> selectedPartitionList = new ArrayList<>();
- if (FeConstants.runningUnitTest && selectedIndexId == -1) {
- selectedIndexId = olapTable.getBaseIndexId();
- }
+ Preconditions.checkState(selectedIndexId != -1);
for (Long partitionId : selectedPartitionIds) {
final Partition partition = olapTable.getPartition(partitionId);
final MaterializedIndex selectedIndex =
partition.getIndex(selectedIndexId);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
