This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty/TableModelGrammar
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 30c3639a547 fix conflicts
add 462c9004a55 Introducing a memory control mechanism during the query
planning stage
new dd18eca3034 Merge remote-tracking branch 'origin/master' into
ty/TableModelGrammar
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../db/queryengine/common/MPPQueryContext.java | 60 ++++++++
.../exception/MemoryNotEnoughException.java | 7 +-
.../execution/MemoryEstimationHelper.java | 6 +-
.../iotdb/db/queryengine/plan/Coordinator.java | 3 +
.../queryengine/plan/analyze/AnalyzeVisitor.java | 154 ++++++++++++++-------
.../plan/analyze/ConcatPathRewriter.java | 33 +++--
.../plan/analyze/ExpressionAnalyzer.java | 42 ++++--
.../queryengine/plan/analyze/ExpressionUtils.java | 66 ++++++---
.../queryengine/plan/analyze/TemplatedAnalyze.java | 12 +-
.../queryengine/plan/execution/QueryExecution.java | 3 +
.../db/queryengine/plan/expression/Expression.java | 3 +-
.../plan/expression/binary/BinaryExpression.java | 12 ++
.../plan/expression/leaf/ConstantOperand.java | 9 ++
.../plan/expression/leaf/NullOperand.java | 10 ++
.../plan/expression/leaf/TimeSeriesOperand.java | 10 ++
.../plan/expression/leaf/TimestampOperand.java | 10 ++
.../plan/expression/multi/FunctionExpression.java | 26 ++++
.../expression/other/CaseWhenThenExpression.java | 16 +++
.../expression/other/GroupByTimeExpression.java | 9 ++
.../plan/expression/ternary/BetweenExpression.java | 14 ++
.../plan/expression/unary/InExpression.java | 12 +-
.../plan/expression/unary/IsNullExpression.java | 10 ++
.../plan/expression/unary/LikeExpression.java | 12 ++
.../plan/expression/unary/LogicNotExpression.java | 11 ++
.../plan/expression/unary/NegationExpression.java | 11 ++
.../plan/expression/unary/RegularExpression.java | 12 ++
.../cartesian/BindSchemaForExpressionVisitor.java | 50 +++++--
.../cartesian/BindSchemaForPredicateVisitor.java | 43 ++++--
.../visitor/cartesian/CartesianProductVisitor.java | 23 +--
...catDeviceAndBindSchemaForExpressionVisitor.java | 27 +++-
...ncatDeviceAndBindSchemaForPredicateVisitor.java | 30 +++-
.../ConcatExpressionWithSuffixPathsVisitor.java | 28 +++-
.../visitor/cartesian/QueryContextProvider.java | 7 +-
.../plan/optimization/AggregationPushDown.java | 91 ++++++++++--
.../plan/planner/LocalExecutionPlanner.java | 22 ++-
.../plan/planner/LogicalPlanBuilder.java | 76 ++++++----
.../distribution/DistributionPlanContext.java | 6 +
.../plan/planner/distribution/SourceRewriter.java | 9 ++
.../plan/node/source/AlignedLastQueryScanNode.java | 13 ++
.../source/AlignedSeriesAggregationScanNode.java | 11 ++
.../plan/node/source/AlignedSeriesScanNode.java | 12 ++
.../plan/node/source/LastQueryScanNode.java | 13 ++
.../node/source/SeriesAggregationScanNode.java | 12 ++
.../planner/plan/node/source/SeriesScanNode.java | 12 ++
.../planner/plan/node/source/SeriesSourceNode.java | 4 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 3 +
.../exception/MemoryNotEnoughExceptionTest.java | 37 -----
.../plan/analyze/ExpressionAnalyzerTest.java | 8 +-
48 files changed, 872 insertions(+), 238 deletions(-)
copy
iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/customizer/configuration/PipeRuntimeConfiguration.java
=>
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java
(79%)
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/exception/MemoryNotEnoughExceptionTest.java
