You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/25 12:53:48 UTC

[incubator-iotdb] branch dev_merge updated (74fda42 -> a8153b0)

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

jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 74fda42  fix improper hasNext() next() usages fix unregistered measurementSchema
     add a8153b0  use buffered stream in DefaultTsFileOutput

No new revisions were added by this update.

Summary of changes:
 .../db/engine/merge/manage/MergeResource.java      |   5 +-
 ...ChunkReader.java => CachedDiskChunkReader.java} |  24 +++--
 .../CachedUnseqResourceMergeReader.java            |  37 ++++----
 .../resourceRelated/UnseqResourceMergeReader.java  |   6 +-
 .../universal/CachedPriorityMergeReader.java       |  12 ++-
 .../apache/iotdb/db/utils/TimeValuePairUtils.java  | 100 +++++++++++++++++++--
 .../org/apache/iotdb/db/utils/TsPrimitiveType.java |  54 +++++++++++
 .../iotdb/db/engine/merge/MergePerfTest.java       |   2 +
 .../tsfile/read/reader/chunk/ChunkReader.java      |   3 +
 .../tsfile/write/writer/DefaultTsFileOutput.java   |  21 +++--
 10 files changed, 209 insertions(+), 55 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/{DiskChunkReader.java => CachedDiskChunkReader.java} (70%)
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithoutFilter.java => server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/CachedUnseqResourceMergeReader.java (55%)