This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 76acdd5 Merge branch 'master' into cluster_premerge
add bd31f66 modify right management
add 1f3febd modify right management
add 103b22e Update website download links
add 7585123 fix some doc and SketchTool mistakes (#1185)
add 6fe6501 Concurrently write time partition (#1174)
add f4a16bd disable merge by default
add 174a219 [IOTDB-681] Fix bugs caused by batch manner displaying query
results in CLI
add 4fe8946 count_timeseries
add c323110 Added Blogpost from Jialin and Blog Section. Added Blog
Section in vue / site.
add d4d5e00 Merge remote-tracking branch 'origin/master'
add 91fd0ea [IOTDB-680] Make LRUCache more accurate (#1212)
add 3fe522a Online Upgrade Tool (#983)
add a7b40b2 [IOTDB-655] Update documents of new version TsFile (#1186)
add 448c5b8 Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
NOTICE | 10 -
NOTICE-binary | 10 -
.../java/org/apache/iotdb/cli/AbstractCli.java | 5 +-
docs/Blog/Release0_93.md | 69 +++
.../4-StorageEngine/2-WAL.md => Blog/index.md} | 6 +-
docs/Download/README.md | 40 +-
docs/SystemDesign/1-TsFile/2-Format.md | 628 ++++++++++-----------
docs/UserGuide/1-Overview/2-Architecture.md | 6 +-
docs/UserGuide/1-Overview/3-Scenario.md | 4 +-
docs/UserGuide/3-Server/4-Config Manual.md | 17 +-
docs/UserGuide/4-Client/3-Programming - JDBC.md | 72 ---
docs/UserGuide/4-Client/7-Status Codes.md | 117 ++--
...anagement Statements.md => 3-Administration.md} | 0
.../7-Ecosystem Integration/2-MapReduce TsFile.md | 2 +-
.../8-Architecture/3-Shared Nothing Cluster.md | 2 +-
docs/zh/Download/README.md | 42 +-
docs/zh/SystemDesign/1-TsFile/2-Format.md | 499 +++++++++-------
docs/zh/UserGuide/1-Overview/2-Architecture.md | 6 +-
docs/zh/UserGuide/1-Overview/3-Scenario.md | 10 +-
docs/zh/UserGuide/3-Server/4-Config Manual.md | 9 +
docs/zh/UserGuide/4-Client/3-Programming - JDBC.md | 74 ---
docs/zh/UserGuide/4-Client/7-Status Codes.md | 118 ++--
...anagement Statements.md => 3-Administration.md} | 2 +-
.../resources/conf/iotdb-engine.properties | 14 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 2 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 122 ++--
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 100 ++--
.../Deletion.java => cache/AccountableString.java} | 47 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 56 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 56 +-
.../iotdb/db/engine/cache/LRULinkedHashMap.java | 70 ++-
.../db/engine/cache/TimeSeriesMetadataCache.java | 57 +-
.../merge/selector/MaxFileMergeFileSelector.java | 20 +-
.../engine/storagegroup/StorageGroupProcessor.java | 287 ++++++++--
.../db/engine/storagegroup/TsFileProcessor.java | 5 +-
.../db/engine/storagegroup/TsFileResource.java | 43 ++
.../iotdb/db/engine/upgrade/UpgradeTask.java | 91 ++-
.../version/SimpleFileVersionController.java | 18 +-
.../org/apache/iotdb/db/metadata/MLogWriter.java | 16 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 9 +-
.../iotdb/db/query/control/FileReaderManager.java | 24 +-
.../db/query/executor/fill/LastPointReader.java | 1 -
.../db/query/reader/chunk/DiskChunkLoader.java | 17 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 23 +-
.../chunk/metadata/MemChunkMetadataLoader.java | 7 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 8 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 52 +-
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 621 ++++++++++++++++++++
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 2 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 91 ++-
.../adapter/IoTDBConfigDynamicAdapterTest.java | 3 +-
.../iotdb/db/engine/merge/MergeUpgradeTest.java | 2 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 6 +-
site/src/main/.vuepress/config.js | 11 +-
tsfile/format-changelist.md | 1 +
.../iotdb/tsfile/common/cache/Accountable.java | 7 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 3 +-
.../iotdb/tsfile/encoding/decoder/Decoder.java | 11 +-
.../tsfile/encoding/decoder/PlainDecoder.java | 19 -
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 48 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 30 +-
.../file/metadata/statistics/BinaryStatistics.java | 8 +-
.../metadata/statistics/BooleanStatistics.java | 10 +-
.../file/metadata/statistics/DoubleStatistics.java | 9 +-
.../file/metadata/statistics/FloatStatistics.java | 10 +-
.../metadata/statistics/IntegerStatistics.java | 10 +-
.../file/metadata/statistics/LongStatistics.java | 10 +-
.../file/metadata/statistics/Statistics.java | 12 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 17 +-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 24 +-
.../read/controller/CachedChunkLoaderImpl.java | 2 +-
.../read/controller/IChunkMetadataLoader.java | 7 +
.../tsfile/read/reader/chunk/ChunkReader.java | 22 +-
.../iotdb/tsfile/utils}/RamUsageEstimator.java | 22 +-
.../v1/file/metadata/ChunkGroupMetaDataV1.java | 118 ++++
.../tsfile/v1/file/metadata/ChunkMetadataV1.java | 140 +++++
.../file/metadata/TimeseriesMetadataForV1.java} | 23 +-
.../v1/file/metadata/TsDeviceMetadataIndexV1.java | 78 +++
.../v1/file/metadata/TsDeviceMetadataV1.java | 87 +++
.../iotdb/tsfile/v1/file/metadata/TsDigestV1.java | 75 +++
.../tsfile/v1/file/metadata/TsFileMetadataV1.java | 115 ++++
.../metadata/statistics/BinaryStatisticsV1.java | 84 +++
.../metadata/statistics/BooleanStatisticsV1.java | 80 +++
.../metadata/statistics/DoubleStatisticsV1.java | 79 +++
.../metadata/statistics/FloatStatisticsV1.java | 79 +++
.../metadata/statistics/IntegerStatisticsV1.java | 79 +++
.../file/metadata/statistics/LongStatisticsV1.java | 80 +++
.../v1/file/metadata/statistics/StatisticsV1.java | 226 ++++++++
.../iotdb/tsfile/v1/file/utils/HeaderUtils.java | 141 +++++
.../tsfile/v1/read/TsFileSequenceReaderForV1.java | 409 ++++++++++++++
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 2 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 14 +-
97 files changed, 4453 insertions(+), 1388 deletions(-)
create mode 100644 docs/Blog/Release0_93.md
copy docs/{SystemDesign/4-StorageEngine/2-WAL.md => Blog/index.md} (86%)
rename docs/UserGuide/5-Operation Manual/{3-Account Management Statements.md
=> 3-Administration.md} (100%)
rename docs/zh/UserGuide/5-Operation Manual/{3-Account Management
Statements.md => 3-Administration.md} (99%)
copy
server/src/main/java/org/apache/iotdb/db/engine/{modification/Deletion.java =>
cache/AccountableString.java} (54%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/tools/upgrade/TsFileOnlineUpgradeTool.java
copy server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java
=> tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Accountable.java
(86%)
rename {server/src/main/java/org/apache/iotdb/db/engine/cache =>
tsfile/src/main/java/org/apache/iotdb/tsfile/utils}/RamUsageEstimator.java (98%)
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/ChunkGroupMetaDataV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/ChunkMetadataV1.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/{read/controller/IChunkMetadataLoader.java
=> v1/file/metadata/TimeseriesMetadataForV1.java} (62%)
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/TsDeviceMetadataIndexV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/TsDeviceMetadataV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/TsDigestV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/TsFileMetadataV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/BinaryStatisticsV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/BooleanStatisticsV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/DoubleStatisticsV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/FloatStatisticsV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/IntegerStatisticsV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/LongStatisticsV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/StatisticsV1.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/utils/HeaderUtils.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/v1/read/TsFileSequenceReaderForV1.java