[incubator-iotdb] branch new_TsFile updated (97f2bda -> 46fbb66)

[qi...@apache.org]

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

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


    from 97f2bda  revolve conflict after merging master
     add 46fbb66  rename devicemetadata

No new revisions were added by this update.

Summary of changes:
 .../apache/iotdb/tsfile/TsFileSequenceRead.java    |  2 +-
 .../iotdb/tsfile/TsFileWriteWithTSRecord.java      |  6 +-
 .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java |  8 +-
 .../iotdb/db/engine/cache/TsFileMetaDataCache.java | 10 +--
 .../apache/iotdb/db/tools/TsFileSketchTool.java    | 20 ++---
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 13 ++--
 .../java/org/apache/iotdb/db/utils/MergeUtils.java |  2 +-
 .../writelog/recover/TsFileRecoverPerformer.java   |  2 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |  2 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    |  2 +-
 .../iotdb/db/engine/merge/MergeUpgradeTest.java    |  2 +-
 .../query/reader/series/SeriesReaderTestUtil.java  |  4 +-
 .../tsfile/qp/optimizer/PhysicalOptimizer.java     | 13 ++--
 .../org/apache/iotdb/spark/tool/TsFileExample.java |  8 +-
 .../apache/iotdb/spark/tool/TsFileWriteTool.java   | 20 ++---
 ...seriesMetaData.java => TimeseriesMetadata.java} | 12 +--
 .../iotdb/tsfile/file/metadata/TsFileMetadata.java | 20 +++--
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 89 ++++++++++------------
 .../read/controller/MetadataQuerierByFileImpl.java | 12 +--
 .../apache/iotdb/tsfile/write/TsFileWriter.java    |  7 +-
 .../apache/iotdb/tsfile/write/schema/Schema.java   |  6 +-
 .../write/writer/RestorableTsFileIOWriter.java     |  2 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  | 22 ++----
 .../file/metadata/TimeSeriesMetadataTest.java      | 13 ++--
 .../tsfile/file/metadata/utils/TestHelper.java     |  8 +-
 .../iotdb/tsfile/file/metadata/utils/Utils.java    |  6 +-
 .../iotdb/tsfile/write/TsFileIOWriterTest.java     |  2 +-
 .../iotdb/tsfile/write/TsFileReadWriteTest.java    |  7 +-
 .../iotdb/tsfile/write/TsFileWriterTest.java       |  8 +-
 .../org/apache/iotdb/tsfile/write/WriteTest.java   |  6 +-
 .../write/writer/RestorableTsFileIOWriterTest.java | 44 +++++------
 31 files changed, 175 insertions(+), 203 deletions(-)
 rename tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/{TimeseriesMetaData.java => TimeseriesMetadata.java} (92%)