This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/TableModelGrammar0624 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1413aa2ae0b6c84fbe068483e816436f2297651f Merge: 937b699fed7 58478bf3fec Author: Beyyes <[email protected]> AuthorDate: Mon Jun 24 17:24:43 2024 +0800 merge ty/TableModelGrammar .../db/queryengine/common/header/ColumnHeader.java | 12 +- .../fragment/FragmentInstanceContext.java | 9 + .../schema/source/SchemaSourceFactory.java | 20 ++ .../schema/source/TableDeviceFetchSource.java | 121 +++++++ .../schema/source/TableDeviceQuerySource.java | 242 +++++++++++++ .../source/relational/TableScanOperator.java | 11 +- .../TableModelStatementMemorySourceVisitor.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 102 ++++-- .../plan/planner/plan/FragmentInstance.java | 13 + .../plan/planner/plan/node/PlanNodeType.java | 11 +- .../plan/planner/plan/node/PlanVisitor.java | 10 + .../node/metedata/read/TableDeviceFetchNode.java | 173 ++++++++++ .../node/metedata/read/TableDeviceQueryNode.java | 219 ++++++++++++ .../node/metedata/read/TableDeviceSourceNode.java | 100 ++++++ .../plan/relational/analyzer/Analysis.java | 12 +- .../relational/analyzer/StatementAnalyzer.java | 16 +- .../schema/CheckSchemaPredicateVisitor.java | 136 ++++++++ .../ConvertSchemaPredicateToFilterVisitor.java | 173 ++++++++++ .../plan/relational/metadata/Metadata.java | 3 + .../relational/metadata/TableMetadataImpl.java | 53 ++- .../fetcher/DeviceInCacheFilterVisitor.java | 66 ++++ .../metadata/fetcher/SchemaPredicateUtil.java | 176 ++++++++++ .../metadata/fetcher/TableDeviceSchemaFetcher.java | 380 +++++++++++++++++++++ .../fetcher/TableDeviceSchemaValidator.java | 262 ++++++++++++++ .../fetcher/TableHeaderSchemaValidator.java | 175 ++++++++++ .../plan/relational/planner/LogicalPlanner.java | 90 +++++ .../plan/relational/planner/QueryPlanner.java | 1 - .../planner/distribute/ExchangeNodeGenerator.java | 88 ++++- .../distribute/TableDistributionPlanner.java | 2 +- .../distribute/TableModelQueryFragmentPlanner.java | 4 - .../relational/planner/node/TableScanNode.java | 12 + .../plan/relational/sql/ast/AstVisitor.java | 8 + .../plan/relational/sql/ast/FetchDevice.java | 111 ++++++ .../plan/relational/sql/ast/ShowDevice.java | 159 +++++++++ .../schemaengine/schemaregion/ISchemaRegion.java | 2 +- .../schemaregion/impl/SchemaRegionMemoryImpl.java | 6 +- .../schemaregion/impl/SchemaRegionPBTreeImpl.java | 4 +- .../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 50 ++- .../schemaRegion/SchemaRegionTestUtil.java | 12 +- .../plan/relational/analyzer/TestMatadata.java | 5 + .../commons/schema/filter/SchemaFilterVisitor.java | 2 +- 41 files changed, 2963 insertions(+), 90 deletions(-) diff --cc iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java index 883b79b66f6,dcf64372cfa..7186f90fe6c --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java @@@ -19,9 -19,8 +19,10 @@@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; +import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaPartition; + import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.udf.builtin.BuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.BuiltinScalarFunction; import org.apache.iotdb.db.exception.sql.SemanticException; @@@ -39,15 -42,13 +44,14 @@@ import org.apache.iotdb.db.schemaengine import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.file.metadata.IDeviceID; - import org.apache.tsfile.file.metadata.StringArrayDeviceID; import org.apache.tsfile.read.common.type.Type; + import org.apache.tsfile.read.common.type.TypeFactory; - import java.util.ArrayList; - import java.util.Arrays; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Optional; + import java.util.stream.Collectors; import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_ROOT; import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR;
