You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2022/11/22 05:14:53 UTC

[iotdb] 02/02: Merge branch 'rel/0.12' of https://github.com/apache/iotdb into rel/0.12

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

marklau99 pushed a commit to branch IOTDB-5010
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 4630d860a9e8d32b65c549cb5942eb79476d14a7
Merge: ca26589529 05bc0168d6
Author: LiuXuxin <li...@outlook.com>
AuthorDate: Tue Nov 22 09:24:46 2022 +0800

    Merge branch 'rel/0.12' of https://github.com/apache/iotdb into rel/0.12

 .gitignore                                         |   3 +-
 RELEASE_NOTES.md                                   |  16 +
 antlr/pom.xml                                      |   2 +-
 cli/pom.xml                                        |   2 +-
 client-cpp/pom.xml                                 |   6 +-
 client-py/pom.xml                                  |   2 +-
 client-py/setup.py                                 |   2 +-
 cluster/pom.xml                                    |   2 +-
 code-coverage/pom.xml                              |   2 +-
 compile-tools/pom.xml                              |   8 +-
 compile-tools/thrift/pom.xml                       |   2 +-
 cross-tests/pom.xml                                |   2 +-
 distribution/pom.xml                               |   4 +-
 docker/src/main/Dockerfile-0.12.6-cluster          |  53 +++
 docker/src/main/Dockerfile-0.12.6-grafana          |  41 ++
 docker/src/main/Dockerfile-0.12.6-node             |  45 ++
 example/client-cpp-example/pom.xml                 |   4 +-
 example/flink/pom.xml                              |   2 +-
 example/hadoop/pom.xml                             |   2 +-
 example/jdbc/pom.xml                               |   2 +-
 example/kafka/pom.xml                              |   2 +-
 example/mqtt/pom.xml                               |   2 +-
 example/pom.xml                                    |   2 +-
 example/pulsar/pom.xml                             |   2 +-
 example/rocketmq/pom.xml                           |   2 +-
 example/session/pom.xml                            |   2 +-
 example/spark/pom.xml                              |   2 +-
 example/tsfile/pom.xml                             |   2 +-
 example/udf/pom.xml                                |   4 +-
 flink-iotdb-connector/pom.xml                      |   2 +-
 flink-tsfile-connector/pom.xml                     |   2 +-
 grafana/pom.xml                                    |   4 +-
 hadoop/pom.xml                                     |   2 +-
 hive-connector/pom.xml                             |   2 +-
 jdbc/pom.xml                                       |   4 +-
 jdbc/src/main/feature/feature.xml                  |   2 +-
 pom.xml                                            |  11 +-
 {example/tsfile => rewriteFileTool}/pom.xml        |  47 ++-
 .../assembly/resources/sbin/rewrite-file-tool.sh   |  48 +++
 .../src/assembly/resources/sbin/validate-tsfile.sh |  48 +++
 .../src/assembly/rewriteFileTool.xml               |  37 +-
 .../java/org/apache/iotdb/RewriteFileTool.java     | 366 ++++++++++++++++
 .../org/apache/iotdb/TsFileValidationTool.java     | 468 +++++++++++++++++++++
 server/pom.xml                                     |   2 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  75 +++-
 .../db/engine/compaction/TsFileManagement.java     | 134 +++++-
 .../level/LevelCompactionTsFileManagement.java     | 129 ------
 .../no/NoCompactionTsFileManagement.java           |   3 -
 .../db/engine/memtable/IWritableMemChunk.java      |   6 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |  13 +-
 .../db/engine/merge/recover/MergeFileInfo.java     |   8 +-
 .../db/engine/merge/recover/MergeLogAnalyzer.java  |  23 +-
 .../db/engine/merge/task/MergeMultiChunkTask.java  | 265 ++++++------
 .../engine/storagegroup/StorageGroupProcessor.java |  15 +-
 .../db/engine/storagegroup/TsFileResource.java     |  24 +-
 .../virtualSg/VirtualStorageGroupManager.java      |  38 ++
 .../exception/compaction/CompactionException.java  |  25 ++
 .../compaction/InvalidCompactionLogException.java  |  25 ++
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  12 +-
 .../db/query/aggregation/impl/SumAggrResult.java   |   1 -
 .../dataset/RawQueryDataSetWithoutValueFilter.java |   6 +-
 .../db/query/executor/AggregationExecutor.java     |   3 +
 .../iotdb/db/query/pool/QueryTaskManager.java      |  12 +-
 .../db/query/pool/RawQueryReadTaskPoolManager.java |   5 +-
 .../iotdb/db/rescon/PrimitiveArrayManager.java     |   6 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   3 +-
 .../java/org/apache/iotdb/db/utils/QueryUtils.java |   2 +-
 .../iotdb/db/utils/datastructure/BinaryTVList.java |   7 +-
 .../db/utils/datastructure/BooleanTVList.java      |   7 +-
 .../iotdb/db/utils/datastructure/DoubleTVList.java |   7 +-
 .../iotdb/db/utils/datastructure/FloatTVList.java  |   7 +-
 .../iotdb/db/utils/datastructure/IntTVList.java    |   7 +-
 .../iotdb/db/utils/datastructure/LongTVList.java   |   7 +-
 .../iotdb/db/utils/datastructure/TVList.java       |  13 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  25 +-
 .../writelog/recover/TsFileRecoverPerformer.java   |  57 ++-
 .../iotdb/db/engine/merge/MergeNewSeriesTest.java  | 319 ++++++++++++++
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |  62 +--
 .../iotdb/db/engine/merge/MergeTaskTest.java       |   6 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    | 216 +++++++---
 .../storagegroup/StorageGroupProcessorTest.java    |  52 +++
 .../iotdb/db/integration/IOTDBGroupByIT.java       |  78 ++--
 .../iotdb/db/integration/IoTDBCheckConfigIT.java   |   6 +
 .../db/integration/IoTDBLoadExternalTsfileIT.java  |  18 +-
 .../IoTDBLoadExternalTsfileWithVirtualSGIT.java    | 189 +++++++++
 .../aggregation/IoTDBAggregationScanOrderIT.java   | 132 ++++++
 .../aggregation/IoTDBAggregationSmallDataIT.java   |   2 +-
 .../datastructure/PrimitiveArrayManagerTest.java   |  35 ++
 .../iotdb/db/writelog/recover/LogReplayerTest.java |   2 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  | 250 ++++++++++-
 service-rpc/pom.xml                                |   2 +-
 session/pom.xml                                    |   2 +-
 site/pom.xml                                       |   2 +-
 spark-iotdb-connector/pom.xml                      |   2 +-
 spark-tsfile/pom.xml                               |   2 +-
 thrift-cluster/pom.xml                             |   2 +-
 thrift-sync/pom.xml                                |   2 +-
 thrift/pom.xml                                     |   2 +-
 tsfile/pom.xml                                     |   2 +-
 .../iotdb/tsfile/file/metadata/ChunkMetadata.java  |   2 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  86 +++-
 .../org/apache/iotdb/tsfile/utils/BloomFilter.java |   7 +-
 .../apache/iotdb/tsfile/utils/PreviewIterator.java |  27 ++
 zeppelin-interpreter/pom.xml                       |   2 +-
 104 files changed, 3097 insertions(+), 649 deletions(-)