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

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


    from 08b89f9  Merge branch 'master' of https://github.com/apache/iotdb into 
virtual_partition_2_merge
     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 ee5b07f  Merge branch 'master' of https://github.com/apache/iotdb into 
virtual_partition_2_merge

No new revisions were added by this update.

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

Reply via email to