[iotdb] branch master updated (7ff968c -> fc31d50)

[ja...@apache.org]

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

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


    from 7ff968c  [IOTDB-2027] Rollback invalid entry after wal writing failure (#4424)
     add fc31d50  [IOTDB-1926]TsFile API supports query on aligned timeseries (#4390)

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/iotdb/flink/TsFileUtils.java   |   4 +-
 .../java/org/apache/iotdb/tsfile/TsFileRead.java   |   8 +-
 .../apache/iotdb/tsfile/TsFileSequenceRead.java    |   2 +-
 .../apache/iotdb/tsfile/TsFileWriteWithTablet.java |   2 +-
 .../iotdb/flink/tsfile/TsFileInputFormat.java      |   6 +-
 .../tsfile/RowTsFileOutputFormatTestBase.java      |   4 +-
 .../iotdb/hadoop/tsfile/TSFRecordReader.java       |   4 +-
 .../iotdb/db/engine/cache/AccountableString.java   |  64 ---
 .../engine/compaction/cross/MergeOverLapTest.java  |   2 +
 .../inner/InnerSpaceCompactionUtilsTest.java       |   4 +-
 .../iotdb/db/utils/TsFileRewriteToolTest.java      |   6 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  18 +-
 .../org/apache/iotdb/spark/tsfile/qp/Executor.java |   4 +-
 .../apache/iotdb/spark/tsfile/DefaultSource.scala  |   6 +-
 .../iotdb/tsfile/common/cache/Accountable.java     |  26 --
 .../iotdb/tsfile/file/metadata/ChunkMetadata.java  |  14 +-
 .../tsfile/file/metadata/TimeseriesMetadata.java   |  13 +-
 .../{ReadOnlyTsFile.java => TsFileReader.java}     |   4 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 190 ++++++--
 .../org/apache/iotdb/tsfile/read/common/Chunk.java |  13 +-
 .../org/apache/iotdb/tsfile/read/common/Field.java |  26 ++
 .../read/controller/MetadataQuerierByFileImpl.java |  87 ++--
 .../query/dataset/DataSetWithTimeGenerator.java    |  15 +-
 .../query/dataset/DataSetWithoutTimeGenerator.java |  24 +-
 .../read/reader/chunk/AlignedChunkReader.java      |   6 +-
 ...amp.java => AlignedChunkReaderByTimestamp.java} |  15 +-
 .../reader/series/AbstractFileSeriesReader.java    |   4 +-
 .../read/reader/series/FileSeriesReader.java       |  18 +-
 .../reader/series/FileSeriesReaderByTimestamp.java |  28 +-
 .../tsfile/v2/read/TsFileSequenceReaderForV2.java  |  21 +-
 .../apache/iotdb/tsfile/write/TsFileWriter.java    |  84 +++-
 .../write/chunk/AlignedChunkGroupWriterImpl.java   |  44 +-
 .../chunk/NonAlignedChunkGroupWriterImpl.java      |  40 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |  16 +-
 .../iotdb/tsfile/read/ReadInPartitionTest.java     |   4 +-
 .../iotdb/tsfile/read/ReadOnlyTsFileTest.java      | 241 -----------
 .../org/apache/iotdb/tsfile/read/ReadTest.java     |   4 +-
 .../iotdb/tsfile/read/TimePlainEncodeReadTest.java |   4 +-
 .../apache/iotdb/tsfile/read/TsFileReaderTest.java | 477 +++++++++++++++++++++
 .../tsfile/read/TsFileSequenceReaderTest.java      |   4 +-
 .../read/query/timegenerator/ReadWriteTest.java    |   6 +-
 .../timegenerator/TimeGeneratorReadEmptyTest.java  |   6 +-
 .../timegenerator/TimeGeneratorReadWriteTest.java  |   6 +-
 .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 122 ++++++
 .../tsfile/write/DefaultSchemaTemplateTest.java    |   4 +-
 ...SameMeasurementsWithDifferentDataTypesTest.java |   6 +-
 .../iotdb/tsfile/write/TsFileReadWriteTest.java    |   6 +-
 .../iotdb/tsfile/write/TsFileWriteApiTest.java     | 266 +++++++-----
 .../iotdb/tsfile/write/TsFileWriterTest.java       |  14 +-
 .../write/writer/ForceAppendTsFileWriterTest.java  |   8 +-
 .../write/writer/RestorableTsFileIOWriterTest.java |  15 +-
 51 files changed, 1272 insertions(+), 743 deletions(-)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cache/AccountableString.java
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Accountable.java
 rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/{ReadOnlyTsFile.java => TsFileReader.java} (94%)
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/{ChunkReaderByTimestamp.java => AlignedChunkReaderByTimestamp.java} (71%)
 delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFileTest.java
 create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java