You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2024/07/18 05:12:38 UTC
(iotdb) 02/02: merge and resolve conflict
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/topk
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f4ddb901ce8748a45018d7192ae254af05f4cbba
Merge: 9b7bf753ef1 d3d3b606f9c
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Jul 18 13:11:54 2024 +0800
merge and resolve conflict
.../plan/relational/analyzer/Analysis.java | 15 +-
.../plan/relational/planner/LogicalPlanner.java | 5 +-
.../plan/relational/planner/QueryPlanner.java | 1 +
.../distribute/DistributedPlanGenerator.java | 32 ++
.../distribute/TableDistributionPlanner.java | 4 +-
.../TableModelTypeProviderExtractor.java | 7 +
.../plan/relational/planner/node/FilterNode.java | 2 +-
.../plan/relational/planner/node/LimitNode.java | 2 +-
.../plan/relational/planner/node/OffsetNode.java | 2 +-
.../plan/relational/planner/node/OutputNode.java | 2 +-
.../plan/relational/planner/node/ProjectNode.java | 2 +-
.../plan/relational/planner/node/SortNode.java | 6 +-
.../relational/planner/node/StreamSortNode.java | 17 +
.../planner/optimizations/OptimizeFactory.java | 4 +-
.../PushLimitOffsetIntoTableScan.java | 6 +
.../planner/optimizations/SortElimination.java | 134 ++++++
.../optimizations/TransformSortToStreamSort.java | 123 +++++
.../analyzer/LimitOffsetPushDownTest.java | 11 +-
.../plan/relational/analyzer/SortTest.java | 503 +++++----------------
19 files changed, 483 insertions(+), 395 deletions(-)
diff --cc iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/OptimizeFactory.java
index 3a358a9fbfd,08de786d49d..72ca95bd0e4
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/OptimizeFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/OptimizeFactory.java
@@@ -77,7 -71,7 +78,8 @@@ public class OptimizeFactory
// redo columnPrune and inlineProjections after pushPredicateIntoTableScan
columnPruningOptimizer,
inlineProjectionsOptimizer,
- limitPushdownOptimizer);
++ limitPushdownOptimizer,
+ transformSortToStreamSortOptimizer);
}
public List<PlanOptimizer> getPlanOptimizers() {