You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/06/10 19:58:23 UTC
[iotdb] 02/02: merge master and fix conflicts
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch pipe-parallel-connector
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4285d48c52494b9d7ba93c2952d30e14f6335fc9
Merge: e22e3d7ab03 cdcd4c3be42
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Sun Jun 11 03:57:55 2023 +0800
merge master and fix conflicts
.github/workflows/sonar-coveralls.yml | 39 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 3 +-
.../response/pipe/task/PipeTableResp.java | 2 +-
.../pipe/runtime/PipeRuntimeCoordinator.java | 19 +-
.../manager/pipe/task/PipeTaskCoordinator.java | 12 +-
.../persistence/pipe/PipePluginInfo.java | 8 +-
.../confignode/persistence/pipe/PipeTaskInfo.java | 2 +-
.../impl/pipe/AbstractOperatePipeProcedureV2.java | 9 +-
.../impl/pipe/task/CreatePipeProcedureV2.java | 37 +-
.../impl/pipe/task/DropPipeProcedureV2.java | 9 +-
.../impl/pipe/task/StartPipeProcedureV2.java | 18 +-
.../impl/pipe/task/StopPipeProcedureV2.java | 17 +-
.../consensus/iot/IoTConsensusServerImpl.java | 7 +-
docs/UserGuide/Query-Data/Group-By.md | 1204 +++++++-------
docs/UserGuide/Query-Data/Overview.md | 2 +-
docs/zh/UserGuide/Query-Data/Group-By.md | 880 +++++------
.../iotdb/it/env/cluster/MppCommonConfig.java | 2 +-
.../db/it/groupby/IoTDBGroupByConditionIT.java | 44 +
.../iotdb/db/it/groupby/IoTDBGroupByCountIT.java | 44 +
.../db/it/groupby/IoTDBGroupByVariationIT.java | 23 +-
.../apache/iotdb/db/it/orderBy/IoTDBOrderByIT.java | 74 +-
.../it/schema/view/IoTDBCreateAndShowViewIT.java | 430 +++++
.../iotdb/db/it/view/IoTDBCreateAndShowViewIT.java | 294 ----
.../org/apache/iotdb/util/AbstractSchemaIT.java | 3 +-
.../org/apache/iotdb/pipe/api/PipeCollector.java | 7 +-
.../org/apache/iotdb/pipe/api/PipeConnector.java | 6 +-
.../org/apache/iotdb/pipe/api/PipeProcessor.java | 6 +-
.../api/customizer/PipeRuntimeConfiguration.java | 28 -
.../PipeCollectorRuntimeConfiguration.java | 8 +-
.../PipeConnectorRuntimeConfiguration.java | 8 +-
.../PipeProcessorRuntimeConfiguration.java | 8 +-
.../PipeRuntimeConfiguration.java} | 7 +-
.../PipeRuntimeEnvironment.java} | 9 +-
.../PipeConnectorRuntimeConfiguration.java | 84 -
.../retry/EqualRetryIntervalStrategy.java | 63 -
.../retry/ExponentialRetryIntervalStrategy.java | 70 -
.../customizer/connector/retry/RetryStrategy.java | 34 -
.../{ => parameter}/PipeParameterValidator.java | 2 +-
.../customizer/{ => parameter}/PipeParameters.java | 6 +-
.../PipeProcessorRuntimeConfiguration.java | 35 -
iotdb-client/client-py/iotdb/Session.py | 20 +-
.../client-py/iotdb/sqlalchemy/IoTDBSQLCompiler.py | 56 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
.../metrics/metricsets/cpu/CpuUsageMetrics.java | 37 +-
.../resources/conf/iotdb-common.properties | 4 +
.../consensus/index/impl/RecoverProgressIndex.java | 6 +
.../pipe/plugin/builtin/BuiltinPipePlugin.java | 4 +-
.../plugin/builtin/collector/IoTDBCollector.java | 6 +-
.../builtin/connector/DoNothingConnector.java | 6 +-
...tConnector.java => IoTDBSyncConnectorV1_1.java} | 16 +-
.../builtin/connector/IoTDBThriftConnector.java | 6 +-
.../builtin/processor/DoNothingProcessor.java | 6 +-
.../commons/pipe/task/meta/PipeStaticMeta.java | 2 +-
pom.xml | 21 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 37 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 137 +-
.../execute/task/CrossSpaceCompactionTask.java | 20 +-
.../execute/task/InnerSpaceCompactionTask.java | 17 +-
.../estimator/AbstractCompactionEstimator.java | 6 +-
.../ReadPointCrossCompactionEstimator.java | 42 +-
.../impl/RewriteCrossSpaceCompactionSelector.java | 14 +-
.../utils/CrossSpaceCompactionCandidate.java | 63 +-
.../db/engine/storagegroup/TsFileProcessor.java | 15 +-
.../db/engine/storagegroup/TsFileResource.java | 13 +-
.../metadata/DuplicateInsertException.java} | 19 +-
.../metadata/view/UnsupportedViewException.java} | 22 +-
.../view/ViewContainsAggregationException.java | 13 +-
.../metadata/mnode/mem/info/LogicalViewInfo.java | 10 +-
.../iotdb/db/metadata/view/ViewPathType.java | 8 +-
.../apache/iotdb/db/metadata/view/ViewPaths.java | 26 +
.../execution/executor/RegionWriteExecutor.java | 28 +
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 83 +-
.../iotdb/db/mpp/plan/analyze/SelectIntoUtils.java | 7 +
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 99 +-
.../db/mpp/plan/planner/LogicalPlanVisitor.java | 3 +-
.../node/metedata/write/AlterTimeSeriesNode.java | 33 +-
.../plan/statement/crud/InsertBaseStatement.java | 27 +
.../crud/InsertMultiTabletsStatement.java | 31 +
.../crud/InsertRowsOfOneDeviceStatement.java | 1 +
.../plan/statement/crud/InsertRowsStatement.java | 31 +
.../db/mpp/plan/statement/crud/QueryStatement.java | 24 +-
.../metadata/AlterTimeSeriesStatement.java | 10 +
.../metadata/view/AlterLogicalViewStatement.java | 11 +
.../metadata/view/CreateLogicalViewStatement.java | 51 +-
.../db/pipe/agent/plugin/PipePluginAgent.java | 8 +-
.../db/pipe/agent/runtime/PipeRuntimeAgent.java | 12 +-
.../SimpleConsensusProgressIndexAssigner.java | 5 +-
.../iotdb/db/pipe/agent/task/PipeTaskAgent.java | 96 +-
.../pipe/collector/IoTDBDataRegionCollector.java | 68 +-
.../PipeHistoricalDataRegionTsFileCollector.java | 99 +-
.../realtime/PipeRealtimeDataRegionCollector.java | 26 +-
.../PipeRealtimeDataRegionFakeCollector.java | 12 +-
.../PipeRealtimeDataRegionHybridCollector.java | 8 +-
.../PipeRealtimeDataRegionLogCollector.java | 7 +-
.../PipeRealtimeDataRegionTsFileCollector.java | 7 +-
.../{ => constant}/PipeCollectorConstant.java | 4 +-
.../{ => constant}/PipeConnectorConstant.java | 7 +-
.../{ => constant}/PipeProcessorConstant.java | 2 +-
.../configuraion/PipeTaskRuntimeConfiguration.java | 42 +
.../env/PipeTaskCollectorRuntimeEnvironment.java} | 26 +-
.../plugin/env/PipeTaskRuntimeEnvironment.java | 25 +-
.../lagacy/IoTDBSyncConnectorImplV1_1.java | 268 ++++
.../pipe/connector/v1/IoTDBThriftConnectorV1.java | 33 +-
.../apache/iotdb/db/pipe/event/EnrichedEvent.java | 2 +-
.../common/row/PipeBinaryTransformer.java} | 19 +-
.../iotdb/db/pipe/event/common/row/PipeRow.java | 10 +-
.../db/pipe/event/common/row/PipeRowCollector.java | 10 +-
.../tablet/PipeInsertNodeTabletInsertionEvent.java | 12 +
.../common/tablet/PipeRawTabletInsertionEvent.java | 2 +-
.../common/tsfile/PipeTsFileInsertionEvent.java | 23 +-
.../tsfile/TsFileInsertionDataContainer.java | 87 +-
.../tsfile/TsFileInsertionDataTabletIterator.java | 10 +-
.../db/pipe/processor/PipeDoNothingProcessor.java | 19 +-
.../pipe/resource/wal/PipeWALResourceManager.java | 5 +-
.../apache/iotdb/db/pipe/task/PipeTaskBuilder.java | 17 +-
.../db/pipe/task/stage/PipeTaskCollectorStage.java | 89 +-
.../db/pipe/task/stage/PipeTaskConnectorStage.java | 10 +-
.../db/pipe/task/stage/PipeTaskProcessorStage.java | 69 +-
.../task/subtask/PipeConnectorSubtaskManager.java | 43 +-
.../db/service/metrics/DataNodeMetricsHelper.java | 1 +
.../impl/DataNodeInternalRPCServiceImpl.java | 9 +-
.../file/UnsealedTsFileRecoverPerformer.java | 2 +-
.../engine/compaction/CompactionSchedulerTest.java | 5 +
.../compaction/CompactionTaskManagerTest.java | 2 +-
.../FastNonAlignedCrossCompactionTest.java | 145 ++
.../cross/CrossSpaceCompactionSelectorTest.java | 1648 ++++++++++++++++++++
.../db/engine/compaction/cross/MergeTest.java | 1 +
.../cross/RewriteCompactionFileSelectorTest.java | 47 +-
.../inner/InnerSpaceCompactionSelectorTest.java | 626 ++++++++
.../db/engine/settle/SettleRequestHandlerTest.java | 1 -
.../db/engine/storagegroup/DataRegionTest.java | 27 +
.../collector/CachedSchemaPatternMatcherTest.java | 31 +-
.../db/pipe/collector/PipeRealtimeCollectTest.java | 38 +-
.../event/TsFileInsertionDataContainerTest.java | 169 +-
134 files changed, 6074 insertions(+), 2515 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java
index 919d345acde,3e1e0db312c..34ec4c2f63f
--- a/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java
+++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java
@@@ -25,7 -25,7 +25,6 @@@ import org.apache.iotdb.commons.conf.Co
import org.apache.iotdb.commons.pipe.config.PipeConfig;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
- import org.apache.iotdb.db.pipe.config.PipeConnectorConstant;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorClient;
import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp;
import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq;
import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq;