You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/05/12 00:18:09 UTC
[incubator-iotdb] 02/03: Merge branch 'refactor_overflow' of
github.com:apache/incubator-iotdb into refactor_overflow
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5ca3fd350788b8fea3f75d3801bd7f3bac1acea7
Merge: 0622b3a 8dbf279
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun May 12 00:10:41 2019 +0800
Merge branch 'refactor_overflow' of github.com:apache/incubator-iotdb into refactor_overflow
iotdb/iotdb/conf/iotdb-engine.properties | 5 +
iotdb/iotdb/conf/iotdb-env.sh | 2 +-
iotdb/pom.xml | 26 ++++
.../org/apache/cassandra/utils/ObjectSizes.java | 167 +++++++++++++++++++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 15 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 +
.../engine/bufferwrite/BufferWriteProcessor.java | 23 +--
.../iotdb/db/engine/filenode/FileNodeManager.java | 18 ++-
.../db/engine/filenode/FileNodeProcessor.java | 156 +++++++++++--------
.../db/engine/overflow/io/OverflowProcessor.java | 33 +---
.../db/engine/overflowdata/OverflowProcessor.java | 7 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 2 +
.../db/engine/sgmanager/StorageGroupProcessor.java | 51 +------
.../db/engine/tsfiledata/TsFileProcessor.java | 52 +++----
.../db/exception/FileNodeManagerException.java | 4 +
.../iotdb/db/exception/TooManyChunksException.java | 26 ++++
.../EngineExecutorWithoutTimeGenerator.java | 1 -
.../reader/overflow/ConciseChunkMetadata.java | 64 ++++++++
.../overflow/ConciseChunkMetadataWithFileName.java | 23 +++
.../overflow/OverflowSeriesMultiFileReader.java} | 20 +--
.../overflow/OverflowSeriesSingleFileReader.java | 77 ++++++++++
.../engine/overflowdata/OverflowProcessorTest.java | 2 +
.../db/engine/tsfiledata/TsFileProcessorTest.java | 2 +-
.../read/reader/series/FileSeriesReader.java | 5 +-
24 files changed, 566 insertions(+), 218 deletions(-)