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/08/03 12:48:32 UTC

[iotdb] 01/02: Merge branch 'master' into beyyes/count_time_fe

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

caogaofei pushed a commit to branch beyyes/count_time_fe
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit cc15076a1382c4d6b18fbfdae31b2c333fb50129
Merge: 3252e7d1f18 e9b9b63a957
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Aug 3 12:19:45 2023 +0800

    Merge branch 'master' into beyyes/count_time_fe

 .github/workflows/client-python.yml                |   1 -
 docker/src/main/Dockerfile-1c1d                    |   8 +-
 iotdb-client/client-py/iotdb/IoTDBContainer.py     |  11 +
 .../confignode/conf/ConfigNodeStartupCheck.java    |   6 -
 .../pipe/connector/base/IoTDBThriftConnector.java  |  85 ++++++
 .../pipe/connector/v1/IoTDBThriftConnectorV1.java  | 184 ++++++++----
 .../pipe/connector/v2/IoTDBThriftConnectorV2.java  |  91 +-----
 .../java/org/apache/iotdb/db/service/DataNode.java |   8 -
 .../db/storageengine/dataregion/DataRegion.java    |   2 +-
 .../dataregion/HashLastFlushTimeMap.java           |   6 +-
 .../performer/impl/FastCompactionPerformer.java    |   2 +-
 .../dataregion/tsfile/TsFileResource.java          |  13 +-
 .../tsfile/timeindex/DeviceTimeIndex.java          |   4 +-
 .../dataregion/tsfile/timeindex/FileTimeIndex.java |   4 +-
 .../dataregion/tsfile/timeindex/ITimeIndex.java    |   7 +-
 .../dataregion/LastFlushTimeMapTest.java           | 317 ++++++++-------------
 .../iotdb/commons/pipe/PipeMetaDeSerTest.java      |  39 ++-
 17 files changed, 411 insertions(+), 377 deletions(-)