You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by er...@apache.org on 2023/01/06 00:01:49 UTC
[iotdb] branch master updated (afc58a0ad3 -> a2f39140f9)
This is an automated email from the ASF dual-hosted git repository.
ericpai pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from afc58a0ad3 [IOTDB-5364] Refactor Count TimeSeries Group By Level based on SchemaReader (#8759)
add a2f39140f9 [IOTDB-5303] Refine IT: Make cluster properties mutable easily (#8671)
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 +
integration-test/checkstyle.xml | 2 +-
integration-test/pom.xml | 4 +-
.../java/org/apache/iotdb/it/env/Cluster1Env.java | 45 ---
.../org/apache/iotdb/it/env/ConfigFactory.java | 45 ---
.../java/org/apache/iotdb/it/env/EnvFactory.java | 3 +
.../java/org/apache/iotdb/it/env/MppConfig.java | 398 ------------------
.../apache/iotdb/it/env/RemoteServerConfig.java | 23 --
.../java/org/apache/iotdb/it/env/SimpleEnv.java | 45 ---
.../iotdb/it/env/{ => cluster}/AbstractEnv.java | 139 ++++---
.../it/env/{ => cluster}/AbstractNodeWrapper.java | 140 +++++--
.../apache/iotdb/it/env/cluster/Cluster1Env.java | 19 +-
.../it/env/{ => cluster}/ConfigNodeWrapper.java | 62 ++-
.../it/env/{ => cluster}/DataNodeWrapper.java | 86 ++--
.../iotdb/it/env/{ => cluster}/EnvUtils.java | 61 ++-
.../apache/iotdb/it/env/cluster/MppBaseConfig.java | 120 ++++++
.../iotdb/it/env/cluster/MppClusterConfig.java | 68 ++++
.../iotdb/it/env/cluster/MppCommonConfig.java | 334 +++++++++++++++
.../iotdb/it/env/cluster/MppConfigNodeConfig.java | 39 +-
.../iotdb/it/env/cluster/MppDataNodeConfig.java | 39 +-
.../it/env/cluster/MppSharedCommonConfig.java | 346 ++++++++++++++++
.../org/apache/iotdb/it/env/cluster/SimpleEnv.java | 16 +-
.../iotdb/it/env/remote/RemoteClusterConfig.java | 56 +++
.../iotdb/it/env/remote/RemoteCommonConfig.java | 249 ++++++++++++
.../it/env/remote/RemoteConfigNodeConfig.java | 9 +-
.../iotdb/it/env/remote/RemoteDataNodeConfig.java | 5 +-
.../iotdb/it/env/{ => remote}/RemoteServerEnv.java | 43 +-
.../org/apache/iotdb/itbase/env/BaseConfig.java | 447 ---------------------
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 55 ++-
.../apache/iotdb/itbase/env/BaseNodeWrapper.java | 4 -
.../org/apache/iotdb/itbase/env/ClusterConfig.java | 60 +++
.../org/apache/iotdb/itbase/env/CommonConfig.java | 113 ++++++
.../apache/iotdb/itbase/env/ConfigNodeConfig.java | 10 +-
.../apache/iotdb/itbase/env/DataNodeConfig.java | 10 +-
.../apache/iotdb/cli/it/StartClientScriptIT.java | 4 +-
.../confignode/it/IoTDBClusterAuthorityIT.java | 2 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 30 +-
.../confignode/it/IoTDBSnapshotTransferIT.java | 9 +-
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 2 +-
.../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 40 +-
.../it/cluster/IoTDBClusterNodeGetterIT.java | 63 +--
.../it/cluster/IoTDBClusterRestartIT.java | 55 +--
.../load/IoTDBClusterRegionLeaderBalancingIT.java | 71 +---
.../it/load/IoTDBConfigNodeSwitchLeaderIT.java | 52 +--
.../partition/IoTDBAutoRegionGroupExtensionIT.java | 57 +--
.../IoTDBCustomRegionGroupExtensionIT.java | 66 +--
.../it/partition/IoTDBPartitionDurableIT.java | 50 +--
.../it/partition/IoTDBPartitionGetterIT.java | 69 +---
.../partition/IoTDBPartitionInheritPolicyIT.java | 45 +--
.../confignode/it/utils/ConfigNodeTestUtils.java | 51 ++-
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 10 +-
.../java/org/apache/iotdb/db/it/IoTDBAuthIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBDatetimeFormatIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBDeletionIT.java | 19 +-
.../org/apache/iotdb/db/it/IoTDBEncodingIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBExampleIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBExecuteBatchIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBFilterBetweenIT.java | 4 +-
.../java/org/apache/iotdb/db/it/IoTDBFilterIT.java | 30 +-
.../org/apache/iotdb/db/it/IoTDBFilterNullIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBFloatPrecisionIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBFlushQueryMergeIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBInsertMultiRowIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBInsertNaNIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBInsertNullIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBInsertWithQueryIT.java | 4 +-
.../iotdb/db/it/IoTDBInsertWithoutTimeIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBMultiDeviceIT.java | 47 +--
.../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java | 34 +-
.../iotdb/db/it/IoTDBPartialInsertionIT.java | 8 +-
.../db/it/IoTDBQueryWithRecreatedTimeseriesIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBQuotedPathIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBRecoverIT.java | 4 +-
.../apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBRestartIT.java | 4 +-
.../it/IoTDBSameMeasurementsDifferentTypesIT.java | 30 +-
.../java/org/apache/iotdb/db/it/IoTDBSettleIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java | 4 +-
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 4 +-
.../it/IoTDBSyntaxConventionStringLiteralIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBTimeZoneIT.java | 4 +-
.../java/org/apache/iotdb/db/it/IoTDBTtlIT.java | 4 +-
.../it/aggregation/IoTDBAggregationByLevelIT.java | 4 +-
.../it/aggregation/IoTDBAggregationDeleteIT.java | 10 +-
.../db/it/aggregation/IoTDBAggregationIT.java | 6 +-
.../aggregation/IoTDBAggregationLargeDataIT.java | 9 +-
.../it/aggregation/IoTDBAggregationOptimizeIT.java | 4 +-
.../aggregation/IoTDBAggregationScanOrderIT.java | 24 +-
.../aggregation/IoTDBAggregationSmallDataIT.java | 4 +-
.../db/it/aggregation/IoTDBTagAggregationIT.java | 4 +-
.../db/it/alignbydevice/IoTDBAlignByDeviceIT.java | 4 +-
.../IoTDBOrderByWithAlignByDeviceIT.java | 4 +-
.../aligned/IoTDBAggregationWithDeletion2IT.java | 31 +-
.../it/aligned/IoTDBAggregationWithDeletionIT.java | 28 +-
.../db/it/aligned/IoTDBAlignedDataDeletionIT.java | 20 +-
.../db/it/aligned/IoTDBAlignedLastQuery2IT.java | 31 +-
.../db/it/aligned/IoTDBAlignedLastQuery3IT.java | 31 +-
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 29 +-
.../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 31 +-
.../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 30 +-
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 28 +-
.../IoTDBAlignedSeriesQueryWithDeletionIT.java | 29 +-
.../IoTDBCountMultiTimesWithDeletionIT.java | 29 +-
.../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 30 +-
...GroupByQueryWithValueFilterWithDeletion2IT.java | 30 +-
...BGroupByQueryWithValueFilterWithDeletionIT.java | 29 +-
...upByQueryWithoutValueFilterWithDeletion2IT.java | 31 +-
...oupByQueryWithoutValueFilterWithDeletionIT.java | 31 +-
.../db/it/aligned/IoTDBInsertAlignedValues2IT.java | 18 +-
.../db/it/aligned/IoTDBInsertAlignedValues3IT.java | 18 +-
.../db/it/aligned/IoTDBInsertAlignedValues4IT.java | 18 +-
.../db/it/aligned/IoTDBInsertAlignedValuesIT.java | 10 +-
.../it/aligned/IoTDBLastQueryWithDeletion2IT.java | 27 +-
.../it/aligned/IoTDBLastQueryWithDeletionIT.java | 24 +-
.../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 30 +-
.../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 29 +-
...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 30 +-
...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 29 +-
...BRawQueryWithoutValueFilterWithDeletion2IT.java | 27 +-
...DBRawQueryWithoutValueFilterWithDeletionIT.java | 24 +-
.../org/apache/iotdb/db/it/cq/IoTDBCQExecIT.java | 4 +-
.../java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java | 4 +-
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 275 -------------
.../iotdb/db/it/env/StandaloneEnvConfig.java | 354 ----------------
.../apache/iotdb/db/it/groupby/IOTDBGroupByIT.java | 11 +-
.../db/it/groupby/IoTDBGroupByNaturalMonthIT.java | 4 +-
.../iotdb/db/it/groupby/IoTDBGroupByUnseqIT.java | 28 +-
.../apache/iotdb/db/it/groupby/IoTDBHavingIT.java | 11 +-
.../iotdb/db/it/groupby/IoTDBLeftORightCIT.java | 4 +-
.../iotdb/db/it/last/IoTDBLastWithTTLIT.java | 4 +-
.../apache/iotdb/db/it/mqtt/IoTDBMQTTSinkIT.java | 12 +-
.../org/apache/iotdb/db/it/query/IoTDBAliasIT.java | 4 +-
.../iotdb/db/it/query/IoTDBArithmeticIT.java | 4 +-
.../iotdb/db/it/query/IoTDBFuzzyQueryIT.java | 4 +-
.../org/apache/iotdb/db/it/query/IoTDBInIT.java | 4 +-
.../iotdb/db/it/query/IoTDBNullOperandIT.java | 11 +-
.../iotdb/db/it/query/IoTDBNullValueFillIT.java | 4 +-
.../iotdb/db/it/query/IoTDBPaginationIT.java | 11 +-
.../apache/iotdb/db/it/query/IoTDBQueryDemoIT.java | 4 +-
.../query/IoTDBQueryWithComplexValueFilterIT.java | 4 +-
.../apache/iotdb/db/it/query/IoTDBResultSetIT.java | 4 +-
.../it/query/IoTDBSelectCompareExpressionIT.java | 4 +-
.../iotdb/db/it/query/IoTDBSelectSchemaIT.java | 4 +-
.../db/it/schema/IoTDBAutoCreateSchemaIT.java | 4 +-
.../it/schema/IoTDBCreateAlignedTimeseriesIT.java | 4 +-
.../db/it/schema/IoTDBCreateStorageGroupIT.java | 4 +-
.../db/it/schema/IoTDBCreateTimeseriesIT.java | 4 +-
.../db/it/schema/IoTDBDeactivateTemplateIT.java | 4 +-
.../it/schema/IoTDBDeleteAlignedTimeseriesIT.java | 12 +-
.../db/it/schema/IoTDBDeleteStorageGroupIT.java | 4 +-
.../db/it/schema/IoTDBDeleteTimeseriesIT.java | 11 +-
.../schema/IoTDBDeleteTimeseriesSchemaFileIT.java | 8 +-
.../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 4 +-
.../it/schema/IoTDBMetadataFetchSchemaFileIT.java | 8 +-
.../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 4 +-
.../db/it/schema/IoTDBSortedShowTimeseriesIT.java | 4 +-
.../apache/iotdb/db/it/schema/IoTDBTagAlterIT.java | 4 +-
.../org/apache/iotdb/db/it/schema/IoTDBTagIT.java | 4 +-
.../iotdb/db/it/selectinto/IoTDBSelectInto2IT.java | 22 +-
.../iotdb/db/it/selectinto/IoTDBSelectInto3IT.java | 18 +-
.../iotdb/db/it/selectinto/IoTDBSelectIntoIT.java | 13 +-
.../org/apache/iotdb/db/it/sync/IoTDBPipeIT.java | 4 +-
.../apache/iotdb/db/it/sync/IoTDBPipeSinkIT.java | 4 +-
.../db/it/trigger/IoTDBTriggerExecutionIT.java | 4 +-
.../db/it/trigger/IoTDBTriggerManagementIT.java | 4 +-
.../org/apache/iotdb/db/it/udf/IoTDBUDFM4IT.java | 14 +-
.../iotdb/db/it/udf/IoTDBUDFManagementIT.java | 4 +-
.../db/it/udf/IoTDBUDFOtherWindowQueryIT.java | 33 +-
.../iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java | 33 +-
.../db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java | 24 +-
.../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 4 +-
.../iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java | 4 +-
.../iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java | 14 +-
.../iotdb/db/it/watermark/IoTDBWatermarkIT.java | 34 +-
.../db/it/withoutNull/IoTDBWithoutAllNullIT.java | 4 +-
.../db/it/withoutNull/IoTDBWithoutAnyNullIT.java | 4 +-
.../withoutNull/IoTDBWithoutNullAllFilterIT.java | 9 +-
.../withoutNull/IoTDBWithoutNullAnyFilterIT.java | 4 +-
.../apache/iotdb/libudf/it/anomaly/AnomalyIT.java | 10 +-
.../apache/iotdb/libudf/it/dmatch/DMatchIT.java | 10 +-
.../iotdb/libudf/it/dprofile/DProfileIT.java | 10 +-
.../iotdb/libudf/it/dquality/DQualityIT.java | 10 +-
.../apache/iotdb/libudf/it/drepair/DRepairIT.java | 10 +-
.../iotdb/libudf/it/frequency/FrequencyIT.java | 10 +-
.../apache/iotdb/libudf/it/series/SeriesIT.java | 10 +-
.../apache/iotdb/libudf/it/string/StringIT.java | 10 +-
.../iotdb/session/it/IoTDBConnectionInfoIT.java | 4 +-
.../session/it/IoTDBSessionAlignedInsertIT.java | 11 +-
.../iotdb/session/it/IoTDBSessionComplexIT.java | 6 +-
.../it/IoTDBSessionDisableMemControlIT.java | 13 +-
.../iotdb/session/it/IoTDBSessionInsertNullIT.java | 4 +-
.../IoTDBSessionInsertWithTriggerExecutionIT.java | 4 +-
.../session/it/IoTDBSessionSchemaTemplateIT.java | 4 +-
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 4 +-
.../session/it/IoTDBSessionSyntaxConventionIT.java | 4 +-
.../org/apache/iotdb/session/it/SessionIT.java | 4 +-
.../iotdb/session/it/pool/SessionPoolIT.java | 4 +-
.../org/apache/iotdb/tools/ExportCsvTestIT.java | 4 +-
.../org/apache/iotdb/tools/ExportTsFileTestIT.java | 4 +-
.../iotdb/zeppelin/it/IoTDBInterpreterIT.java | 4 +-
200 files changed, 2612 insertions(+), 3517 deletions(-)
delete mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/Cluster1Env.java
delete mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/ConfigFactory.java
delete mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java
delete mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/RemoteServerConfig.java
delete mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/SimpleEnv.java
rename integration-test/src/main/java/org/apache/iotdb/it/env/{ => cluster}/AbstractEnv.java (88%)
rename integration-test/src/main/java/org/apache/iotdb/it/env/{ => cluster}/AbstractNodeWrapper.java (73%)
copy udf-api/src/main/java/org/apache/iotdb/udf/api/exception/UDFOutputSeriesDataTypeNotValidException.java => integration-test/src/main/java/org/apache/iotdb/it/env/cluster/Cluster1Env.java (68%)
rename integration-test/src/main/java/org/apache/iotdb/it/env/{ => cluster}/ConfigNodeWrapper.java (63%)
rename integration-test/src/main/java/org/apache/iotdb/it/env/{ => cluster}/DataNodeWrapper.java (57%)
rename integration-test/src/main/java/org/apache/iotdb/it/env/{ => cluster}/EnvUtils.java (58%)
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppBaseConfig.java
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppClusterConfig.java
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppCommonConfig.java
copy tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedBatchReader.java => integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppConfigNodeConfig.java (54%)
copy tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedBatchReader.java => integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppDataNodeConfig.java (54%)
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppSharedCommonConfig.java
copy node-commons/src/main/java/org/apache/iotdb/commons/consensus/SchemaRegionId.java => integration-test/src/main/java/org/apache/iotdb/it/env/cluster/SimpleEnv.java (73%)
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteClusterConfig.java
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteCommonConfig.java
copy confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/RemoveConfigNodeState.java => integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteConfigNodeConfig.java (83%)
copy confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceMBean.java => integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteDataNodeConfig.java (84%)
rename integration-test/src/main/java/org/apache/iotdb/it/env/{ => remote}/RemoteServerEnv.java (88%)
delete mode 100644 integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
create mode 100644 integration-test/src/main/java/org/apache/iotdb/itbase/env/ClusterConfig.java
create mode 100644 integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
copy confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/RemoveConfigNodeState.java => integration-test/src/main/java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java (83%)
copy confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/RemoveConfigNodeState.java => integration-test/src/main/java/org/apache/iotdb/itbase/env/DataNodeConfig.java (84%)
delete mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnv.java
delete mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java