You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2023/02/17 02:30:29 UTC

[iotdb] branch lmh/limitPushDown updated (e84d23965d -> 33d4e8ca12)

This is an automated email from the ASF dual-hosted git repository.

hui pushed a change to branch lmh/limitPushDown
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from e84d23965d fix IT
     add eaee1d8dbf [IOTDB-4005] Add degree of parallelism to pipeline engine
     add d7241c2903 [IOTDB-5509] Add level control for cross compaction selecting (#9059)
     add 821e1756ed [IOTDB-5515] Support GROUP BY SERIES in aggregation query
     add c577012169 [IOTDB-4005] Optimize the pipeline build logic for consumeAllNode
     add bc34211891 Fix typo in README.md (#9065)
     add 077704ecfa Fix  bad url in the official documentation (#9060)
     add d6135299cb [IOTDB-5474] Refactor DataNodeSchemaCache Structure (#9050)
     add bba7c65cc3 [IOTDB-5480][IOTDB-5491][IOTDB-5502] Update DataNode Dashboard (#9063)
     add a1df687753 [IOTDB-5469] create template with backquote characters successfully but get schema info failed (#9073)
     add 2d508f7dd7 [IOTDB-5112] Fixed IoTConsensus synchronization stuck under low load or during restart (#9064)
     add 3ca4f8fa13 Fix device alignment check during data insertion (#9079)
     add c20cde60aa Finish (#9077)
     add 1fff33b317 Fix concurrency problem (#9076)
     add 1a69b40c4c [IOTDB-5528] Refactor schema engine and region statistics (#9052)
     add 33d4e8ca12 Merge remote-tracking branch 'origin/master' into lmh/limitPushDown

No new revisions were added by this update.

Summary of changes:
 README.md                                          |    2 +-
 .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 |    1 +
 .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |    1 +
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4  |    4 +
 .../confignode/conf/ConfigNodeStartupCheck.java    |    1 +
 .../manager/node/ClusterNodeStartUtils.java        |   21 +-
 .../consensus/iot/IoTConsensusServerImpl.java      |    9 +-
 docs/UserGuide/API/Programming-Java-Native-API.md  |    2 +-
 .../Data-Concept/Data-Model-and-Terminology.md     |    2 +-
 .../Apache-IoTDB-DataNode-Dashboard.json           | 5475 ++++++++++----------
 docs/UserGuide/Query-Data/Group-By.md              |  189 +-
 docs/UserGuide/Query-Data/Overview.md              |    4 +-
 .../UserGuide/API/Programming-Java-Native-API.md   |    2 +-
 .../Data-Concept/Data-Model-and-Terminology.md     |    2 +-
 docs/zh/UserGuide/Query-Data/Group-By.md           |  182 +
 docs/zh/UserGuide/Query-Data/Overview.md           |    6 +-
 .../iotdb/it/env/cluster/MppCommonConfig.java      |    6 +
 .../it/env/cluster/MppSharedCommonConfig.java      |    7 +
 .../iotdb/it/env/remote/RemoteCommonConfig.java    |    5 +
 .../org/apache/iotdb/itbase/env/CommonConfig.java  |    2 +
 .../it/cluster/IoTDBClusterNodeErrorStartUpIT.java |   57 +-
 .../it/cluster/IoTDBClusterNodeGetterIT.java       |    1 +
 .../it/cluster/IoTDBClusterRestartIT.java          |    1 +
 .../it/aggregation/IoTDBAggregationByLevel2IT.java |   22 +-
 .../it/aggregation/IoTDBAggregationByLevelIT.java  |    4 +-
 .../db/it/alignbydevice/IoTDBAlignByDevice2IT.java |   22 +-
 .../db/it/alignbydevice/IoTDBAlignByDeviceIT.java  |    2 +-
 .../IoTDBOrderByWithAlignByDevice2IT.java          |   22 +-
 .../IoTDBOrderByWithAlignByDeviceIT.java           |    2 +-
 .../db/it/aligned/IoTDBAlignedSeriesQuery4IT.java  |   54 +
 .../iotdb/db/it/groupby/IoTDBGroupBySeriesIT.java  |  404 ++
 .../db/it/groupby/IoTDBGroupByVariationIT.java     |   16 +-
 .../iotdb/metrics/AbstractMetricService.java       |   12 +-
 .../resources/conf/iotdb-common.properties         |    4 +
 .../commons/service/metric/MetricService.java      |   10 +-
 .../schemaregion/rocksdb/RSchemaRegion.java        |    6 +
 .../metadata/tagSchemaRegion/TagSchemaRegion.java  |    6 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   24 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |    9 +
 .../impl/RewriteCrossSpaceCompactionSelector.java  |   13 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |    4 +-
 .../db/metadata/cache/DataNodeSchemaCache.java     |  187 +-
 .../iotdb/db/metadata/cache/SchemaCacheEntry.java  |   18 +-
 .../metadata/cache/dualkeycache/IDualKeyCache.java |   57 +
 .../dualkeycache/IDualKeyCacheComputation.java}    |   28 +-
 .../cache/dualkeycache/IDualKeyCacheStats.java}    |   28 +-
 .../dualkeycache/impl/CacheEntryGroupImpl.java     |   75 +
 .../dualkeycache/impl/CacheSizeComputerImpl.java   |   55 +
 .../cache/dualkeycache/impl/CacheStats.java        |  110 +
 .../dualkeycache/impl/DualKeyCacheBuilder.java     |   85 +
 .../cache/dualkeycache/impl/DualKeyCacheImpl.java  |  281 +
 .../dualkeycache/impl/DualKeyCachePolicy.java}     |   18 +-
 .../cache/dualkeycache/impl/ICacheEntry.java}      |   25 +-
 .../cache/dualkeycache/impl/ICacheEntryGroup.java} |   30 +-
 .../dualkeycache/impl/ICacheEntryManager.java}     |   28 +-
 .../dualkeycache/impl/ICacheSizeComputer.java}     |   17 +-
 .../dualkeycache/impl/LRUCacheEntryManager.java    |  216 +
 .../db/metadata/mtree/MTreeBelowSGCachedImpl.java  |   41 +-
 .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java  |   42 +-
 .../mtree/snapshot/MemMTreeSnapshotUtil.java       |   45 +-
 .../db/metadata/mtree/store/CachedMTreeStore.java  |   76 +-
 .../iotdb/db/metadata/mtree/store/IMTreeStore.java |    8 +
 .../db/metadata/mtree/store/MemMTreeStore.java     |   66 +-
 .../store/ReentrantReadOnlyCachedMTreeStore.java   |    6 +
 .../mtree/store/disk/cache/CacheManager.java       |   11 +-
 .../mtree/store/disk/cache/CacheMemoryManager.java |   54 +-
 .../mtree/store/disk/cache/LRUCacheManager.java    |    6 +-
 .../mtree/store/disk/cache/PlainCacheManager.java  |    5 +
 ...IMemManager.java => IReleaseFlushStrategy.java} |   32 +-
 .../mtree/store/disk/memcontrol/MemManager.java    |   86 +
 .../MemManagerNodeEstimatedSizeBasedImpl.java      |  133 -
 .../memcontrol/MemManagerNodeNumBasedImpl.java     |  105 -
 ....java => ReleaseFlushStrategyNumBasedImpl.java} |   29 +-
 .../ReleaseFlushStrategySizeBasedImpl.java         |   51 +
 .../rescon/CachedSchemaEngineStatistics.java       |   84 +
 .../rescon/CachedSchemaRegionStatistics.java       |   94 +
 .../rescon/ISchemaEngineStatistics.java}           |   25 +-
 .../rescon/ISchemaRegionStatistics.java}           |   24 +-
 ...tistics.java => MemSchemaEngineStatistics.java} |   68 +-
 .../metadata/rescon/MemSchemaRegionStatistics.java |   93 +
 .../SchemaEngineStatisticsHolder.java}             |   24 +-
 .../db/metadata/rescon/SchemaResourceManager.java  |   10 +-
 .../rescon/SchemaResourceManagerMetrics.java       |   28 +-
 .../metadata/rescon/SchemaStatisticsManager.java   |   56 -
 .../db/metadata/schemaregion/ISchemaRegion.java    |    5 +
 .../db/metadata/schemaregion/SchemaEngine.java     |    6 +-
 .../schemaregion/SchemaRegionMemoryImpl.java       |   33 +-
 .../schemaregion/SchemaRegionSchemaFileImpl.java   |   39 +-
 .../db/mpp/aggregation/AccumulatorFactory.java     |    8 +-
 .../db/mpp/aggregation/CountIfAccumulator.java     |    7 +-
 .../db/mpp/aggregation/FirstValueAccumulator.java  |   12 +-
 .../iotdb/db/mpp/execution/driver/Driver.java      |    8 +
 .../db/mpp/execution/driver/DriverContext.java     |    9 +
 .../iotdb/db/mpp/execution/driver/IDriver.java     |    2 +
 .../mpp/execution/driver/SchemaDriverContext.java  |    5 +-
 .../fragment/FragmentInstanceManager.java          |   14 +-
 .../process/RawDataAggregationOperator.java        |    4 +-
 .../process/join/RowBasedTimeJoinOperator.java     |    6 +
 .../operator/window/EventWindowManager.java        |   18 +-
 .../execution/operator/window/IWindowManager.java  |   23 +-
 .../execution/operator/window/SeriesWindow.java    |  109 +
 .../operator/window/SeriesWindowManager.java       |  191 +
 ...{WindowType.java => SeriesWindowParameter.java} |   33 +-
 .../operator/window/TimeWindowManager.java         |    2 +-
 .../operator/window/WindowManagerFactory.java      |    6 +-
 .../mpp/execution/operator/window/WindowType.java  |    4 +-
 .../db/mpp/execution/schedule/DriverScheduler.java |  126 +-
 .../db/mpp/execution/schedule/task/DriverTask.java |   21 +
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |  101 +-
 .../plan/analyze/schema/ClusterSchemaFetcher.java  |    2 +-
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |   35 +-
 .../plan/planner/LocalExecutionPlanContext.java    |   20 +-
 .../db/mpp/plan/planner/LocalExecutionPlanner.java |   17 +-
 .../db/mpp/plan/planner/OperatorTreeGenerator.java |  315 +-
 .../db/mpp/plan/planner/PipelineDriverFactory.java |   23 +-
 .../plan/planner/distribution/SourceRewriter.java  |   16 +-
 .../db/mpp/plan/planner/plan/node/PlanNode.java    |   13 +
 .../planner/plan/node/process/AggregationNode.java |   24 +-
 .../planner/plan/node/process/DeviceMergeNode.java |    6 +
 .../plan/node/process/GroupByLevelNode.java        |    7 +
 .../planner/plan/node/process/GroupByTagNode.java  |    7 +
 .../plan/node/process/HorizontallyConcatNode.java  |   12 +-
 .../planner/plan/node/process/MergeSortNode.java   |   19 +
 .../planner/plan/node/process/TimeJoinNode.java    |    8 +
 .../planner/plan/parameter/GroupByParameter.java   |    4 +-
 ...nParameter.java => GroupBySeriesParameter.java} |   35 +-
 .../plan/parameter/GroupByVariationParameter.java  |    2 +-
 .../component/GroupBySeriesComponent.java}         |   26 +-
 .../db/mpp/plan/statement/crud/QueryStatement.java |   10 +-
 .../service/thrift/impl/ClientRPCServiceImpl.java  |    4 +
 .../impl/DataNodeInternalRPCServiceImpl.java       |    4 +-
 .../engine/compaction/AbstractCompactionTest.java  |    6 +
 .../engine/compaction/CompactionSchedulerTest.java |    1 +
 .../CompactionSchedulerWithFastPerformerTest.java  |    1 +
 .../CrossSpaceCompactionWithFastPerformerTest.java |    2 +
 ...eCompactionWithFastPerformerValidationTest.java |    1 +
 ...sSpaceCompactionWithReadPointPerformerTest.java |    2 +
 ...actionWithReadPointPerformerValidationTest.java |    1 +
 .../engine/compaction/cross/MergeUpgradeTest.java  |    2 +
 .../cross/RewriteCompactionFileSelectorTest.java   |   33 +-
 .../compaction/utils/CompactionConfigRestorer.java |    4 +
 .../db/metadata/cache/DataNodeSchemaCacheTest.java |    8 -
 .../cache/dualkeycache/DualKeyCacheTest.java       |  110 +
 .../iotdb/db/metadata/mtree/MTreeBelowSGTest.java  |    9 +-
 .../schemaRegion/SchemaStatisticsTest.java         |  252 +
 .../schema/CountGroupByLevelMergeOperatorTest.java |    4 +-
 .../operator/schema/SchemaCountOperatorTest.java   |    4 +-
 .../schema/SchemaQueryScanOperatorTest.java        |    4 +-
 .../execution/schedule/DriverSchedulerTest.java    |    4 +
 .../db/mpp/plan/plan/PipelineBuilderTest.java      |  762 +++
 150 files changed, 7809 insertions(+), 3980 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/WindowType.java => integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevel2IT.java (60%)
 copy server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/WindowType.java => integration-test/src/test/java/org/apache/iotdb/db/it/alignbydevice/IoTDBAlignByDevice2IT.java (60%)
 copy server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/WindowType.java => integration-test/src/test/java/org/apache/iotdb/db/it/alignbydevice/IoTDBOrderByWithAlignByDevice2IT.java (59%)
 create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery4IT.java
 create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/groupby/IoTDBGroupBySeriesIT.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/cache/dualkeycache/IDualKeyCache.java
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/cache/dualkeycache/IDualKeyCacheComputation.java} (54%)
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/cache/dualkeycache/IDualKeyCacheStats.java} (55%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/cache/dualkeycache/impl/CacheEntryGroupImpl.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/cache/dualkeycache/impl/CacheSizeComputerImpl.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/cache/dualkeycache/impl/CacheStats.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/cache/dualkeycache/impl/DualKeyCacheBuilder.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/cache/dualkeycache/impl/DualKeyCacheImpl.java
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/cache/dualkeycache/impl/DualKeyCachePolicy.java} (75%)
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/cache/dualkeycache/impl/ICacheEntry.java} (61%)
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/cache/dualkeycache/impl/ICacheEntryGroup.java} (52%)
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/cache/dualkeycache/impl/ICacheEntryManager.java} (55%)
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/cache/dualkeycache/impl/ICacheSizeComputer.java} (75%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/cache/dualkeycache/impl/LRUCacheEntryManager.java
 rename server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/{IMemManager.java => IReleaseFlushStrategy.java} (66%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerNodeEstimatedSizeBasedImpl.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerNodeNumBasedImpl.java
 copy server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/{MemManagerHolder.java => ReleaseFlushStrategyNumBasedImpl.java} (52%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/ReleaseFlushStrategySizeBasedImpl.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/rescon/ISchemaEngineStatistics.java} (63%)
 copy server/src/main/java/org/apache/iotdb/db/{mpp/execution/operator/window/WindowType.java => metadata/rescon/ISchemaRegionStatistics.java} (65%)
 rename server/src/main/java/org/apache/iotdb/db/metadata/rescon/{MemoryStatistics.java => MemSchemaEngineStatistics.java} (60%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaRegionStatistics.java
 copy server/src/main/java/org/apache/iotdb/db/metadata/{mtree/store/disk/memcontrol/MemManagerHolder.java => rescon/SchemaEngineStatisticsHolder.java} (56%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaStatisticsManager.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/SeriesWindow.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/SeriesWindowManager.java
 copy server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{WindowType.java => SeriesWindowParameter.java} (52%)
 copy server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/{GroupByVariationParameter.java => GroupBySeriesParameter.java} (65%)
 rename server/src/main/java/org/apache/iotdb/db/{metadata/mtree/store/disk/memcontrol/MemManagerHolder.java => mpp/plan/statement/component/GroupBySeriesComponent.java} (57%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/cache/dualkeycache/DualKeyCacheTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaStatisticsTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/PipelineBuilderTest.java