This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch resource_debug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7a70383fccc04164241874f1b9048e7cb636e8d4 Merge: 33dd6e3 974c3c0 Author: qiaojialin <[email protected]> AuthorDate: Tue Jul 13 14:39:17 2021 +0800 Merge remote-tracking branch 'origin/rel/0.11' into CRRC-log LICENSE-binary | 4 +- cli/src/assembly/resources/sbin/start-cli.sh | 0 client-py/pom.xml | 9 + client-py/setup.py | 2 +- docs/SystemDesign/TsFile/Format.md | 358 ++++++++++++++---- docs/zh/SystemDesign/TsFile/Format.md | 246 ++++++++++-- .../org/apache/iotdb/DataMigrationExample.java | 8 +- grafana/pom.xml | 2 +- jdbc/pom.xml | 2 +- pom.xml | 8 +- .../resources/conf/iotdb-engine.properties | 2 +- server/src/assembly/resources/conf/iotdb-env.bat | 39 +- server/src/assembly/resources/conf/logback.xml | 158 ++++---- .../tools/tsfileToolSet/print-tsfile-visdata.bat | 62 +++ .../tools/tsfileToolSet/print-tsfile-visdata.sh | 57 +-- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 33 +- .../compaction/CompactionMergeTaskPoolManager.java | 17 +- .../db/engine/compaction/TsFileManagement.java | 10 +- .../level/LevelCompactionTsFileManagement.java | 79 ++-- .../engine/compaction/utils/CompactionUtils.java | 8 +- .../db/engine/merge/task/MergeMultiChunkTask.java | 11 +- .../engine/storagegroup/StorageGroupProcessor.java | 51 ++- .../db/engine/storagegroup/TsFileResource.java | 6 + .../org/apache/iotdb/db/metadata/MManager.java | 16 +- .../apache/iotdb/db/qp/constant/DatetimeUtils.java | 15 + .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 55 ++- .../iotdb/db/query/reader/series/SeriesReader.java | 7 +- .../iotdb/db/rescon/PrimitiveArrayManager.java | 219 ++++++----- .../iotdb/db/tools/vis/TsFileExtractVisdata.java | 182 +++++++++ .../main/java/org/apache/iotdb/db/tools/vis/vis.m | 288 ++++++++++++++ .../java/org/apache/iotdb/db/utils/QueryUtils.java | 4 +- .../writelog/recover/TsFileRecoverPerformer.java | 2 +- .../compaction/LevelCompactionMergeTest.java | 50 +++ .../db/engine/compaction/LevelCompactionTest.java | 43 +++ .../iotdb/db/engine/merge/MergeTaskTest.java | 420 +++++++++++++++++---- .../db/integration/IoTDBDeleteTimeseriesIT.java | 53 ++- .../iotdb/tsfile/read/TsFileSequenceReader.java | 6 +- ...easurementChunkMetadataListMapIteratorTest.java | 4 + 39 files changed, 1964 insertions(+), 574 deletions(-)
