This is an automated email from the ASF dual-hosted git repository. zyk pushed a commit to branch concurrent_schema_fetch in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f4a8189aec7fecc275bab65d677fdd9129da15ee Author: Marccos <[email protected]> AuthorDate: Mon Dec 12 10:43:08 2022 +0800 add analyze.schema package --- .../java/org/apache/iotdb/db/client/DataNodeInternalClient.java | 6 +++--- .../apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java | 2 +- server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java | 2 +- .../java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 2 ++ .../main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 3 +++ .../db/mpp/plan/analyze/{ => schema}/ClusterSchemaFetcher.java | 3 ++- .../iotdb/db/mpp/plan/analyze/{ => schema}/ISchemaFetcher.java | 2 +- .../iotdb/db/mpp/plan/analyze/{ => schema}/SchemaValidator.java | 2 +- .../db/mpp/plan/analyze/{ => schema}/StandaloneSchemaFetcher.java | 2 +- .../java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java | 2 +- .../org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java | 2 +- .../java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java | 6 +++--- .../apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java | 6 +++--- .../org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java | 6 +++--- .../org/apache/iotdb/db/service/metrics/IoTDBInternalReporter.java | 6 +++--- .../apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java | 6 +++--- .../db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java | 6 +++--- server/src/main/java/org/apache/iotdb/db/sync/SyncService.java | 2 +- .../main/java/org/apache/iotdb/db/sync/pipedata/load/ILoader.java | 6 +++--- .../org/apache/iotdb/db/sync/transport/server/ReceiverManager.java | 2 +- .../java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java | 2 +- .../org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java | 4 ++-- .../org/apache/iotdb/db/mpp/plan/analyze/FakeSchemaFetcherImpl.java | 1 + .../java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java | 2 +- 24 files changed, 45 insertions(+), 38 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java b/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java index 419af63350..8573d918ef 100644 --- a/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java +++ b/server/src/main/java/org/apache/iotdb/db/client/DataNodeInternalClient.java @@ -29,11 +29,11 @@ import org.apache.iotdb.db.exception.IntoProcessException; import org.apache.iotdb.db.mpp.common.SessionInfo; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.query.control.SessionManager; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java index c1f46626e7..73df88fd94 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java @@ -39,7 +39,7 @@ import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion; import org.apache.iotdb.db.metadata.schemaregion.SchemaEngine; import org.apache.iotdb.db.metadata.template.ClusterTemplateManager; import org.apache.iotdb.db.metadata.template.Template; -import org.apache.iotdb.db.mpp.plan.analyze.SchemaValidator; +import org.apache.iotdb.db.mpp.plan.analyze.schema.SchemaValidator; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.ActivateTemplateNode; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java index 3a3002850e..4940a4f538 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java @@ -31,7 +31,7 @@ import org.apache.iotdb.db.mpp.common.QueryId; import org.apache.iotdb.db.mpp.common.SessionInfo; import org.apache.iotdb.db.mpp.execution.QueryIdGenerator; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.constant.DataNodeEndPoints; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java index 81910ef650..157483c078 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java @@ -47,6 +47,8 @@ import org.apache.iotdb.db.mpp.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.mpp.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.mpp.common.schematree.ISchemaTree; import org.apache.iotdb.db.mpp.plan.Coordinator; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.SchemaValidator; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.expression.Expression; import org.apache.iotdb.db.mpp.plan.expression.ExpressionType; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java index 010b491e55..616c6def17 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java @@ -21,6 +21,9 @@ package org.apache.iotdb.db.mpp.plan.analyze; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.mpp.common.MPPQueryContext; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.statement.Statement; import static org.apache.iotdb.db.mpp.common.QueryId.mockQueryId; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java similarity index 99% rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java index 16a49ae47a..67fc47d941 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.mpp.plan.analyze; +package org.apache.iotdb.db.mpp.plan.analyze.schema; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; @@ -35,6 +35,7 @@ import org.apache.iotdb.db.mpp.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.mpp.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.mpp.common.schematree.ISchemaTree; import org.apache.iotdb.db.mpp.plan.Coordinator; +import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.statement.Statement; import org.apache.iotdb.db.mpp.plan.statement.internal.InternalCreateTimeSeriesStatement; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ISchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ISchemaFetcher.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ISchemaFetcher.java rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ISchemaFetcher.java index 5ec75fe1da..37516321c0 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ISchemaFetcher.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ISchemaFetcher.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.mpp.plan.analyze; +package org.apache.iotdb.db.mpp.plan.analyze.schema; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SchemaValidator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/SchemaValidator.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SchemaValidator.java rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/SchemaValidator.java index 391aed20dc..01ae6cc207 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SchemaValidator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/SchemaValidator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.mpp.plan.analyze; +package org.apache.iotdb.db.mpp.plan.analyze.schema; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.PartialPath; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/StandaloneSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/StandaloneSchemaFetcher.java similarity index 99% rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/StandaloneSchemaFetcher.java rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/StandaloneSchemaFetcher.java index f2ab109b79..5882f6f12f 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/StandaloneSchemaFetcher.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/StandaloneSchemaFetcher.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.mpp.plan.analyze; +package org.apache.iotdb.db.mpp.plan.analyze.schema; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java index 7cfa0a3fa1..25d8b6af74 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java @@ -36,8 +36,8 @@ import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeService; import org.apache.iotdb.db.mpp.plan.analyze.Analysis; import org.apache.iotdb.db.mpp.plan.analyze.Analyzer; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.QueryType; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.memory.MemorySourceHandle; import org.apache.iotdb.db.mpp.plan.execution.memory.StatementMemorySource; import org.apache.iotdb.db.mpp.plan.execution.memory.StatementMemorySourceContext; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java index 7e06bd5e38..741a6709df 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java @@ -39,7 +39,7 @@ import org.apache.iotdb.db.mpp.execution.fragment.FragmentInfo; import org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceInfo; import org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.mpp.plan.analyze.QueryType; -import org.apache.iotdb.db.mpp.plan.analyze.SchemaValidator; +import org.apache.iotdb.db.mpp.plan.analyze.schema.SchemaValidator; import org.apache.iotdb.db.mpp.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java index 0d1193fa6c..1b8b07b4ac 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java @@ -25,11 +25,11 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.query.control.SessionManager; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java index fbba149e66..3c0dc2f692 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java index 4892e13da7..c2f4faf687 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalReporter.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalReporter.java index 18f8b8b7b2..fe155e7439 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalReporter.java +++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalReporter.java @@ -27,11 +27,11 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.common.SessionInfo; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; import org.apache.iotdb.db.mpp.plan.statement.Statement; diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java index f3f9d4e5ba..fc4b6465f8 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java @@ -35,11 +35,11 @@ import org.apache.iotdb.db.metadata.template.TemplateQueryType; import org.apache.iotdb.db.mpp.common.header.DatasetHeader; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java index e7011a2985..2a5201ba1f 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -77,11 +77,11 @@ import org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.mpp.execution.fragment.FragmentInstanceState; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution; import org.apache.iotdb.db.mpp.plan.expression.Expression; diff --git a/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java b/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java index ccc95932b5..d5df9a8a73 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java @@ -39,7 +39,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.statement.sys.sync.CreatePipeSinkStatement; import org.apache.iotdb.db.qp.utils.DateTimeUtils; import org.apache.iotdb.db.sync.common.ClusterSyncInfoFetcher; diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/ILoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/ILoader.java index 754893d562..c77abdebf2 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/ILoader.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/ILoader.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.exception.sync.PipeDataLoadException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; /** * This interface is used to load files, including tsFile, syncTask, schema, modsFile and diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java index d0c348fda1..a8ffdab2d3 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java @@ -30,7 +30,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.mpp.plan.Coordinator; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.statement.metadata.SetStorageGroupStatement; import org.apache.iotdb.db.query.control.SessionManager; diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java index f468e09d9b..89430bc91f 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java @@ -27,7 +27,7 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.metadata.idtable.IDTable; import org.apache.iotdb.db.metadata.idtable.entry.DeviceIDFactory; -import org.apache.iotdb.db.mpp.plan.analyze.SchemaValidator; +import org.apache.iotdb.db.mpp.plan.analyze.schema.SchemaValidator; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode; diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java index 060990cfcb..74c5aee931 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java @@ -28,9 +28,9 @@ import org.apache.iotdb.db.engine.flush.FlushManager; import org.apache.iotdb.db.localconfignode.LocalConfigNode; import org.apache.iotdb.db.mpp.common.SessionInfo; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.StandaloneSchemaFetcher; import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; import org.apache.iotdb.db.mpp.plan.statement.Statement; diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakeSchemaFetcherImpl.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakeSchemaFetcherImpl.java index 61951feee4..a65b83d03a 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakeSchemaFetcherImpl.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakeSchemaFetcherImpl.java @@ -28,6 +28,7 @@ import org.apache.iotdb.db.mpp.common.schematree.node.SchemaEntityNode; import org.apache.iotdb.db.mpp.common.schematree.node.SchemaInternalNode; import org.apache.iotdb.db.mpp.common.schematree.node.SchemaMeasurementNode; import org.apache.iotdb.db.mpp.common.schematree.node.SchemaNode; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java index a4a3c6c580..7c908b2f4d 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java @@ -46,7 +46,7 @@ import org.apache.iotdb.db.mpp.common.schematree.node.SchemaNode; import org.apache.iotdb.db.mpp.plan.analyze.Analysis; import org.apache.iotdb.db.mpp.plan.analyze.Analyzer; import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher; +import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.mpp.plan.expression.Expression; import org.apache.iotdb.db.mpp.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator;
