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/01/04 13:43:08 UTC

[iotdb] branch NewTsFile updated (990e3a7 -> 2536cda)

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

haonan pushed a change to branch NewTsFile
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 990e3a7  fix test
     add 22740d3  Fix the condition of logger with the right level globally (#2407)
     add 85d4a00  [IOTDB-1068] Fix Time series metadata cache bug (#2316)
     add acf33e2  fix merge bug for #2404
     add 8ed7071  Merge pull request #2415 from mychaow/fix_merge_bug_2404
     add 2536cda  Merge branch 'master' of https://github.com/apache/iotdb into NewTsFile

No new revisions were added by this update.

Summary of changes:
 .../cluster/server/member/DataGroupMember.java     |  2 +-
 .../cluster/server/member/MetaGroupMember.java     |  7 +-
 .../db/engine/cache/TimeSeriesMetadataCache.java   | 32 +++++---
 .../db/engine/storagegroup/TsFileProcessor.java    |  2 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 34 +++++++++
 .../tsfile/read/TimeSeriesMetadataReadTest.java    | 87 ++++++++++++++++++++++
 .../apache/iotdb/tsfile/utils/FileGenerator.java   | 22 +++++-
 7 files changed, 166 insertions(+), 20 deletions(-)
 create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimeSeriesMetadataReadTest.java