This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch beyyes/topk
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 73b8da74062 fix ut
add f1ec46511f3 Table model ingestion, fix sql insert problem
add 55e012dfaa7 fix logical and in PushPredicateIntoTableScan
add dd7ee662f4e fix 'select -s1'
add dbb378c3c02 Fix sort elimination, perfect explain output
add c8e9886a4d4 Add IT for table model
add f0a80aa510a [Table Model] Fix activeScan error due to heterogeneous
IDeviceID
add 88aafea4ff9 Fix serialize method of limit and offset
add c8e5c211ec0 Refactor getIDeviceId in PartialPath to coherent IDeviceId
construction in TsFile.
add 0df4954bf09 Fix serialize method of CollectNode
add 45f0fef657c Fix deserialize method of ProjectNode
add 819e5a42b61 Add more table it
add 010675bcd83 Merge branch 'ty/TableModelGrammar' into beyyes/topk
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/DataMigrationExample.java | 3 +-
.../org/apache/iotdb/it/utils/TsFileGenerator.java | 8 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 5 +
.../it/partition/IoTDBPartitionGetterIT.java | 2 +-
.../apache/iotdb/db/it/IoTDBInsertWithQueryIT.java | 6 +-
.../scalar/IoTDBDiffFunctionIT.java | 1 -
.../db/it/fill/IoTDBFillWithNewDataTypeIT.java | 26 +-
.../iotdb/db/it/selectinto/IoTDBSelectIntoIT.java | 4 +-
.../org/apache/iotdb/db/it/utils/TestUtils.java | 18 +-
.../it/query/old/IoTDBDatetimeFormatTableIT.java | 157 +
.../it/query/old/IoTDBNestedQueryTableIT.java | 453 +++
.../alignbydevice/IoTDBAlignByDeviceTable2IT.java | 46 +
.../alignbydevice/IoTDBAlignByDeviceTable3IT.java | 46 +
.../alignbydevice/IoTDBAlignByDeviceTableIT.java | 504 +++
.../IoTDBAlignByDeviceWithTemplateTable2IT.java | 47 +
... => IoTDBAlignByDeviceWithTemplateTableIT.java} | 325 +-
...TDBOrderByLimitOffsetAlignByDeviceTable2IT.java | 47 +
...oTDBOrderByLimitOffsetAlignByDeviceTableIT.java | 147 +
.../IoTDBOrderByWithAlignByDeviceTable2IT.java | 47 +
.../IoTDBOrderByWithAlignByDeviceTable3IT.java | 47 +
.../IoTDBOrderByWithAlignByDeviceTableIT.java | 1568 +++++++++
.../IoTDBAlignedOffsetLimitPushDownTableIT.java | 156 +
.../aligned/IoTDBAlignedSeriesQueryTable2IT.java | 53 +
.../aligned/IoTDBAlignedSeriesQueryTable3IT.java | 53 +
.../aligned/IoTDBAlignedSeriesQueryTable4IT.java | 53 +
.../aligned/IoTDBAlignedSeriesQueryTable5IT.java | 55 +
.../aligned/IoTDBAlignedSeriesQueryTableIT.java | 3678 ++++++++++++++++++++
.../aligned/IoTDBPredicatePushDownTable2IT.java | 54 +
.../aligned/IoTDBPredicatePushDownTable3IT.java | 54 +
.../aligned/IoTDBPredicatePushDownTable4IT.java | 54 +
.../old/aligned/IoTDBPredicatePushDownTableIT.java | 683 ++++
.../it/query/old/aligned/TableUtils.java | 216 ++
.../scalar/IoTDBCastFunctionTableIT.java | 780 +++++
.../scalar/IoTDBDiffFunctionTable2IT.java | 42 +
.../scalar/IoTDBDiffFunctionTable3IT.java | 42 +
.../scalar/IoTDBDiffFunctionTableIT.java | 149 +
.../scalar/IoTDBReplaceFunctionTableIT.java | 183 +
.../scalar/IoTDBRoundFunctionTableIT.java | 313 ++
.../scalar/IoTDBSubStringFunctionTableIT.java | 228 ++
.../it/query/old/orderBy/IoTDBOrderByTableIT.java | 1566 +++++++++
.../iotdb/relational/it/schema/IoTDBTableIT.java | 4 +-
.../iotdb/session/it/IoTDBSessionRelationalIT.java | 126 +-
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 3 +-
.../iotdb/confignode/manager/ConfigManager.java | 43 +-
.../impl/schema/DeactivateTemplateProcedure.java | 2 +-
.../impl/schema/SetTemplateProcedure.java | 2 +-
.../impl/schema/UnsetTemplateProcedure.java | 2 +-
.../impl/schema/table/CreateTableProcedure.java | 2 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 6 +-
.../iotdb/db/auth/ClusterAuthorityFetcher.java | 4 +-
.../apache/iotdb/db/auth/IAuthorityFetcher.java | 3 +-
.../dataregion/DataExecutionVisitor.java | 7 +-
.../schemaregion/SchemaExecutionVisitor.java | 2 +-
.../schemaregion/PipePlanPatternParseVisitor.java | 4 +-
.../visitor/PipePlanToStatementVisitor.java | 5 +-
.../rest/v1/impl/GrafanaApiServiceImpl.java | 1 +
.../rest/v2/impl/GrafanaApiServiceImpl.java | 1 +
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 7 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 5 +-
.../common/schematree/ClusterSchemaTree.java | 4 +-
.../execution/MemoryEstimationHelper.java | 13 +-
.../source/relational/TableScanOperator.java | 4 +-
.../relational/ColumnTransformerBuilder.java | 22 +-
.../queryengine/plan/analyze/AnalyzeVisitor.java | 16 +-
.../plan/analyze/ExpressionAnalyzer.java | 2 +-
.../plan/analyze/LoadTsfileAnalyzer.java | 3 +-
.../queryengine/plan/analyze/SelectIntoUtils.java | 2 +-
.../analyze/cache/schema/DataNodeSchemaCache.java | 2 +-
.../schema/DeviceUsingTemplateSchemaCache.java | 2 +-
.../cache/schema/TimeSeriesSchemaCache.java | 6 +-
.../cache/schema/dualkeycache/IDualKeyCache.java | 2 +-
.../schema/dualkeycache/impl/DualKeyCacheImpl.java | 2 +-
.../analyze/schema/AutoCreateSchemaExecutor.java | 4 +-
.../analyze/schema/ClusterSchemaFetchExecutor.java | 3 +-
.../plan/analyze/schema/ClusterSchemaFetcher.java | 4 +-
.../plan/analyze/schema/NormalSchemaFetcher.java | 5 +-
.../TableModelStatementMemorySourceVisitor.java | 34 +-
.../plan/expression/ExpressionFactory.java | 3 +-
.../db/queryengine/plan/parser/ASTVisitor.java | 9 +-
.../plan/parser/StatementGenerator.java | 11 +-
.../plan/planner/OperatorTreeGenerator.java | 8 +-
.../plan/planner/TableOperatorGenerator.java | 16 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 10 +
.../plan/planner/plan/node/PlanNodeType.java | 6 +
.../node/metedata/read/TimeSeriesCountNode.java | 3 +-
.../metedata/read/TimeSeriesSchemaScanNode.java | 3 +-
.../node/metedata/write/AlterTimeSeriesNode.java | 6 +-
.../metedata/write/CreateMultiTimeSeriesNode.java | 3 +-
.../node/metedata/write/CreateTimeSeriesNode.java | 15 +-
.../plan/node/source/TimeseriesRegionScanNode.java | 3 +-
.../planner/plan/node/write/DeleteDataNode.java | 37 +-
.../planner/plan/node/write/InsertTabletNode.java | 6 +-
.../plan/node/write/RelationalInsertRowNode.java | 22 +-
.../node/write/RelationalInsertTabletNode.java | 36 +-
.../parameter/DeviceViewIntoPathDescriptor.java | 2 +-
.../plan/relational/analyzer/Analyzer.java | 4 +
.../relational/analyzer/ExpressionAnalyzer.java | 3 +-
.../predicate/ConvertPredicateToFilterVisitor.java | 13 +-
.../relational/metadata/TableMetadataImpl.java | 26 +-
.../fetcher/TableHeaderSchemaValidator.java | 2 +-
.../relational/planner/ir/ExpressionRewriter.java | 15 +-
.../planner/ir/ExpressionTreeRewriter.java | 47 +-
.../planner/ir/NormalizeOrExpressionRewriter.java | 20 +-
.../plan/relational/planner/node/CollectNode.java | 2 +-
.../plan/relational/planner/node/LimitNode.java | 2 +-
.../plan/relational/planner/node/OffsetNode.java | 2 +-
.../plan/relational/planner/node/ProjectNode.java | 7 +-
.../relational/planner/node/StreamSortNode.java | 2 +-
.../optimizations/PushPredicateIntoTableScan.java | 8 +-
.../planner/optimizations/SortElimination.java | 19 +-
.../sql/ast/ArithmeticUnaryExpression.java | 2 +-
.../plan/relational/sql/ast/CreateDB.java | 9 +-
.../plan/relational/sql/ast/LikePredicate.java | 13 +-
.../plan/relational/sql/ast/QualifiedName.java | 2 +-
.../relational/sql/ast/WrappedInsertStatement.java | 27 +-
.../plan/relational/sql/parser/AstBuilder.java | 52 +-
.../db/queryengine/plan/statement/Statement.java | 2 +-
.../plan/statement/crud/DeleteDataStatement.java | 12 +-
.../plan/statement/crud/InsertRowStatement.java | 2 +-
.../crud/InsertRowsOfOneDeviceStatement.java | 2 +-
.../plan/statement/crud/InsertStatement.java | 2 +-
.../plan/statement/crud/InsertTabletStatement.java | 10 +-
.../InternalBatchActivateTemplateStatement.java | 2 +-
.../InternalCreateMultiTimeSeriesStatement.java | 3 +-
.../InternalCreateTimeSeriesStatement.java | 4 +-
.../metadata/CreateAlignedTimeSeriesStatement.java | 2 +-
.../metadata/CreateMultiTimeSeriesStatement.java | 10 +-
.../metadata/CreateTimeSeriesStatement.java | 7 +-
.../template/ActivateTemplateStatement.java | 2 +-
.../template/BatchActivateTemplateStatement.java | 2 +-
.../template/DeactivateTemplateStatement.java | 3 +-
.../dag/column/unary/InColumnTransformer.java | 8 +-
.../scalar/SubStringFunctionColumnTransformer.java | 4 +-
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 2 +-
.../schemaregion/impl/SchemaRegionPBTreeImpl.java | 2 +-
.../visitor/SchemaRegionPlanDeserializer.java | 8 +-
.../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 6 +-
.../mtree/impl/mem/mnode/info/LogicalViewInfo.java | 3 +-
.../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 2 +-
.../write/req/ICreateTimeSeriesPlan.java | 6 +-
.../write/req/SchemaRegionWritePlanFactory.java | 3 +-
.../write/req/impl/CreateTimeSeriesPlanImpl.java | 12 +-
.../iotdb/db/storageengine/StorageEngine.java | 2 +-
.../db/storageengine/dataregion/DataRegion.java | 12 +-
.../execute/utils/CompactionPathUtils.java | 2 +-
.../execute/utils/MultiTsFileDeviceIterator.java | 5 +-
.../dataregion/memtable/AbstractMemTable.java | 6 +-
.../dataregion/memtable/TsFileProcessor.java | 9 +-
.../dataregion/modification/Deletion.java | 12 +-
.../dataregion/modification/Modification.java | 10 +-
.../io/LocalTextModificationAccessor.java | 6 +-
.../tsfile/timeindex/ArrayDeviceTimeIndex.java | 2 +-
.../dataregion/wal/buffer/IWALByteBufferView.java | 21 +-
.../dataregion/wal/buffer/WALBuffer.java | 12 +-
.../wal/recover/file/TsFilePlanRedoer.java | 6 +-
.../file/UnsealedTsFileRecoverPerformer.java | 3 +-
.../db/tools/schema/SRStatementGenerator.java | 10 +-
.../utils/datastructure/PatternTreeMapFactory.java | 4 +-
.../db/metadata/cache/DataNodeSchemaCacheTest.java | 22 +-
.../cache/dualkeycache/DualKeyCacheTest.java | 15 +-
.../db/metadata/idtable/entry/DeviceIDTest.java | 7 +-
.../iotdb/db/metadata/path/PatternTreeMapTest.java | 73 +-
.../schemaRegion/SchemaRegionBasicTest.java | 32 +-
.../schemaRegion/SchemaRegionManagementTest.java | 5 +-
.../SchemaRegionSimpleRecoverTest.java | 5 +-
.../schemaRegion/SchemaRegionTestUtil.java | 5 +-
.../schemaRegion/SchemaStatisticsTest.java | 3 +-
.../PipeStatementPatternParseVisitorTest.java | 5 +-
.../extractor/PipePlanPatternParseVisitorTest.java | 16 +-
.../extractor/SchemaRegionListeningQueueTest.java | 3 +-
.../resource/PipeTsFileResourceManagerTest.java | 8 +-
.../logical/SchemaQueryLogicalPlannerTest.java | 8 -
.../metadata/write/MetadataWriteNodeSerDeTest.java | 3 +-
.../pipe/PipeEnrichedDeleteDataNodeSerdeTest.java | 10 +-
.../node/write/DeleteDataNodeSerdeTest.java | 10 +-
.../plan/relational/analyzer/AnalyzerTest.java | 2 +-
.../DataNodeInternalRPCServiceImplTest.java | 9 +-
.../storageengine/dataregion/DataRegionTest.java | 72 +-
.../compaction/CompactionTaskComparatorTest.java | 4 +-
.../compaction/ReadChunkInnerCompactionTest.java | 30 +-
...eCrossSpaceCompactionWithFastPerformerTest.java | 12 +-
...sSpaceCompactionWithReadPointPerformerTest.java | 12 +-
.../InnerSeqCompactionWithFastPerformerTest.java | 8 +-
...nerSeqCompactionWithReadChunkPerformerTest.java | 8 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 9 +-
.../inner/InnerSpaceCompactionSelectorTest.java | 6 +-
...nkCompactionPerformerWithAlignedSeriesTest.java | 14 +-
.../ReadChunkCompactionPerformerAlignedTest.java | 3 +-
.../repair/RepairUnsortedFileCompactionTest.java | 4 +-
.../settle/SettleCompactionSelectorTest.java | 58 +-
.../settle/SettleRequestHandlerTest.java | 4 +-
.../compaction/utils/CompactionCheckerUtils.java | 17 +-
.../utils/CompactionFileGeneratorUtils.java | 7 +-
.../dataregion/memtable/PrimitiveMemTableTest.java | 10 +-
.../modification/ModificationFileTest.java | 30 +-
.../io/LocalTextModificationAccessorTest.java | 10 +-
.../dataregion/wal/io/WALFileTest.java | 3 +-
.../wal/node/ConsensusReqReaderTest.java | 3 +-
.../wal/recover/file/TsFilePlanRedoerTest.java | 3 +-
.../file/UnsealedTsFileRecoverPerformerTest.java | 3 +-
.../dataregion/wal/utils/WALByteBufferForTest.java | 12 +-
.../org/apache/iotdb/db/tools/MLogParserTest.java | 3 +-
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 4 +-
.../db/utils/SchemaRegionSnapshotParserTest.java | 23 +-
.../org/apache/iotdb/db/utils/SchemaTestUtils.java | 2 +-
.../org/apache/iotdb/commons/path/AlignedPath.java | 29 +-
.../apache/iotdb/commons/path/MeasurementPath.java | 42 +-
.../org/apache/iotdb/commons/path/PartialPath.java | 127 +-
.../apache/iotdb/commons/path/PathPatternTree.java | 28 +-
.../apache/iotdb/commons/path/PatternTreeMap.java | 2 +-
.../commons/pipe/pattern/IoTDBPipePattern.java | 11 +-
.../apache/iotdb/commons/schema/table/TsTable.java | 2 +-
.../commons/schema/view/LogicalViewSchema.java | 3 +-
.../org/apache/iotdb/commons/utils/AuthUtils.java | 2 +-
.../apache/iotdb/commons/path/PartialPathTest.java | 174 +-
.../db/relational/grammar/sql/RelationalSql.g4 | 6 +-
216 files changed, 13108 insertions(+), 930 deletions(-)
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBDatetimeFormatTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBNestedQueryTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable2IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTable3IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceWithTemplateTable2IT.java
rename
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/{IoTDBAlignByDeviceWithTemplateIT.java
=> IoTDBAlignByDeviceWithTemplateTableIT.java} (51%)
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTable2IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByLimitOffsetAlignByDeviceTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable2IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTable3IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBOrderByWithAlignByDeviceTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedOffsetLimitPushDownTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable2IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable3IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable4IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTable5IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable2IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable3IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTable4IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBPredicatePushDownTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/TableUtils.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable2IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTable3IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBDiffFunctionTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBReplaceFunctionTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBRoundFunctionTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBSubStringFunctionTableIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java
