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

xuekaifeng pushed a commit to branch 
IOTDB-615-Use-binary-rather-than-string-in-insert-plan
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 52bbbba0fd796e19d62bfc3c442722c8170f4d11
Merge: 47784f2 a7b40b2
Author: 151250176 <[email protected]>
AuthorDate: Mon May 18 09:05:39 2020 +0800

    merge

 .../java/org/apache/iotdb/cli/AbstractCli.java     |   5 +-
 docs/Blog/Release0_93.md                           |  69 +++
 docs/Blog/index.md                                 |  24 +
 docs/SystemDesign/1-TsFile/2-Format.md             | 217 +++----
 docs/UserGuide/3-Server/4-Config Manual.md         |  17 +-
 docs/zh/SystemDesign/1-TsFile/2-Format.md          | 222 +++-----
 docs/zh/UserGuide/3-Server/4-Config Manual.md      |   9 +
 .../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 ++--
 .../cache/AccountableString.java}                  |  49 +-
 .../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    |   4 +-
 .../db/engine/storagegroup/TsFileResource.java     |  43 ++
 .../iotdb/db/engine/upgrade/UpgradeTask.java       |  91 ++-
 .../version/SimpleFileVersionController.java       |  19 +-
 .../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    |   1 -
 .../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                  |   7 +
 tsfile/format-changelist.md                        |   1 +
 .../cache/Accountable.java}                        |  15 +-
 .../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 +-
 81 files changed, 3853 insertions(+), 758 deletions(-)


Reply via email to