You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2023/03/28 03:30:15 UTC
[iotdb] 02/02: fix conflict with master
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/trino
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9e65a78a9ef89aa0b6745bc1b6755946ab04e5ae
Merge: a83b2b194c 4087107755
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Tue Mar 28 11:29:55 2023 +0800
fix conflict with master
RELEASE_NOTES.md | 73 +
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 2 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 10 +
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 +
.../java/org/apache/iotdb/cli/AbstractCli.java | 17 +-
cli/src/main/java/org/apache/iotdb/cli/Cli.java | 2 +-
client-py/SessionExample.py | 76 +-
client-py/iotdb/Session.py | 1071 +-
client-py/iotdb/utils/IoTDBRpcDataSet.py | 6 +-
client-py/iotdb/utils/NumpyTablet.py | 4 +-
client-py/tests/tablet_performance_comparison.py | 4 +-
client-py/tests/test_aligned_timeseries.py | 20 +-
client-py/tests/test_dataframe.py | 6 +-
client-py/tests/test_delete_data.py | 8 +-
client-py/tests/test_numpy_tablet.py | 7 +-
client-py/tests/test_session.py | 12 +-
client-py/tests/test_template.py | 12 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 10 +-
.../confignode/conf/ConfigNodeDescriptor.java | 4 +-
.../confignode/manager/ClusterSchemaManager.java | 19 +-
.../iotdb/confignode/manager/ConfigManager.java | 6 +-
.../consensus/iot/IoTConsensusServerImpl.java | 11 +-
.../ratis/ApplicationStateMachineProxy.java | 24 +-
.../iotdb/consensus/simple/SimpleConsensus.java | 16 +-
.../UserGuide/API/Programming-Python-Native-API.md | 34 +-
.../Administration-Management/Administration.md | 2 +-
docs/UserGuide/Cluster/Cluster-Maintenance.md | 2 +-
.../Apache-IoTDB-ConfigNode-Dashboard.json | 4898 -----
.../Apache-IoTDB-DataNode-Dashboard.json | 20147 -------------------
.../Apache-IoTDB-Disk-IO-Dashboard.json | 894 -
.../Apache-IoTDB-Network-Dashboard.json | 533 -
...pache-IoTDB-Performance-Overview-Dashboard.json | 4350 ----
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 192 +-
docs/UserGuide/Operators-Functions/String.md | 72 +-
.../Syntax-Conventions/NodeName-In-Path.md | 2 +-
.../UserGuide/API/Programming-Python-Native-API.md | 36 +-
.../Administration-Management/Administration.md | 2 +-
docs/zh/UserGuide/Cluster/Cluster-Maintenance.md | 2 +-
docs/zh/UserGuide/Cluster/IoTDB-Deploy.md | 361 +
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 171 +-
docs/zh/UserGuide/Operators-Functions/Overview.md | 29 +-
docs/zh/UserGuide/Operators-Functions/String.md | 80 +-
.../itbase/constant/BuiltinScalarFunctionEnum.java | 1 +
.../BuiltinTimeSeriesGeneratingFunctionEnum.java | 1 -
.../it/cluster/IoTDBClusterNodeGetterIT.java | 4 +-
.../confignode/it/utils/ConfigNodeTestUtils.java | 2 +-
.../db/it/alignbydevice/IoTDBAlignByDeviceIT.java | 108 +
.../IoTDBOrderByWithAlignByDeviceIT.java | 54 +
.../scalar/IoTDBSubStringFunctionIT.java | 267 +
.../it/udf/IoTDBUDTFBuiltinScalarFunctionIT.java | 5 +-
.../iotdb/metrics/AbstractMetricService.java | 10 +-
mlnode/.gitignore | 6 +-
mlnode/iotdb/mlnode/client.py | 247 +-
mlnode/iotdb/mlnode/config.py | 27 +-
mlnode/iotdb/mlnode/constant.py | 2 +
mlnode/iotdb/mlnode/exception.py | 5 +
mlnode/iotdb/mlnode/model_storage.py | 95 +
mlnode/iotdb/mlnode/serde.py | 10 +-
mlnode/iotdb/mlnode/util.py | 1 -
mlnode/requirements.txt | 5 +
mlnode/requirements_dev.txt | 9 +-
mlnode/resources/conf/iotdb-mlnode.toml | 8 +
mlnode/test/test_model_storage.py | 78 +
mlnode/test/test_serde.py | 54 +-
.../resources/conf/iotdb-common.properties | 6 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 8 +
.../metric/enums/PerformanceOverviewMetrics.java | 256 +-
.../commons/udf/builtin/BuiltinScalarFunction.java | 1 +
.../BuiltinTimeSeriesGeneratingFunction.java | 2 -
.../commons/udf/builtin/String/UDTFSubstr.java | 70 -
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 7 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 12 +-
.../org/apache/iotdb/db/constant/SqlConstant.java | 8 +
.../execute/utils/MultiTsFileDeviceIterator.java | 7 +
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 16 +-
.../db/engine/storagegroup/TsFileProcessor.java | 25 +-
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 61 +-
.../db/metadata/mtree/store/CachedMTreeStore.java | 8 +-
.../db/metadata/mtree/store/MemMTreeStore.java | 2 +
.../mtree/store/StampedWriterPreferredLock.java | 21 +-
.../mtree/store/disk/cache/CacheMemoryManager.java | 116 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 2 +-
.../metadata/rescon/ISchemaRegionStatistics.java | 2 +
.../metadata/rescon/MemSchemaRegionStatistics.java | 15 +
.../schemaregion/SchemaRegionMemoryImpl.java | 37 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 148 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 2 +-
.../mpp/execution/exchange/SharedTsBlockQueue.java | 4 +
.../execution/executor/RegionWriteExecutor.java | 12 +-
.../iotdb/db/mpp/execution/memory/MemoryPool.java | 237 +-
.../process/AbstractConsumeAllOperator.java | 14 +-
.../operator/process/DeviceViewOperator.java | 7 +-
.../operator/process/MergeSortOperator.java | 6 +-
.../process/join/HorizontallyConcatOperator.java | 16 +-
.../process/join/RowBasedTimeJoinOperator.java | 10 +-
.../process/join/merge/AscTimeComparator.java | 5 +
.../process/join/merge/DescTimeComparator.java | 5 +
.../process/join/merge/MergeSortComparator.java | 28 +-
.../process/join/merge/TimeComparator.java | 3 +
.../process/last/LastQueryCollectOperator.java | 6 +-
.../process/last/LastQueryMergeOperator.java | 25 +-
.../operator/process/last/LastQueryOperator.java | 7 +-
.../process/last/LastQuerySortOperator.java | 8 +-
.../operator/sink/ShuffleHelperOperator.java | 2 +-
.../execution/operator/source/SeriesScanUtil.java | 12 +-
.../db/mpp/execution/schedule/DriverScheduler.java | 2 +-
.../metric/PerformanceOverviewMetricsManager.java | 214 -
.../db/mpp/plan/execution/QueryExecution.java | 11 +-
.../config/metadata/ShowVariablesTask.java | 4 +-
.../BuiltInScalarFunctionHelperFactory.java | 3 +
.../builtin/helper/SubStringFunctionHelper.java | 129 +
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 29 +
.../db/mpp/plan/parser/StatementGenerator.java | 66 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 3 +-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 190 +-
.../plan/scheduler/AsyncSendPlanNodeHandler.java | 8 +-
.../scheduler/FragmentInstanceDispatcherImpl.java | 6 +-
.../scalar/SubStringFunctionColumnTransformer.java | 63 +
.../unary/scalar/SubStringFunctionTransformer.java | 63 +
.../db/service/metrics/DataNodeMetricsHelper.java | 4 +
.../metrics/IoTDBInternalLocalReporter.java | 66 +-
.../service/thrift/impl/ClientRPCServiceImpl.java | 1 +
.../engine/compaction/AbstractCompactionTest.java | 7 +-
.../compaction/FastAlignedCrossCompactionTest.java | 139 +-
.../FastNonAlignedCrossCompactionTest.java | 138 +-
.../utils/MultiTsFileDeviceIteratorTest.java | 901 +
.../mtree/lock/StampedWriterPreferredLockTest.java | 16 +-
.../schemaRegion/SchemaStatisticsTest.java | 33 +
.../iotdb/db/mpp/execution/exchange/Utils.java | 4 +-
.../db/mpp/execution/memory/MemoryPoolTest.java | 26 +-
.../operator/LastQueryMergeOperatorTest.java | 16 +-
.../execution/operator/MergeSortOperatorTest.java | 7 +-
.../db/mpp/plan/plan/PipelineBuilderTest.java | 96 +-
.../series/SeriesScanLimitOffsetPushDownTest.java | 83 +-
site/src/main/.vuepress/sidebar/V1.0.x/zh.ts | 1 +
site/src/main/.vuepress/sidebar/V1.1.x/zh.ts | 1 +
site/src/main/.vuepress/sidebar/zh.ts | 1 +
.../src/main/thrift/confignode.thrift | 2 +-
thrift-mlnode/src/main/thrift/mlnode.thrift | 1 +
thrift/src/main/thrift/client.thrift | 5 +-
.../read/reader/series/PaginationController.java | 23 +
142 files changed, 5098 insertions(+), 32735 deletions(-)