You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/03/31 02:36:04 UTC
[incubator-iotdb] branch master updated (c0f23e8 -> 8d51ce7)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from c0f23e8 Merge pull request #953 from SailVR/master
add 5a4e225 fix a bug when recover the last crashed file
add ec64d27 add exception for something gets wrong
add 68296fc fix test errors
add ba57aab change the comment
add e7d4626 add comment
add 835cbfa Merge branch 'master' of https://github.com/apache/incubator-iotdb
add ee2414a Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 8a5793a new tsfile
add 4dab61b refactor tsfile
add dad198a refactor tsfile
add d17aa55 resolve conflicts
add 9edff86 Merge branch 'master' of https://github.com/apache/incubator-iotdb into new_tsFile_v2
add 17ead2e refactor tsfile
add b44955a new interface and new tsfile structure
add 8c04837 Merge branch 'master' of https://github.com/apache/incubator-iotdb into new_tsFile_v2
add aacdc9d fix tsfile problems
add 3105712 fix some problems
add 84272b7 resolve conflicts
add e0dc626 fix some of bugs
add affde79 fix deviceMNode bugs
add 92094bd Merge branch 'master' of https://github.com/apache/incubator-iotdb into new_tsFile_v2
add 3c7ea7b fix bugs
add 544453d new TsFile
add f24ebf2 fix checkLocateStatus in SequenceReader
add ef1ea1d refine Schema
add af3be5f remove unused comment
add ea64f9d resolve conflicts
add afadbe4 refactor TsFileSketchTool
add c46b0bb resolce conflict
add c232424 remove duplicated mnode
add 4c39b0e Add EmptyDeviceMNode
add 7ffbaf5 simplify TsFileMetadataUtils.getChunkMetadataList
add 464619e simplify TsFileMetadataUtils.getChunkMetadataList
add c2a8bee fix a deviceMNode bug and restore Unit Tests
add 6597f6d changes to TsFileSequenceReader
add 66226ee changes to TsFileSequenceReader
add 97f2bda revolve conflict after merging master
add 46fbb66 rename devicemetadata
add 2c2c93c hadoop-connector adapt
add 7a5b3b0 fix cache key to string
add e0b1369 Merge branch 'new_TsFile' of https://github.com/apache/incubator-iotdb into new_TsFile
add 03e93e3 remove Schema in server
add 587c2a5 some changes in TsFileSequenceReader
add 791bc26 Merge branch 'new_TsFile' of github.com:apache/incubator-iotdb into new_TsFile
add 9d77765 remove DeviceMNode and EmptyDeviceMNode
add 5ef0683 add version read and write
add d85244f fix null encoding in test
add 90dd71a remove readAllChunkMetadats() in TsFileSequenceReader
add 51c3332 fix Statistics T
add a7e238c fix TsFileMetadataTest
add f79da21 optimize readChunkMetadataInDevice
add 8da9e82 fix bugs in convertSpace2TimePartition
add fda05aa fix bugs in tsfile tests
add 735977e resolve conflicts
add 9638a56 fix SessionExample
add 32c0100 fix SessionExample import
add ca0ac00 fix null encoder
add 90c7048 fix getDeviceNameInRange in TsFileSequenceReader
add 05e10f5 fix inpartitionTimeRange update
add 5b65edd fix spark and allow write without register device
add f9221e2 fix schema and HDFSInputTest
add 39fbd52 fix sketchTool and sequenceRead example
add 6d26870 Merge branch 'new_TsFile' of github.com:apache/incubator-iotdb into new_TsFile
add 934fc9a fix TimeRange and spark package name
add 01b594f fix MetadataQuerier with Time range
add a71086b add filter and test for tsfile
add dc3c8d1 fix TimeseriesMetadata Statistics error
add f1f0777 diable timegenerator cache and add test
add 17d377b fix spark test
add 5d7bb8c add same measurememts with different datatypes test
add 4460ee7 Merge branch 'new_TsFile' of https://github.com/apache/incubator-iotdb into new_TsFile
add 372503d Merge branch 'new_TsFile' of github.com:apache/incubator-iotdb into new_TsFile
add 83701da fix Timegenerator cache
add e4ec1d2 remove comment
add e638e18 add same measurememts with different datatypes test in IoTDB
add d73f16a fix a bug in TsFileWriter
add ea12c00 reformat sketchTool print result
add de3a174 update SeriesReader
add 0b22aff fix timegenerator cache bug
add b3d7b7b fix loop not end
add 85c7c47 fix javadoc
add cbcb3d4 test mkdir
add 83f586b fix windows test
add 76b9e2d change test file name
add 616a604 close reader in test
add 96b78f4 resolve conflict
add d193a0c some debugs
add f8bed88 Fix some bugs
add 13a207e Merge remote-tracking branch 'origin/master' into new_TsFile
add 60565b3 merge master
add 6bcdce6 resolve conflict
add a29548c fix StorageGroupProcessorTest
add e1d4660 fix UnseqTsFileRecoverTest
add 22dbf13 Bug fix
add e0bb259 fix:pass merge test (#907)
add 37f7a0e Merge branch 'master' into new_TsFile
add 7107358 Merge branch 'new_TsFile' of https://github.com/apache/incubator-iotdb into new_TsFile
add 01c9ff6 resolve conflicts
add 0f9b797 remove unnecessary code
add 4d62d50 merge master
add cc1c508 debug
add 0c45aa2 fuck the bug
add 9a4a49c merge master
add c3e1894 Merge branch 'new_TsFile' of https://github.com/apache/incubator-iotdb into new_TsFile
add 6454f4f fix:static test bug (#922)
add 7cc49b8 fix UnseqTsFileRecoverTest
add 6022284 fix restart hangup
add 71f4d50 fix class name
add 81768ba Fix tsfile test bug (#924)
add 0b67596 use file startTimeMap instead of exact time series start time to reduce the method call numbers to a half
add 228e2b8 add license
add 63f2aae adapt to hive-connector
add 4c19e84 update merge recover (#925)
add 1252168 throw exception in MergeFileTask when meet file broken
add e8a4111 fix sonar bug
add f74a588 fix conflict
add ebe70fd fix conflict
add 5ca6be4 enable cacheDeviceMetadata in TsFileSequenceReader
add ea64fd7 fix init file metadata
add a618d70 Add TimeSeriesMetadataCache in server
add 16d5e30 Fix code smell
add a81d8a4 Fix more code smell
add 93d72b2 Fix some potential bugs
add 6fee3f4 Merge branch 'master' into new_TsFile
add 800e20c fix sonar
add 2ae74dd fix restart
add 80f6284 change reader logger to debug
add 32d3f90 fix a TsFile path bug on macos
add 506fa46 move StorageEngine init to the last for test
add cf5f441 resolve conflict
add 3286c98 remove unused code in TsFileResource
add 70a0ab1 format
add 995db50 repair the restart bug
add 933537c improve cache
add 1ec96e8 Merge branch 'new_TsFile' of https://github.com/apache/incubator-iotdb into new_TsFile
add 1572237 change to cache
add b472cf6 Change to use duplicated path and datatypes in LastQueryExecutor
add 7cd97bc Merge pull request #957 from wshao08/new_TsFile
add 6d06e32 resolve conflicts
add a54da14 adapt to last
add 437cfa6 Merge remote-tracking branch 'origin/new_TsFile' into new_TsFile
add 1e9245d enlarge TimeseriesMetadataCache, fix averageSize bug, optimize foreach TimeseriesMetadata
add 5731dc2 clear deviceToSensors in AlignByDevice query
add 8ec481f fix sonar
add e653ab3 update tsfile format changelist
add 3481c3b use bloomfilter in TimeseriesMetadataCache
add e8b8ca8 update licenses info
new 8d51ce7 Merge pull request #855 from apache/new_TsFile
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 13 -
LICENSE-binary | 2 +-
docs/zh/SystemDesign/7-Connector/3-Spark-TsFile.md | 48 +-
.../org/apache/iotdb/hadoop/tsfile}/Constant.java | 15 +-
.../iotdb/hadoop/tsfile/TSMRWriteExample.java | 259 +++++-----
.../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 20 +-
.../main/java/org/apache/iotdb/SessionExample.java | 30 +-
.../java/org/apache/iotdb/tsfile}/Constant.java | 14 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 35 +-
.../iotdb/tsfile/TsFileWriteWithRowBatch.java | 9 +-
.../iotdb/tsfile/TsFileWriteWithTSRecord.java | 33 +-
.../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 7 +-
.../apache/iotdb/hadoop/tsfile/TSFInputFormat.java | 94 +---
.../apache/iotdb/hadoop/tsfile/TSFInputSplit.java | 251 +---------
.../iotdb/hadoop/tsfile/TSFRecordReader.java | 69 +--
.../iotdb/hadoop/tsfile/TSFRecordWriter.java | 1 -
.../iotdb/hadoop/tsfile/TSFInputSplitTest.java | 21 +-
.../iotdb/hadoop/tsfile/TsFileTestHelper.java | 7 +-
.../apache/iotdb/hive/TSFHiveInputFormatTest.java | 29 +-
.../apache/iotdb/hive/TSFHiveRecordReaderTest.java | 30 +-
.../org/apache/iotdb/hive/TsFileTestHelper.java | 3 +-
.../apache/iotdb/jdbc/AbstractIoTDBResultSet.java | 35 +-
.../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java | 21 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 10 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 8 +-
.../resources/conf/iotdb-engine.properties | 6 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 19 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 60 +--
.../db/engine/cache/CacheHitRatioMonitor.java | 9 +-
.../engine/cache/CacheHitRatioMonitorMXBean.java | 2 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 29 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 185 +++++++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 231 ---------
.../db/engine/cache/TimeSeriesMetadataCache.java | 223 +++++++++
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 103 ++--
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 122 -----
.../iotdb/db/engine/flush/MemTableFlushTask.java | 100 ++--
.../iotdb/db/engine/flush/NotifyFlushMemTable.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 19 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 3 +-
.../db/engine/memtable/IWritableMemChunk.java | 3 +-
.../db/engine/memtable/PrimitiveMemTable.java | 6 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 17 +-
.../db/engine/merge/manage/MergeResource.java | 34 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 2 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 98 ++--
.../db/engine/merge/task/MergeMultiChunkTask.java | 89 ++--
.../iotdb/db/engine/merge/task/MergeTask.java | 26 +-
.../db/engine/merge/task/RecoverMergeTask.java | 10 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 19 +-
.../engine/storagegroup/StorageGroupProcessor.java | 173 +++----
.../db/engine/storagegroup/TsFileProcessor.java | 24 +-
.../db/engine/storagegroup/TsFileResource.java | 93 +++-
.../iotdb/db/engine/upgrade/UpgradeTask.java | 13 -
.../org/apache/iotdb/db/metadata/MManager.java | 85 ++--
.../java/org/apache/iotdb/db/metadata/MTree.java | 61 +--
.../iotdb/db/metadata/mnode/InternalMNode.java | 7 -
.../apache/iotdb/db/metadata/mnode/LeafMNode.java | 1 -
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 3 -
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 15 +-
.../iotdb/db/monitor/collector/FileSize.java | 17 -
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 87 ++--
.../iotdb/db/qp/physical/crud/BatchInsertPlan.java | 13 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 37 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 16 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 20 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 102 ++--
.../db/query/aggregation/AggregateResult.java | 7 +-
.../iotdb/db/query/context/QueryContext.java | 4 +-
.../iotdb/db/query/control/FileReaderManager.java | 71 ++-
.../db/query/control/QueryResourceManager.java | 6 +-
.../db/query/dataset/groupby/GroupByExecutor.java | 5 +-
.../groupby/GroupByWithValueFilterDataSet.java | 28 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 31 +-
.../dataset/groupby/LocalGroupByExecutor.java | 54 +-
.../db/query/executor/AggregationExecutor.java | 71 +--
.../iotdb/db/query/executor/FillQueryExecutor.java | 13 +-
.../iotdb/db/query/executor/IQueryRouter.java | 3 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 46 +-
.../iotdb/db/query/executor/QueryRouter.java | 33 +-
.../db/query/executor/RawDataQueryExecutor.java | 38 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 8 +-
.../db/query/reader/chunk/ChunkReaderWrap.java | 6 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 4 +-
.../db/query/reader/chunk/MemChunkLoader.java | 4 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 81 +++
.../chunk/metadata/MemChunkMetadataLoader.java | 68 +++
.../db/query/reader/series/IAggregateReader.java | 8 +
.../query/reader/series/SeriesAggregateReader.java | 32 +-
.../reader/series/SeriesRawDataBatchReader.java | 33 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 364 +++++++++-----
.../reader/series/SeriesReaderByTimestamp.java | 29 +-
.../query/timegenerator/ServerTimeGenerator.java | 10 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 65 +--
.../apache/iotdb/db/tools/TsFileSketchTool.java | 140 +++---
.../iotdb/db/tools/upgrade/OfflineUpgradeTool.java | 68 ---
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 124 +++--
.../java/org/apache/iotdb/db/utils/MemUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 57 +--
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 22 +-
.../org/apache/iotdb/db/utils/SchemaUtils.java | 45 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 46 +-
.../writelog/recover/TsFileRecoverPerformer.java | 107 ++--
...sorTest.java => LocalFileRoleAccessorTest.java} | 2 +-
.../iotdb/db/engine/MetadataManagerHelper.java | 38 +-
...aCacheTest.java => ChunkMetadataCacheTest.java} | 22 +-
.../db/engine/memtable/MemTableFlushTaskTest.java | 8 +-
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 13 -
.../db/engine/memtable/MemTableTestUtils.java | 6 +-
.../db/engine/memtable/MemtableBenchmark.java | 4 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 9 +-
.../engine/merge/MaxFileMergeFileSelectorTest.java | 6 +-
.../merge/MaxSeriesMergeFileSelectorTest.java | 21 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 2 +
.../iotdb/db/engine/merge/MergeOverLapTest.java | 9 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 14 +-
.../iotdb/db/engine/merge/MergeUpgradeTest.java | 13 +-
.../engine/modification/DeletionFileNodeTest.java | 16 +-
.../db/engine/modification/DeletionQueryTest.java | 8 +-
.../storagegroup/StorageGroupProcessorTest.java | 24 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 36 +-
.../engine/storagegroup/TsFileProcessorTest.java | 68 +--
.../iotdb/db/integration/IOTDBGroupByIT.java | 35 +-
.../db/integration/IoTDBAggregationDeleteIT.java | 98 ++++
.../iotdb/db/integration/IoTDBAggregationIT.java | 12 +-
.../integration/IoTDBAggregationLargeDataIT.java | 58 ++-
.../db/integration/IoTDBAutoCreateSchemaIT.java | 2 -
.../iotdb/db/integration/IoTDBCompleteIT.java | 9 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 21 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 26 +-
.../db/integration/IoTDBFlushQueryMergeTest.java | 3 -
.../apache/iotdb/db/integration/IoTDBLastIT.java | 15 +-
.../integration/IoTDBLoadExternalTsfileTest.java | 24 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 3 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 7 +-
... => IoTDBSameMeasurementsDifferentTypesIT.java} | 12 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 17 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 26 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 9 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 19 +-
.../iotdb/db/metadata/MManagerImproveTest.java | 19 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 5 +-
.../db/query/control/FileReaderManagerTest.java | 4 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 2 +-
.../reader/series/SeriesAggregateReaderTest.java | 76 +--
.../reader/series/SeriesReaderByTimestampTest.java | 10 +-
.../db/query/reader/series/SeriesReaderTest.java | 25 +-
.../query/reader/series/SeriesReaderTestUtil.java | 20 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 4 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 50 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 81 +--
.../writelog/recover/UnseqTsFileRecoverTest.java | 64 ++-
service-rpc/src/main/thrift/rpc.thrift | 1 +
.../java/org/apache/iotdb/session/Session.java | 9 +-
.../org/apache/iotdb/session/SessionUtils.java | 4 +-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 57 ++-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 5 +-
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 39 +-
.../apache/iotdb/spark/tsfile/DefaultSource.scala | 6 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 24 +-
.../apache/iotdb/spark/tsfile/WideConverter.scala | 36 +-
.../org/apache/iotdb/spark/tsfile/package.scala | 10 +-
.../org/apache/iotdb/spark/tool/TsFileExample.java | 13 +-
.../apache/iotdb/spark/tool/TsFileWriteTool.java | 39 +-
.../apache/iotdb/spark/tsfile/ConverterTest.scala | 6 +-
.../org/apache/iotdb/spark/tsfile/TSFileSuit.scala | 78 ++-
tsfile/format-changelist.md | 11 +-
.../apache/iotdb/tsfile/common/cache/Cache.java | 1 +
.../iotdb/tsfile/common/conf/TSFileConfig.java | 30 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 37 +-
.../tsfile/common/constant/JsonFormatConstant.java | 6 +-
.../tsfile/common/constant/QueryConstant.java | 3 +-
.../tsfile/common/constant/TsFileConstant.java | 3 +-
.../apache/iotdb/tsfile/compress/ICompressor.java | 10 +-
.../iotdb/tsfile/compress/IUnCompressor.java | 12 +-
.../tsfile/encoding/bitpacking/IntPacker.java | 46 +-
.../tsfile/encoding/bitpacking/LongPacker.java | 51 +-
.../tsfile/encoding/common/EncodingConfig.java | 4 +-
.../tsfile/encoding/decoder/BitmapDecoder.java | 30 +-
.../iotdb/tsfile/encoding/decoder/Decoder.java | 5 +-
.../encoding/decoder/DeltaBinaryDecoder.java | 5 +-
.../encoding/decoder/DoublePrecisionDecoder.java | 6 +-
.../tsfile/encoding/decoder/FloatDecoder.java | 25 +-
.../tsfile/encoding/decoder/GorillaDecoder.java | 6 +-
.../tsfile/encoding/decoder/IntRleDecoder.java | 33 +-
.../tsfile/encoding/decoder/LongRleDecoder.java | 35 +-
.../tsfile/encoding/decoder/PlainDecoder.java | 5 +-
.../encoding/decoder/RegularDataDecoder.java | 10 +-
.../iotdb/tsfile/encoding/decoder/RleDecoder.java | 56 ++-
.../encoding/decoder/SinglePrecisionDecoder.java | 8 +-
.../tsfile/encoding/encoder/BitmapEncoder.java | 29 +-
.../encoding/encoder/DeltaBinaryEncoder.java | 47 +-
.../encoding/encoder/DoublePrecisionEncoder.java | 12 +-
.../iotdb/tsfile/encoding/encoder/Encoder.java | 12 +-
.../tsfile/encoding/encoder/FloatEncoder.java | 13 +-
.../tsfile/encoding/encoder/GorillaEncoder.java | 4 +-
.../tsfile/encoding/encoder/IntRleEncoder.java | 1 +
.../tsfile/encoding/encoder/LongRleEncoder.java | 3 +-
.../tsfile/encoding/encoder/PlainEncoder.java | 41 +-
.../encoding/encoder/RegularDataEncoder.java | 43 +-
.../iotdb/tsfile/encoding/encoder/RleEncoder.java | 56 ++-
.../encoding/encoder/SinglePrecisionEncoder.java | 12 +-
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 20 +-
.../tsfile/exception/NotCompatibleException.java | 1 +
.../tsfile/exception/TsFileRuntimeException.java | 4 +-
.../tsfile/exception/cache/CacheException.java | 5 +-
.../CompressionTypeNotSupportedException.java | 4 +-
.../encoding/TsFileDecodingException.java | 6 +-
.../encoding/TsFileEncodingException.java | 6 +-
.../exception/write/NoMeasurementException.java | 3 +-
.../write/UnknownColumnTypeException.java | 4 +-
.../exception/write/WriteProcessException.java | 1 -
.../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 27 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 37 +-
.../iotdb/tsfile/file/header/PageHeader.java | 1 +
.../iotdb/tsfile/file/header/package-info.java | 9 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 178 -------
.../{ChunkMetaData.java => ChunkMetadata.java} | 20 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 119 +++++
.../tsfile/file/metadata/TsDeviceMetadata.java | 142 ------
.../file/metadata/TsDeviceMetadataIndex.java | 163 -------
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 423 ----------------
.../iotdb/tsfile/file/metadata/TsFileMetadata.java | 210 ++++++++
.../tsfile/file/metadata/enums/TSDataType.java | 18 +-
.../tsfile/file/metadata/enums/TSFreqType.java | 61 ---
.../file/metadata/statistics/BinaryStatistics.java | 6 +-
.../metadata/statistics/BooleanStatistics.java | 3 +-
.../file/metadata/statistics/DoubleStatistics.java | 15 +-
.../file/metadata/statistics/FloatStatistics.java | 8 +-
.../metadata/statistics/IntegerStatistics.java | 8 +-
.../file/metadata/statistics/LongStatistics.java | 8 +-
.../file/metadata/statistics/Statistics.java | 68 +--
.../iotdb/tsfile/fileSystem/FSFactoryProducer.java | 1 -
.../fileInputFactory/HDFSInputFactory.java | 7 +-
.../fileInputFactory/LocalFSInputFactory.java | 6 +-
.../fileOutputFactory/HDFSOutputFactory.java | 7 +-
.../fileOutputFactory/LocalFSOutputFactory.java | 6 +-
.../tsfile/fileSystem/fsFactory/HDFSFactory.java | 36 +-
.../fileSystem/fsFactory/LocalFSFactory.java | 1 +
.../iotdb/tsfile/read/TsFileRestorableReader.java | 18 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 524 +++++++++++---------
.../iotdb/tsfile/read/UnClosedTsFileReader.java | 16 +-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 4 +-
.../org/apache/iotdb/tsfile/read/common/Field.java | 5 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 37 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 18 +-
.../read/controller/CachedChunkLoaderImpl.java | 13 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 8 +-
...IChunkLoader.java => IChunkMetadataLoader.java} | 14 +-
.../tsfile/read/controller/IMetadataQuerier.java | 18 +-
.../read/controller/MetadataQuerierByFileImpl.java | 187 ++++---
.../tsfile/read/expression/ExpressionType.java | 20 +-
.../iotdb/tsfile/read/expression/IExpression.java | 2 +-
.../read/expression/impl/BinaryExpression.java | 1 +
.../read/expression/impl/GlobalTimeExpression.java | 1 +
.../expression/impl/SingleSeriesExpression.java | 1 +
.../read/expression/util/ExpressionOptimizer.java | 13 +-
.../query/executor/ExecutorWithTimeGenerator.java | 14 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 16 +-
.../read/query/timegenerator/TimeGenerator.java | 9 +-
.../query/timegenerator/TsFileTimeGenerator.java | 6 +-
.../iotdb/tsfile/read/reader/TsFileInput.java | 71 +--
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +
.../reader/series/AbstractFileSeriesReader.java | 20 +-
.../read/reader/series/EmptyFileSeriesReader.java | 6 +-
.../read/reader/series/FileSeriesReader.java | 10 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 18 +-
.../tool/upgrade/TsfileUpgradeToolV0_8_0.java | 543 ---------------------
.../iotdb/tsfile/tool/upgrade/UpgradeTool.java | 108 ----
.../java/org/apache/iotdb/tsfile/utils/Binary.java | 7 +-
.../org/apache/iotdb/tsfile/utils/BloomFilter.java | 3 +-
.../org/apache/iotdb/tsfile/utils/BytesUtils.java | 21 +-
.../java/org/apache/iotdb/tsfile/utils/Loader.java | 4 +-
.../java/org/apache/iotdb/tsfile/utils/Pair.java | 4 +-
.../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 13 +-
.../tsfile/utils/ReadWriteForEncodingUtils.java | 65 ++-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 24 -
.../apache/iotdb/tsfile/utils/StringContainer.java | 63 ++-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 139 +++---
.../tsfile/write/chunk/ChunkGroupWriterImpl.java | 9 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 2 +-
.../tsfile/write/chunk/IChunkGroupWriter.java | 1 -
.../apache/iotdb/tsfile/write/page/PageWriter.java | 30 +-
.../apache/iotdb/tsfile/write/record/RowBatch.java | 135 ++---
.../apache/iotdb/tsfile/write/record/TSRecord.java | 18 +-
.../write/record/datapoint/BooleanDataPoint.java | 4 +-
.../tsfile/write/record/datapoint/DataPoint.java | 9 +-
.../write/record/datapoint/DoubleDataPoint.java | 4 +-
.../write/record/datapoint/FloatDataPoint.java | 4 +-
.../write/record/datapoint/IntDataPoint.java | 4 +-
.../write/record/datapoint/LongDataPoint.java | 4 +-
.../write/record/datapoint/StringDataPoint.java | 4 +-
.../tsfile/write/schema/MeasurementSchema.java | 49 +-
.../apache/iotdb/tsfile/write/schema/Schema.java | 139 +++---
.../iotdb/tsfile/write/schema/SchemaBuilder.java | 93 ----
.../tsfile/write/writer/DefaultTsFileOutput.java | 5 +-
.../write/writer/ForceAppendTsFileWriter.java | 33 +-
.../write/writer/RestorableTsFileIOWriter.java | 165 ++++---
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 297 ++++++-----
.../iotdb/tsfile/write/writer/TsFileOutput.java | 15 +-
.../apache/iotdb/tsfile/common/LRUCacheTest.java | 4 +-
.../apache/iotdb/tsfile/compress/CompressTest.java | 6 +-
.../apache/iotdb/tsfile/compress/SnappyTest.java | 10 +-
.../apache/iotdb/tsfile/constant/TestConstant.java | 8 +-
.../tsfile/encoding/bitpacking/IntPackerTest.java | 3 +
.../tsfile/encoding/bitpacking/LongPackerTest.java | 5 +-
.../tsfile/encoding/decoder/BitmapDecoderTest.java | 7 +-
.../tsfile/encoding/decoder/FloatDecoderTest.java | 23 +-
.../encoding/decoder/GorillaDecoderTest.java | 10 +-
.../tsfile/encoding/decoder/IntRleDecoderTest.java | 10 +-
.../encoding/decoder/LongRleDecoderTest.java | 10 +-
.../delta/DeltaBinaryEncoderIntegerTest.java | 10 +-
.../decoder/delta/DeltaBinaryEncoderLongTest.java | 24 +-
.../regular/RegularDataEncoderIntegerTest.java | 5 +-
.../regular/RegularDataEncoderLongTest.java | 30 +-
.../iotdb/tsfile/file/header/PageHeaderTest.java | 12 +-
.../file/metadata/ChunkGroupMetaDataTest.java | 108 ----
.../file/metadata/TimeSeriesMetadataTest.java | 23 +-
.../file/metadata/TsDeviceMetadataIndexTest.java | 77 ---
...leMetaDataTest.java => TsFileMetadataTest.java} | 27 +-
.../metadata/statistics/BooleanStatisticsTest.java | 4 +-
.../metadata/statistics/DoubleStatisticsTest.java | 3 +
.../metadata/statistics/FloatStatisticsTest.java | 3 +
.../metadata/statistics/IntegerStatisticsTest.java | 3 +
.../metadata/statistics/LongStatisticsTest.java | 6 +-
.../metadata/statistics/StringStatisticsTest.java | 5 +-
.../tsfile/file/metadata/utils/TestHelper.java | 62 ++-
.../iotdb/tsfile/file/metadata/utils/Utils.java | 100 +---
.../iotdb/tsfile/read/ReadInPartitionTest.java | 112 ++---
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 36 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 48 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 67 ++-
.../tsfile/read/TsFileRestorableReaderTest.java | 8 +-
.../tsfile/read/TsFileSequenceReaderTest.java | 54 +-
.../apache/iotdb/tsfile/read/common/PathTest.java | 2 -
.../iotdb/tsfile/read/common/TimeRangeTest.java | 35 +-
.../tsfile/read/controller/ChunkLoaderTest.java | 17 +-
.../controller/IMetadataQuerierByFileImplTest.java | 97 ++--
.../read/filter/IExpressionOptimizerTest.java | 109 ++---
.../read/filter/MinTimeMaxTimeFilterTest.java | 4 +-
.../iotdb/tsfile/read/filter/OperatorTest.java | 12 +-
.../tsfile/read/filter/StatisticsFilterTest.java | 8 +-
.../read/query/executor/QueryExecutorTest.java | 39 +-
.../query/timegenerator}/ReadWriteTest.java | 11 +-
.../query/timegenerator/ReaderByTimestampTest.java | 8 +-
.../timegenerator}/TimeGeneratorReadEmptyTest.java | 8 +-
.../timegenerator}/TimeGeneratorReadWriteTest.java | 8 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 52 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 14 +-
.../apache/iotdb/tsfile/utils/BloomFilterTest.java | 5 +-
.../apache/iotdb/tsfile/utils/BytesUtilsTest.java | 4 +-
.../apache/iotdb/tsfile/utils/FileGenerator.java | 48 +-
.../org/apache/iotdb/tsfile/utils/FileUtils.java | 23 +-
.../apache/iotdb/tsfile/utils/FileUtilsTest.java | 20 +-
.../org/apache/iotdb/tsfile/utils/PairTest.java | 3 +
.../tsfile/utils/ReadWriteStreamUtilsTest.java | 15 +-
.../tsfile/utils/ReadWriteToBytesUtilsTest.java | 9 +-
.../org/apache/iotdb/tsfile/utils/RecordUtils.java | 19 +-
.../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 27 +-
.../iotdb/tsfile/utils/StringContainerTest.java | 2 +
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 79 +--
.../org/apache/iotdb/tsfile/write/PerfTest.java | 53 +-
.../iotdb/tsfile/write/ReadPageInMemTest.java | 37 +-
...ameMeasurementsWithDifferentDataTypesTest.java} | 105 ++--
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 26 +-
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 83 +---
.../iotdb/tsfile/write/TsFileWriterTest.java | 23 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 77 ++-
.../write/schema/converter/SchemaBuilderTest.java | 80 ++-
.../iotdb/tsfile/write/writer/PageWriterTest.java | 20 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 151 ++++--
373 files changed, 6345 insertions(+), 7743 deletions(-)
copy {jdbc/src/main/java/org/apache/iotdb/jdbc => example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile}/Constant.java (73%)
copy {jdbc/src/main/java/org/apache/iotdb/jdbc => example/tsfile/src/main/java/org/apache/iotdb/tsfile}/Constant.java (77%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/MemChunkMetadataLoader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/tools/upgrade/OfflineUpgradeTool.java
rename server/src/test/java/org/apache/iotdb/db/auth/{LocalFIleRoleAccessorTest.java => LocalFileRoleAccessorTest.java} (98%)
rename server/src/test/java/org/apache/iotdb/db/engine/cache/{DeviceMetaDataCacheTest.java => ChunkMetadataCacheTest.java} (91%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationDeleteIT.java
copy server/src/test/java/org/apache/iotdb/db/integration/{IoTDBMultiStatementsIT.java => IoTDBSameMeasurementsDifferentTypesIT.java} (94%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaData.java
rename tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/{ChunkMetaData.java => ChunkMetadata.java} (91%)
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadata.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndex.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetaData.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TsFileMetadata.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/TSFreqType.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/{IChunkLoader.java => IChunkMetadataLoader.java} (73%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/tool/upgrade/TsfileUpgradeToolV0_8_0.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/tool/upgrade/UpgradeTool.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/SchemaBuilder.java
delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetaDataTest.java
delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/TsDeviceMetadataIndexTest.java
rename tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/{TsFileMetaDataTest.java => TsFileMetadataTest.java} (77%)
copy tsfile/src/test/java/org/apache/iotdb/tsfile/{write => read/query/timegenerator}/ReadWriteTest.java (92%)
rename tsfile/src/test/java/org/apache/iotdb/tsfile/{write => read/query/timegenerator}/TimeGeneratorReadEmptyTest.java (92%)
rename tsfile/src/test/java/org/apache/iotdb/tsfile/{write => read/query/timegenerator}/TimeGeneratorReadWriteTest.java (94%)
rename tsfile/src/test/java/org/apache/iotdb/tsfile/write/{ReadWriteTest.java => SameMeasurementsWithDifferentDataTypesTest.java} (62%)
[incubator-iotdb] 01/01: Merge pull request #855 from
apache/new_TsFile
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8d51ce7690188ff00459982fe03f4a9217021572
Merge: c0f23e8 e8b8ca8
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Tue Mar 31 10:35:51 2020 +0800
Merge pull request #855 from apache/new_TsFile
new TsFile version 2
LICENSE | 13 -
LICENSE-binary | 2 +-
docs/zh/SystemDesign/7-Connector/3-Spark-TsFile.md | 48 +-
.../org/apache/iotdb/hadoop/tsfile/Constant.java | 18 +-
.../iotdb/hadoop/tsfile/TSMRWriteExample.java | 259 +++++-----
.../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 20 +-
.../main/java/org/apache/iotdb/SessionExample.java | 30 +-
.../java/org/apache/iotdb/tsfile/Constant.java | 17 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 35 +-
.../iotdb/tsfile/TsFileWriteWithRowBatch.java | 9 +-
.../iotdb/tsfile/TsFileWriteWithTSRecord.java | 33 +-
.../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 7 +-
.../apache/iotdb/hadoop/tsfile/TSFInputFormat.java | 94 +---
.../apache/iotdb/hadoop/tsfile/TSFInputSplit.java | 251 +---------
.../iotdb/hadoop/tsfile/TSFRecordReader.java | 69 +--
.../iotdb/hadoop/tsfile/TSFRecordWriter.java | 1 -
.../iotdb/hadoop/tsfile/TSFInputSplitTest.java | 21 +-
.../iotdb/hadoop/tsfile/TsFileTestHelper.java | 7 +-
.../apache/iotdb/hive/TSFHiveInputFormatTest.java | 29 +-
.../apache/iotdb/hive/TSFHiveRecordReaderTest.java | 30 +-
.../org/apache/iotdb/hive/TsFileTestHelper.java | 3 +-
.../apache/iotdb/jdbc/AbstractIoTDBResultSet.java | 35 +-
.../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java | 21 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 10 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 8 +-
.../resources/conf/iotdb-engine.properties | 6 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 19 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 60 +--
.../db/engine/cache/CacheHitRatioMonitor.java | 9 +-
.../engine/cache/CacheHitRatioMonitorMXBean.java | 2 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 29 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 185 +++++++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 231 ---------
.../db/engine/cache/TimeSeriesMetadataCache.java | 223 +++++++++
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 103 ++--
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 122 -----
.../iotdb/db/engine/flush/MemTableFlushTask.java | 100 ++--
.../iotdb/db/engine/flush/NotifyFlushMemTable.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 19 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 3 +-
.../db/engine/memtable/IWritableMemChunk.java | 3 +-
.../db/engine/memtable/PrimitiveMemTable.java | 6 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 17 +-
.../db/engine/merge/manage/MergeResource.java | 34 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 2 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 98 ++--
.../db/engine/merge/task/MergeMultiChunkTask.java | 89 ++--
.../iotdb/db/engine/merge/task/MergeTask.java | 26 +-
.../db/engine/merge/task/RecoverMergeTask.java | 10 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 19 +-
.../engine/storagegroup/StorageGroupProcessor.java | 173 +++----
.../db/engine/storagegroup/TsFileProcessor.java | 24 +-
.../db/engine/storagegroup/TsFileResource.java | 93 +++-
.../iotdb/db/engine/upgrade/UpgradeTask.java | 13 -
.../org/apache/iotdb/db/metadata/MManager.java | 85 ++--
.../java/org/apache/iotdb/db/metadata/MTree.java | 61 +--
.../iotdb/db/metadata/mnode/InternalMNode.java | 7 -
.../apache/iotdb/db/metadata/mnode/LeafMNode.java | 1 -
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 3 -
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 15 +-
.../iotdb/db/monitor/collector/FileSize.java | 17 -
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 87 ++--
.../iotdb/db/qp/physical/crud/BatchInsertPlan.java | 13 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 37 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 16 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 20 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 102 ++--
.../db/query/aggregation/AggregateResult.java | 7 +-
.../iotdb/db/query/context/QueryContext.java | 4 +-
.../iotdb/db/query/control/FileReaderManager.java | 71 ++-
.../db/query/control/QueryResourceManager.java | 6 +-
.../db/query/dataset/groupby/GroupByExecutor.java | 5 +-
.../groupby/GroupByWithValueFilterDataSet.java | 28 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 31 +-
.../dataset/groupby/LocalGroupByExecutor.java | 54 +-
.../db/query/executor/AggregationExecutor.java | 71 +--
.../iotdb/db/query/executor/FillQueryExecutor.java | 13 +-
.../iotdb/db/query/executor/IQueryRouter.java | 3 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 46 +-
.../iotdb/db/query/executor/QueryRouter.java | 33 +-
.../db/query/executor/RawDataQueryExecutor.java | 38 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 8 +-
.../db/query/reader/chunk/ChunkReaderWrap.java | 6 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 4 +-
.../db/query/reader/chunk/MemChunkLoader.java | 4 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 81 +++
.../chunk/metadata/MemChunkMetadataLoader.java | 68 +++
.../db/query/reader/series/IAggregateReader.java | 8 +
.../query/reader/series/SeriesAggregateReader.java | 32 +-
.../reader/series/SeriesRawDataBatchReader.java | 33 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 364 +++++++++-----
.../reader/series/SeriesReaderByTimestamp.java | 29 +-
.../query/timegenerator/ServerTimeGenerator.java | 10 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 65 +--
.../apache/iotdb/db/tools/TsFileSketchTool.java | 140 +++---
.../iotdb/db/tools/upgrade/OfflineUpgradeTool.java | 68 ---
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 124 +++--
.../java/org/apache/iotdb/db/utils/MemUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 57 +--
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 22 +-
.../org/apache/iotdb/db/utils/SchemaUtils.java | 45 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 46 +-
.../writelog/recover/TsFileRecoverPerformer.java | 107 ++--
...sorTest.java => LocalFileRoleAccessorTest.java} | 2 +-
.../iotdb/db/engine/MetadataManagerHelper.java | 38 +-
...aCacheTest.java => ChunkMetadataCacheTest.java} | 22 +-
.../db/engine/memtable/MemTableFlushTaskTest.java | 8 +-
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 13 -
.../db/engine/memtable/MemTableTestUtils.java | 6 +-
.../db/engine/memtable/MemtableBenchmark.java | 4 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 9 +-
.../engine/merge/MaxFileMergeFileSelectorTest.java | 6 +-
.../merge/MaxSeriesMergeFileSelectorTest.java | 21 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 2 +
.../iotdb/db/engine/merge/MergeOverLapTest.java | 9 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 14 +-
.../iotdb/db/engine/merge/MergeUpgradeTest.java | 13 +-
.../engine/modification/DeletionFileNodeTest.java | 16 +-
.../db/engine/modification/DeletionQueryTest.java | 8 +-
.../storagegroup/StorageGroupProcessorTest.java | 24 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 36 +-
.../engine/storagegroup/TsFileProcessorTest.java | 68 +--
.../iotdb/db/integration/IOTDBGroupByIT.java | 35 +-
.../db/integration/IoTDBAggregationDeleteIT.java | 98 ++++
.../iotdb/db/integration/IoTDBAggregationIT.java | 12 +-
.../integration/IoTDBAggregationLargeDataIT.java | 58 ++-
.../db/integration/IoTDBAutoCreateSchemaIT.java | 2 -
.../iotdb/db/integration/IoTDBCompleteIT.java | 9 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 21 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 26 +-
.../db/integration/IoTDBFlushQueryMergeTest.java | 3 -
.../apache/iotdb/db/integration/IoTDBLastIT.java | 15 +-
.../integration/IoTDBLoadExternalTsfileTest.java | 24 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 3 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 7 +-
.../IoTDBSameMeasurementsDifferentTypesIT.java | 190 +++++++
.../db/integration/IoTDBSequenceDataQueryIT.java | 17 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 26 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 9 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 19 +-
.../iotdb/db/metadata/MManagerImproveTest.java | 19 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 5 +-
.../db/query/control/FileReaderManagerTest.java | 4 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 2 +-
.../reader/series/SeriesAggregateReaderTest.java | 76 +--
.../reader/series/SeriesReaderByTimestampTest.java | 10 +-
.../db/query/reader/series/SeriesReaderTest.java | 25 +-
.../query/reader/series/SeriesReaderTestUtil.java | 20 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 4 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 50 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 81 +--
.../writelog/recover/UnseqTsFileRecoverTest.java | 64 ++-
service-rpc/src/main/thrift/rpc.thrift | 1 +
.../java/org/apache/iotdb/session/Session.java | 9 +-
.../org/apache/iotdb/session/SessionUtils.java | 4 +-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 57 ++-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 5 +-
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 39 +-
.../apache/iotdb/spark/tsfile/DefaultSource.scala | 6 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 24 +-
.../apache/iotdb/spark/tsfile/WideConverter.scala | 36 +-
.../org/apache/iotdb/spark/tsfile/package.scala | 10 +-
.../org/apache/iotdb/spark/tool/TsFileExample.java | 13 +-
.../apache/iotdb/spark/tool/TsFileWriteTool.java | 39 +-
.../apache/iotdb/spark/tsfile/ConverterTest.scala | 6 +-
.../org/apache/iotdb/spark/tsfile/TSFileSuit.scala | 78 ++-
tsfile/format-changelist.md | 11 +-
.../apache/iotdb/tsfile/common/cache/Cache.java | 1 +
.../iotdb/tsfile/common/conf/TSFileConfig.java | 30 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 37 +-
.../tsfile/common/constant/JsonFormatConstant.java | 6 +-
.../tsfile/common/constant/QueryConstant.java | 3 +-
.../tsfile/common/constant/TsFileConstant.java | 3 +-
.../apache/iotdb/tsfile/compress/ICompressor.java | 10 +-
.../iotdb/tsfile/compress/IUnCompressor.java | 12 +-
.../tsfile/encoding/bitpacking/IntPacker.java | 46 +-
.../tsfile/encoding/bitpacking/LongPacker.java | 51 +-
.../tsfile/encoding/common/EncodingConfig.java | 4 +-
.../tsfile/encoding/decoder/BitmapDecoder.java | 30 +-
.../iotdb/tsfile/encoding/decoder/Decoder.java | 5 +-
.../encoding/decoder/DeltaBinaryDecoder.java | 5 +-
.../encoding/decoder/DoublePrecisionDecoder.java | 6 +-
.../tsfile/encoding/decoder/FloatDecoder.java | 25 +-
.../tsfile/encoding/decoder/GorillaDecoder.java | 6 +-
.../tsfile/encoding/decoder/IntRleDecoder.java | 33 +-
.../tsfile/encoding/decoder/LongRleDecoder.java | 35 +-
.../tsfile/encoding/decoder/PlainDecoder.java | 5 +-
.../encoding/decoder/RegularDataDecoder.java | 10 +-
.../iotdb/tsfile/encoding/decoder/RleDecoder.java | 56 ++-
.../encoding/decoder/SinglePrecisionDecoder.java | 8 +-
.../tsfile/encoding/encoder/BitmapEncoder.java | 29 +-
.../encoding/encoder/DeltaBinaryEncoder.java | 47 +-
.../encoding/encoder/DoublePrecisionEncoder.java | 12 +-
.../iotdb/tsfile/encoding/encoder/Encoder.java | 12 +-
.../tsfile/encoding/encoder/FloatEncoder.java | 13 +-
.../tsfile/encoding/encoder/GorillaEncoder.java | 4 +-
.../tsfile/encoding/encoder/IntRleEncoder.java | 1 +
.../tsfile/encoding/encoder/LongRleEncoder.java | 3 +-
.../tsfile/encoding/encoder/PlainEncoder.java | 41 +-
.../encoding/encoder/RegularDataEncoder.java | 43 +-
.../iotdb/tsfile/encoding/encoder/RleEncoder.java | 56 ++-
.../encoding/encoder/SinglePrecisionEncoder.java | 12 +-
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 20 +-
.../tsfile/exception/NotCompatibleException.java | 1 +
.../tsfile/exception/TsFileRuntimeException.java | 4 +-
.../tsfile/exception/cache/CacheException.java | 5 +-
.../CompressionTypeNotSupportedException.java | 4 +-
.../encoding/TsFileDecodingException.java | 6 +-
.../encoding/TsFileEncodingException.java | 6 +-
.../exception/write/NoMeasurementException.java | 3 +-
.../write/UnknownColumnTypeException.java | 4 +-
.../exception/write/WriteProcessException.java | 1 -
.../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 27 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 37 +-
.../iotdb/tsfile/file/header/PageHeader.java | 1 +
.../iotdb/tsfile/file/header/package-info.java | 9 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 178 -------
.../{ChunkMetaData.java => ChunkMetadata.java} | 20 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 119 +++++
.../tsfile/file/metadata/TsDeviceMetadata.java | 142 ------
.../file/metadata/TsDeviceMetadataIndex.java | 163 -------
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 423 ----------------
.../iotdb/tsfile/file/metadata/TsFileMetadata.java | 210 ++++++++
.../tsfile/file/metadata/enums/TSDataType.java | 18 +-
.../tsfile/file/metadata/enums/TSFreqType.java | 61 ---
.../file/metadata/statistics/BinaryStatistics.java | 6 +-
.../metadata/statistics/BooleanStatistics.java | 3 +-
.../file/metadata/statistics/DoubleStatistics.java | 15 +-
.../file/metadata/statistics/FloatStatistics.java | 8 +-
.../metadata/statistics/IntegerStatistics.java | 8 +-
.../file/metadata/statistics/LongStatistics.java | 8 +-
.../file/metadata/statistics/Statistics.java | 68 +--
.../iotdb/tsfile/fileSystem/FSFactoryProducer.java | 1 -
.../fileInputFactory/HDFSInputFactory.java | 7 +-
.../fileInputFactory/LocalFSInputFactory.java | 6 +-
.../fileOutputFactory/HDFSOutputFactory.java | 7 +-
.../fileOutputFactory/LocalFSOutputFactory.java | 6 +-
.../tsfile/fileSystem/fsFactory/HDFSFactory.java | 36 +-
.../fileSystem/fsFactory/LocalFSFactory.java | 1 +
.../iotdb/tsfile/read/TsFileRestorableReader.java | 18 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 524 +++++++++++---------
.../iotdb/tsfile/read/UnClosedTsFileReader.java | 16 +-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 4 +-
.../org/apache/iotdb/tsfile/read/common/Field.java | 5 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 37 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 18 +-
.../read/controller/CachedChunkLoaderImpl.java | 13 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 8 +-
...IChunkLoader.java => IChunkMetadataLoader.java} | 14 +-
.../tsfile/read/controller/IMetadataQuerier.java | 18 +-
.../read/controller/MetadataQuerierByFileImpl.java | 187 ++++---
.../tsfile/read/expression/ExpressionType.java | 20 +-
.../iotdb/tsfile/read/expression/IExpression.java | 2 +-
.../read/expression/impl/BinaryExpression.java | 1 +
.../read/expression/impl/GlobalTimeExpression.java | 1 +
.../expression/impl/SingleSeriesExpression.java | 1 +
.../read/expression/util/ExpressionOptimizer.java | 13 +-
.../query/executor/ExecutorWithTimeGenerator.java | 14 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 16 +-
.../read/query/timegenerator/TimeGenerator.java | 9 +-
.../query/timegenerator/TsFileTimeGenerator.java | 6 +-
.../iotdb/tsfile/read/reader/TsFileInput.java | 71 +--
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +
.../reader/series/AbstractFileSeriesReader.java | 20 +-
.../read/reader/series/EmptyFileSeriesReader.java | 6 +-
.../read/reader/series/FileSeriesReader.java | 10 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 18 +-
.../tool/upgrade/TsfileUpgradeToolV0_8_0.java | 543 ---------------------
.../iotdb/tsfile/tool/upgrade/UpgradeTool.java | 108 ----
.../java/org/apache/iotdb/tsfile/utils/Binary.java | 7 +-
.../org/apache/iotdb/tsfile/utils/BloomFilter.java | 3 +-
.../org/apache/iotdb/tsfile/utils/BytesUtils.java | 21 +-
.../java/org/apache/iotdb/tsfile/utils/Loader.java | 4 +-
.../java/org/apache/iotdb/tsfile/utils/Pair.java | 4 +-
.../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 13 +-
.../tsfile/utils/ReadWriteForEncodingUtils.java | 65 ++-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 24 -
.../apache/iotdb/tsfile/utils/StringContainer.java | 63 ++-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 139 +++---
.../tsfile/write/chunk/ChunkGroupWriterImpl.java | 9 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 2 +-
.../tsfile/write/chunk/IChunkGroupWriter.java | 1 -
.../apache/iotdb/tsfile/write/page/PageWriter.java | 30 +-
.../apache/iotdb/tsfile/write/record/RowBatch.java | 135 ++---
.../apache/iotdb/tsfile/write/record/TSRecord.java | 18 +-
.../write/record/datapoint/BooleanDataPoint.java | 4 +-
.../tsfile/write/record/datapoint/DataPoint.java | 9 +-
.../write/record/datapoint/DoubleDataPoint.java | 4 +-
.../write/record/datapoint/FloatDataPoint.java | 4 +-
.../write/record/datapoint/IntDataPoint.java | 4 +-
.../write/record/datapoint/LongDataPoint.java | 4 +-
.../write/record/datapoint/StringDataPoint.java | 4 +-
.../tsfile/write/schema/MeasurementSchema.java | 49 +-
.../apache/iotdb/tsfile/write/schema/Schema.java | 139 +++---
.../iotdb/tsfile/write/schema/SchemaBuilder.java | 93 ----
.../tsfile/write/writer/DefaultTsFileOutput.java | 5 +-
.../write/writer/ForceAppendTsFileWriter.java | 33 +-
.../write/writer/RestorableTsFileIOWriter.java | 165 ++++---
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 297 ++++++-----
.../iotdb/tsfile/write/writer/TsFileOutput.java | 15 +-
.../apache/iotdb/tsfile/common/LRUCacheTest.java | 4 +-
.../apache/iotdb/tsfile/compress/CompressTest.java | 6 +-
.../apache/iotdb/tsfile/compress/SnappyTest.java | 10 +-
.../apache/iotdb/tsfile/constant/TestConstant.java | 8 +-
.../tsfile/encoding/bitpacking/IntPackerTest.java | 3 +
.../tsfile/encoding/bitpacking/LongPackerTest.java | 5 +-
.../tsfile/encoding/decoder/BitmapDecoderTest.java | 7 +-
.../tsfile/encoding/decoder/FloatDecoderTest.java | 23 +-
.../encoding/decoder/GorillaDecoderTest.java | 10 +-
.../tsfile/encoding/decoder/IntRleDecoderTest.java | 10 +-
.../encoding/decoder/LongRleDecoderTest.java | 10 +-
.../delta/DeltaBinaryEncoderIntegerTest.java | 10 +-
.../decoder/delta/DeltaBinaryEncoderLongTest.java | 24 +-
.../regular/RegularDataEncoderIntegerTest.java | 5 +-
.../regular/RegularDataEncoderLongTest.java | 30 +-
.../iotdb/tsfile/file/header/PageHeaderTest.java | 12 +-
.../file/metadata/ChunkGroupMetaDataTest.java | 108 ----
.../file/metadata/TimeSeriesMetadataTest.java | 23 +-
.../file/metadata/TsDeviceMetadataIndexTest.java | 77 ---
...leMetaDataTest.java => TsFileMetadataTest.java} | 27 +-
.../metadata/statistics/BooleanStatisticsTest.java | 4 +-
.../metadata/statistics/DoubleStatisticsTest.java | 3 +
.../metadata/statistics/FloatStatisticsTest.java | 3 +
.../metadata/statistics/IntegerStatisticsTest.java | 3 +
.../metadata/statistics/LongStatisticsTest.java | 6 +-
.../metadata/statistics/StringStatisticsTest.java | 5 +-
.../tsfile/file/metadata/utils/TestHelper.java | 62 ++-
.../iotdb/tsfile/file/metadata/utils/Utils.java | 100 +---
.../iotdb/tsfile/read/ReadInPartitionTest.java | 112 ++---
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 36 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 48 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 67 ++-
.../tsfile/read/TsFileRestorableReaderTest.java | 8 +-
.../tsfile/read/TsFileSequenceReaderTest.java | 54 +-
.../apache/iotdb/tsfile/read/common/PathTest.java | 2 -
.../iotdb/tsfile/read/common/TimeRangeTest.java | 35 +-
.../tsfile/read/controller/ChunkLoaderTest.java | 17 +-
.../controller/IMetadataQuerierByFileImplTest.java | 97 ++--
.../read/filter/IExpressionOptimizerTest.java | 109 ++---
.../read/filter/MinTimeMaxTimeFilterTest.java | 4 +-
.../iotdb/tsfile/read/filter/OperatorTest.java | 12 +-
.../tsfile/read/filter/StatisticsFilterTest.java | 8 +-
.../read/query/executor/QueryExecutorTest.java | 39 +-
.../query/timegenerator}/ReadWriteTest.java | 11 +-
.../query/timegenerator/ReaderByTimestampTest.java | 8 +-
.../timegenerator}/TimeGeneratorReadEmptyTest.java | 8 +-
.../timegenerator}/TimeGeneratorReadWriteTest.java | 8 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 52 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 14 +-
.../apache/iotdb/tsfile/utils/BloomFilterTest.java | 5 +-
.../apache/iotdb/tsfile/utils/BytesUtilsTest.java | 4 +-
.../apache/iotdb/tsfile/utils/FileGenerator.java | 48 +-
.../org/apache/iotdb/tsfile/utils/FileUtils.java | 23 +-
.../apache/iotdb/tsfile/utils/FileUtilsTest.java | 20 +-
.../org/apache/iotdb/tsfile/utils/PairTest.java | 3 +
.../tsfile/utils/ReadWriteStreamUtilsTest.java | 15 +-
.../tsfile/utils/ReadWriteToBytesUtilsTest.java | 9 +-
.../org/apache/iotdb/tsfile/utils/RecordUtils.java | 19 +-
.../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 27 +-
.../iotdb/tsfile/utils/StringContainerTest.java | 2 +
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 79 +--
.../org/apache/iotdb/tsfile/write/PerfTest.java | 53 +-
.../iotdb/tsfile/write/ReadPageInMemTest.java | 37 +-
...ameMeasurementsWithDifferentDataTypesTest.java} | 105 ++--
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 26 +-
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 83 +---
.../iotdb/tsfile/write/TsFileWriterTest.java | 23 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 77 ++-
.../write/schema/converter/SchemaBuilderTest.java | 80 ++-
.../iotdb/tsfile/write/writer/PageWriterTest.java | 20 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 151 ++++--
373 files changed, 6533 insertions(+), 7739 deletions(-)