This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch new-table-model-debug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from b000107b97b merge with ty/TabelGrammarModel
add 2a66138dae5 Revert "Merge branch 'ty/TableModelGrammar' of
github.com:apache/iotdb into ty/TableModelGrammar"
No new revisions were added by this update.
Summary of changes:
.github/workflows/cluster-it-1c1d.yml | 1 -
.github/workflows/cluster-it-1c3d.yml | 1 -
.github/workflows/pipe-it-2cluster.yml | 1 -
.github/workflows/unit-test.yml | 1 -
.../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 3 +-
.../java/org/apache/iotdb/CountPointProcessor.java | 2 +-
.../iotdb/AlignedTimeseriesSessionExample.java | 13 +-
.../org/apache/iotdb/DataMigrationExample.java | 3 +-
.../iotdb/HybridTimeseriesSessionExample.java | 3 +-
.../org/apache/iotdb/SessionConcurrentExample.java | 3 +-
.../main/java/org/apache/iotdb/SessionExample.java | 13 +-
.../main/java/org/apache/iotdb/TabletExample.java | 3 +-
.../org/apache/iotdb/trigger/LoggerTrigger.java | 4 +-
.../org/apache/iotdb/it/utils/TsFileGenerator.java | 16 +-
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 5 +-
.../iotdb/db/it/IoTDBPartialInsertionIT.java | 3 +-
.../org/apache/iotdb/db/it/IoTDBRepairDataIT.java | 4 +-
.../session/it/IoTDBSessionAlignedInsertIT.java | 3 +-
.../iotdb/session/it/IoTDBSessionComplexIT.java | 5 +-
.../it/IoTDBSessionDisableMemControlIT.java | 5 +-
.../IoTDBSessionInsertWithTriggerExecutionIT.java | 3 +-
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 19 +-
.../session/it/IoTDBSessionSyntaxConventionIT.java | 3 +-
.../org/apache/iotdb/session/it/SessionIT.java | 3 +-
.../java/org/apache/iotdb/tool/ExportData.java | 2 +-
.../java/org/apache/iotdb/tool/ExportTsFile.java | 19 +-
iotdb-client/client-cpp/src/main/Session.cpp | 4 +-
.../java/org/apache/iotdb/session/Session.java | 30 +-
.../subscription/SubscriptionSessionDataSet.java | 8 +-
.../apache/iotdb/session/util/SessionUtils.java | 4 +-
.../iotdb/session/SessionCacheLeaderTest.java | 7 +-
.../java/org/apache/iotdb/session/SessionTest.java | 25 +-
.../java/org/apache/iotdb/session/TabletTest.java | 3 +-
.../session/pool/SessionPoolExceptionTest.java | 7 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 19 +-
.../iotdb/session/util/SessionUtilsTest.java | 5 +-
.../flink/sql/function/IoTDBCDCSourceFunction.java | 8 +-
.../iotdb/flink/tsfile/RowTSRecordConverter.java | 4 +-
.../flink/tsfile/RowTsFileConnectorTestBase.java | 12 +-
.../apache/iotdb/flink/util/TsFileWriteUtil.java | 36 +-
.../iotdb/hadoop/tsfile/TsFileTestHelper.java | 3 +-
.../org/apache/iotdb/hive/TsFileTestHelper.java | 3 +-
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 5 +-
.../apache/iotdb/spark/tsfile/DefaultSource.scala | 5 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 2 +-
.../apache/iotdb/spark/tsfile/WideConverter.scala | 4 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 2 +-
.../iotdb/confignode/manager/ConfigManager.java | 4 +-
.../load/subscriber/NodeStatisticsChangeEvent.java | 31 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 8 +-
.../request/PipeTransferTabletRawReq.java | 2 +-
.../connector/protocol/opcua/OpcUaConnector.java | 2 +-
.../iotdb/db/pipe/event/common/row/PipeRow.java | 8 +-
.../db/pipe/event/common/row/PipeRowCollector.java | 6 +-
.../common/tablet/PipeRawTabletInsertionEvent.java | 2 +-
.../tablet/TabletInsertionDataContainer.java | 7 +-
.../tsfile/TsFileInsertionDataContainer.java | 19 +-
.../tsfile/TsFileInsertionDataTabletIterator.java | 3 +-
.../realtime/epoch/TsFileEpochManager.java | 6 +-
.../twostage/plugin/TwoStageCountProcessor.java | 2 +-
.../db/pipe/resource/memory/PipeMemoryManager.java | 6 +-
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 16 +-
.../common/schematree/DeviceSchemaInfo.java | 4 +-
.../execution/driver/DataDriverContext.java | 8 +-
.../fragment/FragmentInstanceContext.java | 17 +-
.../execution/fragment/QueryContext.java | 16 +-
.../execution/load/LoadTsFileManager.java | 4 +-
.../queryengine/execution/load/TsFileSplitter.java | 13 +-
.../operator/process/DeviceViewIntoOperator.java | 3 +-
.../execution/operator/process/IntoOperator.java | 3 +-
.../AlignedSeriesAggregationScanOperator.java | 6 +-
.../operator/source/AlignedSeriesScanOperator.java | 4 +-
.../operator/source/AlignedSeriesScanUtil.java | 16 +-
.../execution/operator/source/FileLoaderUtils.java | 38 +-
.../source/SeriesAggregationScanOperator.java | 6 +-
.../operator/source/SeriesScanOperator.java | 4 +-
.../execution/operator/source/SeriesScanUtil.java | 11 +-
.../source/relational/TableScanOperator.java | 16 +-
.../db/queryengine/plan/analyze/Analysis.java | 9 +-
.../queryengine/plan/analyze/AnalyzeVisitor.java | 4 +-
.../plan/analyze/ExpressionAnalyzer.java | 2 +-
.../plan/analyze/LoadTsfileAnalyzer.java | 33 +-
.../schema/DeviceUsingTemplateSchemaCache.java | 2 +-
.../plan/analyze/schema/ClusterSchemaFetcher.java | 6 +-
.../plan/planner/LocalExecutionPlanContext.java | 5 +-
.../plan/planner/LocalExecutionPlanner.java | 6 +-
.../plan/planner/LogicalPlanBuilder.java | 22 +-
.../plan/planner/LogicalPlanVisitor.java | 10 +-
.../plan/planner/OperatorTreeGenerator.java | 36 +-
.../plan/planner/TableOperatorGenerator.java | 4 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 8 +-
.../node/metedata/write/AlterTimeSeriesNode.java | 2 +-
.../node/metedata/write/CreateTimeSeriesNode.java | 2 +-
.../metedata/write/view/CreateLogicalViewNode.java | 4 +-
.../plan/node/source/AlignedLastQueryScanNode.java | 2 +-
.../plan/node/source/AlignedSeriesScanNode.java | 2 +-
.../planner/plan/parameter/SeriesScanOptions.java | 15 +-
.../relational/planner/ir/SerializeVisitor.java | 19 -
.../plan/scheduler/load/LoadTsFileScheduler.java | 9 +-
.../schemaengine/schemaregion/utils/MetaUtils.java | 22 +-
.../schemaregion/utils/ResourceByPathUtils.java | 95 +-
.../buffer/TimeSeriesMetadataCache.java | 15 +-
.../db/storageengine/dataregion/DataRegion.java | 24 +-
.../dataregion/IDataRegionForQuery.java | 7 +-
.../dataregion/VirtualDataRegion.java | 7 +-
.../CompactionTableSchemaNotMatchException.java | 26 -
.../performer/impl/FastCompactionPerformer.java | 6 -
.../impl/ReadChunkCompactionPerformer.java | 4 -
.../impl/ReadPointCompactionPerformer.java | 27 +-
.../RepairUnsortedFileCompactionPerformer.java | 4 +-
.../execute/utils/CompactionPathUtils.java | 5 +-
.../execute/utils/CompactionTableSchema.java | 86 -
.../utils/CompactionTableSchemaCollector.java | 97 --
.../execute/utils/MultiTsFileDeviceIterator.java | 4 -
.../readchunk/AlignedSeriesCompactionExecutor.java | 3 +-
.../ReadChunkAlignedSeriesCompactionExecutor.java | 3 +-
.../readchunk/SingleSeriesCompactionExecutor.java | 5 +-
.../utils/reader/SeriesDataBlockReader.java | 25 +-
.../utils/writer/AbstractCompactionWriter.java | 24 +-
.../writer/AbstractCrossCompactionWriter.java | 5 -
.../writer/AbstractInnerCompactionWriter.java | 7 -
.../compaction/io/CompactionTsFileReader.java | 2 +-
.../compaction/io/CompactionTsFileWriter.java | 18 -
.../compaction/repair/RepairDataFileScanUtil.java | 25 +-
.../estimator/AbstractCompactionEstimator.java | 19 +-
.../selector/utils/TsFileResourceCandidate.java | 4 +-
.../dataregion/memtable/AbstractMemTable.java | 13 +-
.../memtable/AlignedReadOnlyMemChunk.java | 4 +-
.../dataregion/memtable/DeviceIDFactory.java | 17 +-
.../dataregion/memtable/IMemTable.java | 3 +-
.../dataregion/memtable/ReadOnlyMemChunk.java | 3 +-
.../dataregion/memtable/TsFileProcessor.java | 9 +-
.../dataregion/modification/Modification.java | 2 +-
.../dataregion/read/control/FileReaderManager.java | 4 +-
.../metadata/MemAlignedChunkMetadataLoader.java | 6 +-
.../chunk/metadata/MemChunkMetadataLoader.java | 6 +-
.../dataregion/tsfile/TsFileResource.java | 40 +-
...ayDeviceTimeIndex.java => DeviceTimeIndex.java} | 54 +-
.../dataregion/tsfile/timeindex/FileTimeIndex.java | 10 +-
.../dataregion/tsfile/timeindex/ITimeIndex.java | 6 +-
.../tsfile/timeindex/PlainDeviceTimeIndex.java | 111 --
.../tsfile/timeindex/TimeIndexLevel.java | 15 +-
.../dataregion/utils/TsFileResourceUtils.java | 23 +-
.../dataregion/wal/utils/WALWriteUtils.java | 9 +-
.../iotdb/db/tools/TsFileResourcePrinter.java | 4 +-
.../apache/iotdb/db/tools/TsFileSelfCheckTool.java | 44 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 106 +-
.../iotdb/db/tools/TsFileSplitByPartitionTool.java | 12 +-
.../TsFileOverlapValidationAndRepairTool.java | 3 +-
.../db/tools/validate/TsFileValidationTool.java | 9 +-
.../db/trigger/executor/TriggerFireVisitor.java | 5 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 2 +-
.../connector/PipeDataNodeThriftRequestTest.java | 5 +-
.../event/TsFileInsertionDataContainerTest.java | 5 +-
.../db/pipe/extractor/PipeRealtimeExtractTest.java | 6 +-
.../common/schematree/ClusterSchemaTreeTest.java | 5 +-
.../db/queryengine/execution/DataDriverTest.java | 28 +-
.../operator/AggregationOperatorTest.java | 12 +-
.../AlignedSeriesAggregationScanOperatorTest.java | 19 +-
.../operator/AlignedSeriesScanOperatorTest.java | 121 +-
.../execution/operator/AlignedSeriesTestUtil.java | 29 +-
.../execution/operator/DeviceViewOperatorTest.java | 18 +-
.../operator/HorizontallyConcatOperatorTest.java | 22 +-
.../execution/operator/LastQueryOperatorTest.java | 13 +-
.../operator/LastQuerySortOperatorTest.java | 13 +-
.../execution/operator/LimitOperatorTest.java | 19 +-
.../execution/operator/MergeSortOperatorTest.java | 1503 ++++++++--------
.../execution/operator/OffsetOperatorTest.java | 55 +-
.../execution/operator/OperatorMemoryTest.java | 33 +-
.../operator/RawDataAggregationOperatorTest.java | 19 +-
.../SeriesAggregationScanOperatorTest.java | 12 +-
.../execution/operator/SeriesScanOperatorTest.java | 13 +-
.../operator/SingleDeviceViewOperatorTest.java | 22 +-
.../SlidingWindowAggregationOperatorTest.java | 12 +-
.../execution/operator/SortOperatorTest.java | 186 +-
.../execution/operator/TopKOperatorTest.java | 1828 ++++++++++----------
.../operator/UpdateLastCacheOperatorTest.java | 7 +-
.../schema/SchemaFetchScanOperatorTest.java | 2 +-
.../operator/sink/IdentitySinkOperatorTest.java | 31 +-
.../plan/optimization/TestPlanBuilder.java | 2 +-
.../logical/SchemaQueryLogicalPlannerTest.java | 12 +-
.../storageengine/buffer/BloomFilterCacheTest.java | 3 +-
.../db/storageengine/buffer/ChunkCacheTest.java | 11 +-
.../storageengine/dataregion/DataRegionTest.java | 101 +-
.../dataregion/LastFlushTimeMapTest.java | 47 +-
.../iotdb/db/storageengine/dataregion/TTLTest.java | 17 +-
.../TsFileResourceProgressIndexTest.java | 15 +-
.../compaction/AbstractCompactionTest.java | 28 +-
.../compaction/CompactionDataTypeNotMatchTest.java | 9 +-
.../compaction/CompactionValidationTest.java | 59 +-
.../CrossSpaceCompactionWithUnusualCasesTest.java | 16 +-
.../compaction/FastAlignedCrossCompactionTest.java | 1597 +++++------------
.../FastCompactionPerformerWithEmptyPageTest.java | 3 +-
.../FastCrossCompactionPerformerTest.java | 1051 ++++-------
.../FastInnerCompactionPerformerTest.java | 276 ++-
.../FastNonAlignedCrossCompactionTest.java | 1597 +++++------------
.../compaction/ReadChunkInnerCompactionTest.java | 75 +-
.../ReadPointAlignedCrossCompactionTest.java | 1597 +++++------------
.../ReadPointCompactionPerformerTest.java | 1447 ++++++----------
.../ReadPointNonAlignedCrossCompactionTest.java | 1597 +++++------------
.../compaction/TestUtilsForAlignedSeries.java | 11 +-
.../TsFileValidationCorrectnessTests.java | 26 +-
...eCompactionWithFastPerformerValidationTest.java | 93 +-
...actionWithReadPointPerformerValidationTest.java | 84 +-
.../InsertionCrossSpaceCompactionRecoverTest.java | 23 +-
.../InsertionCrossSpaceCompactionSelectorTest.java | 158 +-
.../dataregion/compaction/cross/MergeTest.java | 9 +-
.../compaction/cross/MergeUpgradeTest.java | 6 +-
.../cross/RewriteCompactionFileSelectorTest.java | 10 +-
...eCrossSpaceCompactionWithFastPerformerTest.java | 32 +-
...sSpaceCompactionWithReadPointPerformerTest.java | 32 +-
.../inner/AbstractInnerSpaceCompactionTest.java | 9 +-
.../inner/FastCompactionPerformerAlignedTest.java | 85 +-
.../FastCompactionPerformerNoAlignedTest.java | 47 +-
.../inner/InnerCompactionMoreDataTest.java | 20 +-
.../compaction/inner/InnerCompactionTest.java | 9 +-
.../ReadChunkCompactionPerformerAlignedTest.java | 87 +-
.../ReadChunkCompactionPerformerNoAlignedTest.java | 59 +-
.../SizeTieredCompactionRecoverTest.java | 56 +-
.../SizeTieredCompactionSelectorTest.java | 8 +-
.../inner/sizetiered/SizeTieredCompactionTest.java | 9 +-
.../repair/RepairUnsortedFileCompactionTest.java | 5 +-
.../CompactionTableModelTestFileWriter.java | 78 -
.../TableModelFastCompactionPerformerTest.java | 256 ---
...TableModelReadChunkCompactionPerformerTest.java | 329 ----
...TableModelReadPointCompactionPerformerTest.java | 268 ---
.../compaction/tools/UnseqSpaceStatisticsTest.java | 40 +-
.../compaction/utils/CompactionCheckerUtils.java | 22 +-
.../utils/CompactionFileGeneratorUtils.java | 7 +-
.../compaction/utils/CompactionTestFileWriter.java | 12 +-
.../utils/MultiTsFileDeviceIteratorTest.java | 193 +--
.../compaction/utils/TsFileGeneratorUtils.java | 20 +-
.../dataregion/memtable/MemTableTestUtils.java | 3 +-
.../dataregion/memtable/PrimitiveMemTableTest.java | 118 +-
.../dataregion/memtable/TsFileProcessorTest.java | 30 +-
.../MemAlignedChunkMetadataLoaderTest.java | 7 +-
.../chunk/metadata/MemChunkMetadataLoaderTest.java | 4 +-
.../series/AbstractAlignedSeriesScanTest.java | 10 +-
.../read/reader/series/AbstractSeriesScanTest.java | 6 +-
.../AlignedSeriesScanLimitOffsetPushDownTest.java | 9 +-
.../AlignedSeriesScanPredicatePushDownTest.java | 9 +-
...gleColumnSeriesScanLimitOffsetPushDownTest.java | 9 +-
.../read/reader/series/SeriesReaderTestUtil.java | 21 +-
.../series/SeriesScanLimitOffsetPushDownTest.java | 3 +-
.../series/SeriesScanPredicatePushDownTest.java | 3 +-
.../dataregion/snapshot/IoTDBSnapshotTest.java | 9 +-
.../dataregion/tsfile/TsFileResourceTest.java | 24 +-
.../wal/recover/WALRecoverManagerTest.java | 13 +-
.../file/SealedTsFileRecoverPerformerTest.java | 7 +-
.../wal/recover/file/TsFilePlanRedoerTest.java | 62 +-
.../file/UnsealedTsFileRecoverPerformerTest.java | 7 +-
.../rescon/memory/ResourceManagerTest.java | 35 +-
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 1 -
.../TsFileOverlapValidationAndRepairToolTest.java | 98 +-
.../iotdb/db/tools/TsFileSelfCheckToolTest.java | 7 +-
.../iotdb/db/tools/TsFileSketchToolTest.java | 17 +-
.../org/apache/iotdb/db/utils/MemUtilsTest.java | 5 +-
.../org/apache/iotdb/db/utils/SchemaTestUtils.java | 13 -
.../test/resources/v3tsfile/compaction-test-tsfile | Bin 51432 -> 0 bytes
.../v3tsfile/compaction-test-tsfile-resource | Bin 103 -> 0 bytes
.../apache/iotdb/commons/conf/CommonConfig.java | 4 +-
.../apache/iotdb/commons/path/AlignedFullPath.java | 65 -
.../org/apache/iotdb/commons/path/AlignedPath.java | 31 +-
.../org/apache/iotdb/commons/path/IFullPath.java | 46 -
.../apache/iotdb/commons/path/MeasurementPath.java | 12 +-
.../iotdb/commons/path/NonAlignedFullPath.java | 84 -
.../org/apache/iotdb/commons/path/PartialPath.java | 46 +-
.../apache/iotdb/commons/path/PatternTreeMap.java | 14 -
.../table/column/MeasurementColumnSchema.java | 3 +-
pom.xml | 2 +-
270 files changed, 6461 insertions(+), 11996 deletions(-)
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/exception/CompactionTableSchemaNotMatchException.java
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchema.java
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchemaCollector.java
rename
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/{ArrayDeviceTimeIndex.java
=> DeviceTimeIndex.java} (87%)
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/PlainDeviceTimeIndex.java
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableModelTestFileWriter.java
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelFastCompactionPerformerTest.java
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadChunkCompactionPerformerTest.java
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadPointCompactionPerformerTest.java
delete mode 100644
iotdb-core/datanode/src/test/resources/v3tsfile/compaction-test-tsfile
delete mode 100644
iotdb-core/datanode/src/test/resources/v3tsfile/compaction-test-tsfile-resource
delete mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedFullPath.java
delete mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/IFullPath.java
delete mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/NonAlignedFullPath.java
