This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch allowDuplicatedColumnNames in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 565b898f6f274dc7d0c234c75b8a4e31676a62fb Merge: 838751fbef2 2cbd0777ea4 Author: JackieTien97 <[email protected]> AuthorDate: Mon Sep 9 09:46:09 2024 +0800 Merge remote-tracking branch 'origin/master' into allowDuplicatedColumnNames .../db/it/orderBy/IoTDBOrderByForDebugIT.java | 1406 -------------------- .../relational/it/schema/IoTDBDatabaseIT.java | 119 +- .../configuration/PipeRuntimeEnvironment.java | 2 + iotdb-client/cli/pom.xml | 10 + .../cli/src/assembly/resources/tools/backup.bat | 2 +- .../cli/src/assembly/resources/tools/backup.sh | 2 +- .../src/assembly/resources/tools/export-data.bat | 2 +- .../src/assembly/resources/tools/export-data.sh | 2 +- .../src/assembly/resources/tools/export-schema.bat | 2 +- .../src/assembly/resources/tools/export-schema.sh | 2 +- .../src/assembly/resources/tools/export-tsfile.bat | 2 +- .../src/assembly/resources/tools/export-tsfile.sh | 2 +- .../src/assembly/resources/tools/import-data.bat | 2 +- .../src/assembly/resources/tools/import-data.sh | 2 +- .../src/assembly/resources/tools/import-schema.bat | 2 +- .../src/assembly/resources/tools/import-schema.sh | 2 +- .../src/assembly/resources/tools/load-tsfile.bat | 2 +- .../src/assembly/resources/tools/load-tsfile.sh | 2 +- .../java/org/apache/iotdb/cli/AbstractCli.java | 2 +- .../iotdb/tool/{ => backup}/IoTDBDataBackTool.java | 3 +- .../iotdb/tool/{ => data}/AbstractDataTool.java | 2 +- .../apache/iotdb/tool/{ => data}/ExportData.java | 2 +- .../apache/iotdb/tool/{ => data}/ImportData.java | 2 +- .../tool/{ => schema}/AbstractSchemaTool.java | 2 +- .../iotdb/tool/{ => schema}/ExportSchema.java | 2 +- .../iotdb/tool/{ => schema}/ImportSchema.java | 2 +- .../tool/{ => tsfile}/AbstractTsFileTool.java | 2 +- .../iotdb/tool/{ => tsfile}/ExportTsFile.java | 2 +- .../iotdb/tool/{ => tsfile}/ImportTsFile.java | 302 +---- .../apache/iotdb/tool/tsfile/ImportTsFileBase.java | 243 ++++ .../iotdb/tool/tsfile/ImportTsFileLocally.java | 53 + .../iotdb/tool/tsfile/ImportTsFileRemotely.java | 338 +++++ .../iotdb/tool/tsfile/ImportTsFileScanTool.java | 95 ++ .../org/apache/iotdb/tool/WriteDataFileTest.java | 2 + .../iotdb/confignode/manager/ConfigManager.java | 36 +- .../manager/schema/ClusterSchemaManager.java | 5 +- .../persistence/schema/ClusterSchemaInfo.java | 223 ++-- .../consensus/iot/client/DispatchLogHandler.java | 41 +- .../protocol/legacy/IoTDBLegacyPipeConnector.java | 12 +- .../processor/aggregate/AggregateProcessor.java | 5 +- .../thrift/impl/DataNodeRegionManager.java | 22 +- .../plan/analyze/ClusterPartitionFetcher.java | 12 +- .../cache/schema/DataNodeDevicePathCache.java | 12 +- .../execution/config/TableConfigTaskVisitor.java | 4 +- .../config/executor/ClusterConfigTaskExecutor.java | 23 +- .../config/metadata/relational/CreateDBTask.java | 4 +- .../config/metadata/relational/ShowTablesTask.java | 2 +- .../apache/iotdb/db/schemaengine/SchemaEngine.java | 28 +- .../schemaregion/impl/SchemaRegionMemoryImpl.java | 10 +- .../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 301 +++-- .../ReadChunkAlignedSeriesCompactionExecutor.java | 52 +- .../dataregion/snapshot/SnapshotLoader.java | 7 +- .../dataregion/wal/io/WALInputStream.java | 1 - .../schemaRegion/AbstractSchemaRegionTest.java | 5 +- .../SchemaRegionSimpleRecoverTest.java | 3 +- ...nkCompactionPerformerWithAlignedSeriesTest.java | 30 + .../org/apache/iotdb/commons/path/PartialPath.java | 19 + .../plugin/env/PipeTaskRuntimeEnvironment.java | 4 +- .../org/apache/iotdb/commons/utils/PathUtils.java | 4 +- 59 files changed, 1415 insertions(+), 2069 deletions(-)
