This is an automated email from the ASF dual-hosted git repository. xiangweiwei pushed a commit to branch advancePipeline in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e7fcbe26c7f238b76410a8e1be6f0f46f4e1c125 Merge: 8051908a26 4834c1fc3a Author: Alima777 <[email protected]> AuthorDate: Wed Feb 8 11:30:27 2023 +0800 Merge branch 'master' into advancePipeline integration-test/checkstyle.xml | 4 +- integration-test/pom.xml | 7 +- .../iotdb/it/env/cluster/MppCommonConfig.java | 6 ++ .../it/env/cluster/MppSharedCommonConfig.java | 7 ++ .../iotdb/it/env/remote/RemoteCommonConfig.java | 5 ++ .../framework/IoTDBTestRunnerWithParameters.java | 59 +++++++++++++++++ .../IoTDBTestRunnerWithParametersFactory.java} | 32 +++------ .../org/apache/iotdb/itbase/env/CommonConfig.java | 2 + .../iotdb/db/it/schema/AbstractSchemaIT.java | 76 ++++++++++++++++++++++ .../db/it/schema/IoTDBAutoCreateSchemaIT.java | 1 + .../it/schema/IoTDBCreateAlignedTimeseriesIT.java | 1 + .../db/it/schema/IoTDBCreateStorageGroupIT.java | 1 + .../db/it/schema/IoTDBCreateTimeseriesIT.java | 1 + .../db/it/schema/IoTDBDeactivateTemplateIT.java | 1 + .../it/schema/IoTDBDeleteAlignedTimeseriesIT.java | 1 + .../db/it/schema/IoTDBDeleteStorageGroupIT.java | 1 + .../db/it/schema/IoTDBDeleteTimeseriesIT.java | 14 ++-- .../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 32 +++++---- .../it/schema/IoTDBMetadataFetchSchemaFileIT.java | 49 -------------- .../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 1 + .../db/it/schema/IoTDBSortedShowTimeseriesIT.java | 1 + .../apache/iotdb/db/it/schema/IoTDBTagAlterIT.java | 1 + .../org/apache/iotdb/db/it/schema/IoTDBTagIT.java | 1 + .../resources/conf/iotdb-common.properties | 1 - .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 15 +---- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 43 +----------- .../db/metadata/mtree/store/CachedMTreeStore.java | 1 + .../mtree/store/disk/cache/CacheMemoryManager.java | 2 +- .../MemManagerNodeEstimatedSizeBasedImpl.java | 1 + ...erator.java => HorizontallyConcatOperator.java} | 11 +++- .../db/mpp/plan/planner/OperatorTreeGenerator.java | 12 ++-- .../planner/distribution/ExchangeNodeAdder.java | 4 +- .../plan/planner/distribution/SourceRewriter.java | 24 +++---- .../plan/planner/plan/node/PlanGraphPrinter.java | 4 +- .../mpp/plan/planner/plan/node/PlanNodeType.java | 4 +- .../db/mpp/plan/planner/plan/node/PlanVisitor.java | 4 +- ...ConcatNode.java => HorizontallyConcatNode.java} | 14 ++-- .../java/org/apache/iotdb/db/service/DataNode.java | 1 - .../schemaRegion/SchemaRegionBasicTest.java | 45 +++++++++++-- ...st.java => HorizontallyConcatOperatorTest.java} | 24 +++---- .../distribution/AggregationDistributionTest.java | 12 ++-- 41 files changed, 309 insertions(+), 217 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/HorizontallyConcatNode.java index ab6ef28fda,a541ef1bee..f75bd68371 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/HorizontallyConcatNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/HorizontallyConcatNode.java @@@ -44,15 -44,9 +44,15 @@@ public class HorizontallyConcatNode ext @Override public PlanNode clone() { - return new VerticallyConcatNode(getPlanNodeId()); + return new HorizontallyConcatNode(getPlanNodeId()); } + @Override + public PlanNode createSubNode(int subNodeId, int startIndex, int endIndex) { + return new VerticallyConcatNode( + new PlanNodeId(String.format("%s-%s", getPlanNodeId(), subNodeId))); + } + @Override public List<String> getOutputColumnNames() { return children.stream()
