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 e40a36f16eb resolve conflicts
     new 8cec7b97bc7 Add StreamSortOperator
     add 4be19d14e1d fix help error (#12604)
     add f2d859ef99c Update .asf.yaml
     add b860e0040e8 Update .asf.yaml
     add 1af2c236fb6 [IOTDB-6328] Add optimization for aggregation query in 
align by device with template situation
     add 6d708ca9be4 Feature/updated cmake (#12589)
     add b4989ed851c Fix/build issues outside of china
     add bb728f04cc8 Pipe: Added RemainingEventCount/EstimatedRemainingSeconds 
in configNode metrics/show pipes response (#12578)
     add d1865512dfa Fix AuditLogger may cause IoTDB read only when session 
using incorrect password (#12609)
     add 3a28a2e1593 Fixed an issue where LoadSnapshot could cause out-of-heap 
memory statistics to leak (#12608)
     add 8538308e7c9 Pipe: Modify 
extractor.history.terminate-pipe-on-all-consumed -> extractor.mode. Make 
sink.realtime-first true by default. (#12605)
     add 69b21ddc095 Pipe: fix NPE when updating cache leader after calling 
getDeviceId() in PipeRawTabletInsertionEvent (#12612)
     add fde91579d17 Abort old task when compaction config is modified (#12611)
     new 911a5879e0c merge master

The 2 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:
 .asf.yaml                                          |   2 +-
 .mvn/wrapper/maven-wrapper.properties              |   4 +-
 .../iotdb/it/env/cluster/config/MppJVMConfig.java  |  18 +
 .../it/env/cluster/node/AbstractNodeWrapper.java   |   1 +
 .../it/env/cluster/node/ConfigNodeWrapper.java     |   1 +
 .../iotdb/it/framework/IoTDBTestReporter.java      |   9 +-
 .../org/apache/iotdb/db/it/IoTDBFlushQueryIT.java  |   7 +-
 ...oTDBAlignByDeviceWithTemplateAggregationIT.java | 542 +++++++++++++++++++++
 .../it/query/IoTDBSelectCompareExpressionIT.java   |  10 +-
 .../apache/iotdb/it/framework/IoTDBTestRunner.java |   3 +
 .../pipe/it/autocreate/IoTDBPipeAutoDropIT.java    |   2 +-
 .../pipe/it/autocreate/IoTDBPipeClusterIT.java     |   3 +-
 .../pipe/it/autocreate/IoTDBPipeDataSinkIT.java    |   4 +-
 .../assembly/resources/sbin/remove-confignode.bat  |   4 +-
 .../heartbeat/DataNodeHeartbeatHandler.java        |   6 +-
 .../response/pipe/task/PipeTableResp.java          |  95 ++--
 .../pipe/agent/task/PipeConfigNodeTaskAgent.java   |  48 +-
 .../runtime/PipeRuntimeCoordinator.java            |  10 +-
 .../runtime/heartbeat/PipeHeartbeat.java           |  32 +-
 .../runtime/heartbeat/PipeHeartbeatParser.java     |  15 +-
 .../runtime/heartbeat/PipeHeartbeatScheduler.java  |  12 +-
 .../extractor/ConfigRegionListeningFilter.java     |   2 +-
 .../manager/pipe/metric/PipeConfigNodeMetrics.java |   2 +
 .../metric/PipeConfigNodeRemainingTimeMetrics.java |   9 +
 .../PipeConfigNodeRemainingTimeOperator.java       |   8 +-
 .../metric/PipeConfigRegionExtractorMetrics.java   |  14 +
 .../pipe/metric/PipeTemporaryMetaMetrics.java      | 175 +++++++
 .../confignode/persistence/pipe/PipeInfo.java      |  75 ++-
 .../confignode/persistence/pipe/PipeTaskInfo.java  |   5 +-
 .../consensus/response/pipe/PipeTableRespTest.java |   4 +-
 .../assembly/resources/sbin/remove-datanode.bat    |   4 +-
 .../src/assembly/resources/sbin/remove-datanode.sh |   2 +-
 .../org/apache/iotdb/db/audit/AuditLogger.java     |   6 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  24 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  77 ++-
 .../db/pipe/agent/task/PipeDataNodeTaskAgent.java  |  79 +--
 .../client/IoTDBDataNodeAsyncClientManager.java    |   2 +-
 .../IoTDBDataNodeCacheLeaderClientManager.java     |   4 +
 .../client/IoTDBDataNodeSyncClientManager.java     |   2 +-
 .../PipeTransferTabletInsertNodeEventHandler.java  |   6 +-
 .../thrift/sync/IoTDBDataRegionSyncConnector.java  |   5 +-
 .../common/tablet/PipeRawTabletInsertionEvent.java |   9 +-
 .../PipeHistoricalDataRegionTsFileExtractor.java   |  16 +-
 .../schemaregion/SchemaRegionListeningFilter.java  |   2 +-
 .../PipeDataNodeRemainingEventAndTimeMetrics.java  |  11 +
 .../common/header/ColumnHeaderConstant.java        |   6 +-
 .../filter/AbstractMonthIntervalFillFilter.java    |   5 -
 .../fill/filter/MonthIntervalMSFillFilter.java     |   8 +-
 .../fill/filter/MonthIntervalNSFillFilter.java     |  12 +-
 .../fill/filter/MonthIntervalUSFillFilter.java     |  10 +-
 .../StreamSortOperator.java}                       |  10 +-
 .../db/queryengine/plan/analyze/Analysis.java      |  16 +-
 .../queryengine/plan/analyze/AnalyzeVisitor.java   |  10 +-
 .../plan/analyze/ExpressionTypeAnalyzer.java       |  10 +-
 .../plan/analyze/TemplatedAggregationAnalyze.java  | 260 ++++++++++
 .../queryengine/plan/analyze/TemplatedAnalyze.java | 156 +++---
 .../db/queryengine/plan/analyze/TemplatedInfo.java | 215 ++++++--
 .../execution/config/sys/pipe/ShowPipeTask.java    |  45 +-
 .../plan/optimization/AggregationPushDown.java     | 177 ++++++-
 .../plan/optimization/PredicatePushDown.java       |  16 +-
 .../plan/planner/LogicalPlanBuilder.java           |  14 +-
 .../plan/planner/LogicalPlanVisitor.java           |   2 +-
 .../plan/planner/OperatorTreeGenerator.java        | 188 +++++--
 .../plan/planner/SubPlanTypeExtractor.java         |   9 +
 .../plan/planner/TemplatedLogicalPlan.java         | 257 +++++++++-
 .../plan/planner/TemplatedLogicalPlanBuilder.java  |  69 ++-
 .../planner/distribution/DistributionPlanner.java  |   1 +
 .../plan/planner/plan/PlanFragment.java            |   6 +-
 .../plan/planner/plan/node/PlanGraphPrinter.java   |   2 +-
 .../plan/planner/plan/node/PlanNodeType.java       |   8 +-
 .../planner/plan/node/process/DeviceViewNode.java  |  41 ++
 .../plan/planner/plan/node/process/FilterNode.java |  59 ++-
 .../plan/node/process/RawDataAggregationNode.java  |  20 +
 .../plan/node/process/SingleDeviceViewNode.java    |   2 +-
 .../source/AlignedSeriesAggregationScanNode.java   |  70 ++-
 .../plan/parameter/AggregationDescriptor.java      |   2 +-
 .../iotdb/db/storageengine/StorageEngine.java      |   3 +-
 .../execute/task/AbstractCompactionTask.java       |  11 +
 .../execute/task/CrossSpaceCompactionTask.java     |  19 +
 .../execute/task/InnerSpaceCompactionTask.java     |  21 +
 .../compaction/schedule/CompactionScheduler.java   |  34 +-
 .../compaction/schedule/CompactionTaskManager.java |  13 +-
 .../compaction/schedule/CompactionTaskQueue.java   |   2 +
 .../aggregation/TimeRangeIteratorTest.java         | 229 ++++-----
 .../plan/optimization/TestPlanBuilder.java         |   3 +-
 .../logical/DataQueryLogicalPlannerTest.java       |  18 +-
 .../planner/node/process/FilterNodeSerdeTest.java  |   3 +-
 .../compaction/CompactionOverlapCheckTest.java     |   6 +
 .../FastInnerCompactionPerformerTest.java          |   7 +
 .../resources/conf/iotdb-common.properties         |   2 +-
 .../config/constant/PipeConnectorConstant.java     |   2 +-
 .../config/constant/PipeExtractorConstant.java     |  12 +-
 .../iotdb/commons/pipe/task/meta/PipeMeta.java     |   9 +-
 .../commons/pipe/task/meta/PipeTemporaryMeta.java  |  33 +-
 .../iotdb/commons/service/metric/enums/Metric.java |   2 +
 .../src/main/thrift/confignode.thrift              |   2 +
 .../src/main/thrift/datanode.thrift                |   4 +
 pom.xml                                            |   4 +-
 98 files changed, 2916 insertions(+), 600 deletions(-)
 create mode 100644 
integration-test/src/test/java/org/apache/iotdb/db/it/alignbydevice/IoTDBAlignByDeviceWithTemplateAggregationIT.java
 create mode 100644 
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeTemporaryMetaMetrics.java
 copy 
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/{SortOperator.java
 => relational/StreamSortOperator.java} (97%)
 create mode 100644 
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java

Reply via email to