You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/12/22 07:12:44 UTC
[iotdb] 04/04: Merge branch 'master' of https://github.com/apache/iotdb into numpy_tablet_none
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch numpy_tablet_none
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 339f653195e88e986a65719e0f149fa1a41b9491
Merge: b502d6a65b 87baa0fb32
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Dec 22 15:07:50 2022 +0800
Merge branch 'master' of https://github.com/apache/iotdb into numpy_tablet_none
cli/src/assembly/resources/tools/export-csv.bat | 2 +-
cli/src/assembly/resources/tools/export-csv.sh | 1 -
cli/src/assembly/resources/tools/export-tsfile.bat | 2 +-
cli/src/assembly/resources/tools/export-tsfile.sh | 1 -
cli/src/assembly/resources/tools/import-csv.bat | 2 +-
cli/src/assembly/resources/tools/import-csv.sh | 1 -
.../org/apache/iotdb/tool/AbstractCsvTool.java | 3 +
.../org/apache/iotdb/tool/AbstractTsFileTool.java | 2 +
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 16 +-
.../java/org/apache/iotdb/tool/ExportTsFile.java | 22 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 4 +-
.../confignode/conf/SystemPropertiesUtils.java | 15 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 7 +-
.../persistence/ClusterSchemaInfoTest.java | 26 +-
.../confignode/persistence/TemplateTableTest.java | 46 ++-
.../iotdb/consensus/config/IoTConsensusConfig.java | 19 +-
.../iot/client/IoTConsensusClientPool.java | 7 +-
docker/ReadMe.md | 4 +-
docker/src/main/DockerCompose/do-docker-build.sh | 65 ++-
.../src/main/DockerCompose/docker-compose-1c1d.yml | 6 +-
.../DockerCompose/docker-compose-cluster-1c2d.yml | 14 +-
.../DockerCompose/docker-compose-cluster-3c3d.yml | 8 +-
.../DockerCompose/docker-compose-host-3c3d.yml | 4 +-
docker/src/main/Dockerfile-1.0.0-1c1d | 3 +-
docker/src/main/Dockerfile-1.0.0-confignode | 6 +-
docker/src/main/Dockerfile-1.0.0-datanode | 6 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 2 +-
docs/UserGuide/FAQ/FAQ-for-cluster-setup.md | 99 +++++
docs/UserGuide/Maintenance-Tools/CSV-Tool.md | 6 +
.../Maintenance-Tools/TsFile-Load-Export-Tool.md | 100 ++++-
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 12 +-
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 9 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 2 +-
docs/zh/UserGuide/FAQ/FAQ-for-cluster-setup.md | 99 +++++
docs/zh/UserGuide/Maintenance-Tools/CSV-Tool.md | 6 +
.../Maintenance-Tools/TsFile-Load-Export-Tool.md | 98 ++++-
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 12 +-
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 11 +-
integration-test/import-control.xml | 10 +
integration-test/pom.xml | 36 ++
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 8 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 5 +
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 2 +
.../org/apache/iotdb/cli/it/AbstractScript.java | 4 +-
.../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 2 +-
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 5 +
.../org/apache/iotdb/tools/ExportCsvTestIT.java | 198 ++++++++++
.../org/apache/iotdb/tools/ExportTsFileTestIT.java | 198 ++++++++++
.../iotdb/zeppelin/it/IoTDBInterpreterIT.java | 127 +++---
.../reporter/iotdb/InternalIoTDBReporter.java | 2 +-
.../iotdb/MemoryInternalIoTDBReporter.java | 4 +-
.../reporter/iotdb/SessionIoTDBReporter.java | 46 +--
.../reporter/prometheus/PrometheusReporter.java | 33 +-
.../micrometer/reporter/MicrometerJmxReporter.java | 6 +-
.../resources/conf/iotdb-common.properties | 9 +-
.../commons/service/metric/MetricService.java | 7 +-
pom.xml | 3 +-
.../schemaregion/rocksdb/mnode/RMNode.java | 5 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 19 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 13 +-
.../db/consensus/DataRegionConsensusImpl.java | 2 +
.../idtable/entry/InsertMeasurementMNode.java | 5 +
.../org/apache/iotdb/db/metadata/mnode/IMNode.java | 4 +
.../iotdb/db/metadata/mnode/InternalMNode.java | 5 +
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 10 +-
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 26 +-
.../mtree/snapshot/MemMTreeSnapshotUtil.java | 4 +-
.../mtree/store/disk/schemafile/RecordUtils.java | 2 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 23 +-
.../traverser/collector/MeasurementCollector.java | 7 +
.../schemaregion/impl/SchemaRegionPlanFactory.java | 6 +
.../db/metadata/rescon/SchemaResourceManager.java | 4 +-
...rics.java => SchemaResourceManagerMetrics.java} | 41 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 62 ++-
.../schemaregion/SchemaRegionMemoryImpl.java | 48 +--
.../schemaregion/SchemaRegionSchemaFileImpl.java | 64 +--
.../metadata/template/ClusterTemplateManager.java | 9 +-
.../iotdb/db/metadata/template/Template.java | 298 ++------------
.../db/mpp/common/header/ColumnHeaderConstant.java | 6 +-
.../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 18 +-
.../org/apache/iotdb/db/protocol/mqtt/Message.java | 11 +
.../iotdb/db/qp/physical/sys/ShowDevicesPlan.java | 14 +
.../db/qp/physical/sys/ShowTimeSeriesPlan.java | 18 +
.../java/org/apache/iotdb/db/service/DataNode.java | 3 +-
.../db/service/metrics/IoTDBInternalReporter.java | 24 +-
.../schemaRegion/AbstractSchemaRegionTest.java | 2 +-
.../schemaRegion/SchemaRegionBasicTest.java | 435 +++++++++++++++++++++
.../schemaRegion/SchemaRegionManagementTest.java | 32 ++
.../schemaRegion/SchemaRegionTemplateTest.java | 49 ++-
.../schemaRegion/SchemaRegionTestUtil.java | 33 ++
.../operator/schema/CountMergeOperatorTest.java | 114 +-----
.../operator/schema/SchemaCountOperatorTest.java | 68 ++--
.../schema/SchemaFetchScanOperatorTest.java | 108 +++--
.../schema/SchemaQueryScanOperatorTest.java | 88 +++--
site/src/main/.vuepress/config.js | 38 +-
zeppelin-interpreter/pom.xml | 51 ---
.../apache/zeppelin/iotdb/IoTDBInterpreter.java | 4 +-
98 files changed, 2185 insertions(+), 1043 deletions(-)