You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/07/20 05:47:51 UTC
[iotdb] 01/01: Merge branch 'rel/0.11' of
https://github.com/apache/iotdb into CRRC-log
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch CRRC-log
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9cbc0dd2e406e990029193e265a5272b513589a1
Merge: 33dd6e3 8ff38b7
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Jul 20 13:46:59 2021 +0800
Merge branch 'rel/0.11' of https://github.com/apache/iotdb 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 | 65 +++-
.../db/engine/compaction/TsFileManagement.java | 10 +-
.../level/LevelCompactionTsFileManagement.java | 166 +++++---
.../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/qp/strategy/PhysicalGenerator.java | 23 +-
.../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 +++
.../compaction/LevelCompactionRecoverTest.java | 8 +-
.../db/engine/compaction/LevelCompactionTest.java | 43 +++
.../iotdb/db/engine/merge/MergeTaskTest.java | 420 +++++++++++++++++----
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 42 +++
.../db/integration/IoTDBDeleteTimeseriesIT.java | 53 ++-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 6 +-
...easurementChunkMetadataListMapIteratorTest.java | 4 +
42 files changed, 2115 insertions(+), 631 deletions(-)