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 9b7bf753ef14b9eb2599fae24b36a5f8bfb7d27a Merge: 895819f6fde 366857424ec Author: Beyyes <[email protected]> AuthorDate: Thu Jul 18 11:50:13 2024 +0800 Merge branch 'ty/TableModelGrammar' into beyyes/topk .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 4 +- .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 37 ++-- .../apache/iotdb/session/pool/SessionPoolTest.java | 1 + .../src/main/codegen/templates/constantFill.ftl | 3 +- .../src/main/codegen/templates/previousFill.ftl | 3 +- .../codegen/templates/variationWindowManager.ftl | 3 +- .../queryengine/common/header/DatasetHeader.java | 6 - .../slidingwindow/SlidingWindowAggregator.java | 7 +- .../execution/operator/AggregationUtil.java | 3 +- .../operator/process/AbstractSortOperator.java | 11 +- .../operator/process/FilterAndProjectOperator.java | 69 +++++-- .../operator/process/MergeSortOperator.java | 12 +- .../execution/operator/process/SortOperator.java | 16 +- .../operator/process/TableMergeSortOperator.java | 56 ++++++ .../operator/process/TableSortOperator.java | 63 +++++++ ...tOperator.java => TableStreamSortOperator.java} | 29 ++- .../operator/process/TableTopKOperator.java | 57 ++++++ .../execution/operator/process/TopKOperator.java | 24 +-- .../operator/process/TransformOperator.java | 11 +- .../operator/process/TreeMergeSortOperator.java | 53 ++++++ .../{SortOperator.java => TreeSortOperator.java} | 53 ++---- .../operator/process/TreeTopKOperator.java | 57 ++++++ .../execution/operator/process/fill/IFill.java | 3 +- .../operator/process/fill/ILinearFill.java | 5 +- .../process/fill/identity/IdentityFill.java | 3 +- .../process/fill/identity/IdentityLinearFill.java | 5 +- .../operator/process/fill/linear/LinearFill.java | 13 +- .../process/join/HorizontallyConcatOperator.java | 3 +- .../process/join/LeftOuterTimeJoinOperator.java | 3 +- .../process/join/merge/MergeSortComparator.java | 4 + .../process/join/merge/MultiColumnMerger.java | 5 +- .../process/join/merge/SingleColumnMerger.java | 3 +- .../operator/source/AlignedSeriesScanOperator.java | 3 +- .../operator/source/SeriesScanOperator.java | 3 +- .../source/relational/TableScanOperator.java | 17 +- .../operator/window/ConditionWindowManager.java | 3 +- .../operator/window/CountWindowManager.java | 3 +- .../operator/window/SessionWindowManager.java | 4 +- .../plan/optimization/PredicatePushDown.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 20 +- .../plan/planner/TableOperatorGenerator.java | 93 +++------- .../plan/relational/planner/LogicalPlanner.java | 2 +- .../distribute/TableDistributionPlanner.java | 30 +-- .../statistics/SpecifiedInfoMergerFactory.java | 6 +- .../SingleInputMultiReferenceLayer.java | 14 +- .../SingleInputSingleReferenceLayer.java | 12 +- .../iterator/TVListForwardIterator.java | 3 +- .../datastructure/row/SerializableRowList.java | 3 +- .../tv/ElasticSerializableBinaryTVList.java | 8 +- .../tv/ElasticSerializableTVList.java | 11 +- .../datastructure/tv/SerializableTVList.java | 15 +- .../writer/ReadPointCrossCompactionWriter.java | 2 +- .../writer/ReadPointInnerCompactionWriter.java | 2 +- .../apache/iotdb/db/utils/sort/DiskSpiller.java | 14 +- .../iotdb/db/utils/sort/TableDiskSpiller.java | 47 +++++ .../sort/TreeDiskSpiller.java} | 25 ++- ...est.java => LastQueryTreeSortOperatorTest.java} | 4 +- ...torTest.java => MergeTreeSortOperatorTest.java} | 204 ++++++++++++--------- .../execution/operator/OperatorMemoryTest.java | 12 +- ...OperatorTest.java => TreeSortOperatorTest.java} | 24 +-- ...OperatorTest.java => TreeTopKOperatorTest.java} | 89 ++++----- ...rTest.java => TableStreamSortOperatorTest.java} | 130 +++++++------ .../datastructure/SerializableTVListTest.java | 2 +- .../apache/iotdb/db/utils/sort/SortUtilTest.java | 4 +- 64 files changed, 889 insertions(+), 547 deletions(-)
