This is an automated email from the ASF dual-hosted git repository.

rong pushed a commit to branch remove-sync-entry
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 416e2f356fa3fed0e4c2e00acb2cd36d20fc92ce
Merge: fc06d7750bf b06a3bf2ace
Author: Steve Yurong Su <[email protected]>
AuthorDate: Sat Jun 17 03:36:32 2023 +0800

    Merge branch 'master' of github.com:apache/iotdb into remove-sync-entry

 .../iotdb/confignode/conf/ConfigNodeConfig.java    | 11 ----
 .../confignode/conf/ConfigNodeDescriptor.java      |  7 ---
 .../confignode/conf/ConfigNodeStartupCheck.java    | 16 +++++
 .../confignode/conf/SystemPropertiesUtils.java     | 58 +++++++++---------
 .../iotdb/confignode/manager/ConfigManager.java    | 20 ++++++-
 .../partition/GreedyPartitionAllocator.java        |  4 +-
 .../iotdb/confignode/manager/node/NodeManager.java |  5 +-
 .../manager/partition/PartitionManager.java        |  6 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |  3 +-
 .../confignode/it/utils/ConfigNodeTestUtils.java   |  2 +
 .../iotdb/session/it/IoTDBSessionComplexIT.java    |  8 +--
 .../src/main/thrift/confignode.thrift              |  5 ++
 .../resources/conf/iotdb-common.properties         |  4 --
 .../apache/iotdb/commons/conf/CommonConfig.java    | 55 ++++++++++++++++-
 .../iotdb/commons/conf/CommonDescriptor.java       | 23 ++++++++
 .../iotdb/commons/utils/CommonDateTimeUtils.java   | 42 +++++++++++++
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 63 --------------------
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  | 25 +-------
 .../org/apache/iotdb/db/conf/IoTDBStartCheck.java  | 69 +---------------------
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  2 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   | 13 ++--
 .../metadata/cache/DataNodeLastCacheManager.java   |  4 +-
 .../db/metadata/metric/SchemaEngineMemMetric.java  |  3 +-
 .../db/metadata/metric/SchemaMetricManager.java    |  4 +-
 .../db/metadata/rescon/SchemaResourceManager.java  |  6 +-
 .../db/metadata/schemaregion/SchemaEngine.java     |  9 ++-
 .../apache/iotdb/db/metadata/tag/TagLogFile.java   |  3 +-
 .../apache/iotdb/db/metadata/tag/TagManager.java   | 21 ++++---
 .../operator/process/last/LastQueryUtil.java       |  4 +-
 .../config/metadata/GetTimeSlotListTask.java       |  4 +-
 .../pipe/connector/v1/IoTDBThriftConnectorV1.java  |  3 +-
 .../pipe/connector/v1/IoTDBThriftReceiverV1.java   |  9 ++-
 .../pipe/connector/v2/IoTDBThriftConnectorV2.java  |  3 +-
 .../influxdb/handler/QueryHandlerFactory.java      |  3 +-
 .../influxdb/meta/InfluxDBMetaManagerFactory.java  |  3 +-
 .../rest/v1/impl/GrafanaApiServiceImpl.java        |  3 +-
 .../rest/v2/impl/GrafanaApiServiceImpl.java        |  3 +-
 .../apache/iotdb/db/service/IoTDBShutdownHook.java |  2 +-
 .../service/thrift/impl/ClientRPCServiceImpl.java  |  2 +-
 .../org/apache/iotdb/db/utils/DateTimeUtils.java   | 24 ++------
 .../apache/iotdb/db/utils/TimePartitionUtils.java  |  4 +-
 .../SizeTieredCompactionSelectorTest.java          |  5 +-
 .../db/engine/storagegroup/DataRegionTest.java     | 20 ++++---
 .../iotdb/db/engine/storagegroup/TTLTest.java      |  7 ++-
 .../mtree/schemafile/AliasIndexPageTest.java       |  6 +-
 .../mtree/schemafile/InternalPageTest.java         |  6 +-
 .../mtree/schemafile/SchemaFileLogTest.java        |  6 +-
 .../metadata/mtree/schemafile/SchemaFileTest.java  |  6 +-
 .../mtree/schemafile/WrappedSegmentTest.java       |  6 +-
 .../schemaRegion/AbstractSchemaRegionTest.java     |  9 ++-
 .../mpp/plan/analyze/QueryTimePartitionTest.java   | 62 +++++++++----------
 .../plan/node/write/WritePlanNodeSplitTest.java    |  7 ++-
 .../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 12 ++--
 .../iotdb/db/tools/PBTreeFileSketchTest.java       |  6 +-
 .../iotdb/db/tools/TsFileAndModSettleToolTest.java | 12 ++--
 55 files changed, 370 insertions(+), 358 deletions(-)


Reply via email to