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/02/23 07:06:44 UTC
[incubator-iotdb] branch master updated (3ded47f -> 40c19d2)
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 3ded47f add TsFileFilter (#828)
add 3ae6c17 fix bug using "both condition 2 and 3 should respond with error message"
add d437c5e Revert "fix bug using "both condition 2 and 3 should respond with error message""
add 82e95cf Merge branch 'master' of https://github.com/apache/incubator-iotdb
add fc97378 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add c02a584 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add f7886a9 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 7e48518 enable user to set environment variable
add bffecf3 Revert "enable user to set environment variable"
add f1806d4 Revert "Revert "enable user to set environment variable""
add ed808c1 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 6211fa9 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 36694ad merge
add d3dd556 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 52ca919 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add a247e1c Merge branch 'master' of https://github.com/SilverNarcissus/incubator-iotdb
add e3070dd Merge branch 'master' of https://github.com/apache/incubator-iotdb
add a8ff3ca merge
add 1602a93 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add ed2e485 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add a5ef853 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 57f5126 merge
add 77a84fd Merge branch 'master' of https://github.com/apache/incubator-iotdb
add cc207a8 merge
add 16b619c merge
add d044a23 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 43f67d3 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add c5c20f0 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 1645ccc Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 0b82b29 init
add 1e95c05 Add constant and not exist column
add b87bfc7 Merge branch 'master' of https://github.com/apache/incubator-iotdb into IOTDB-447-query-as-much-as-possible
add 979fe85 fix bug and add more tests
add cc383cd merge
add 9daae58 add more test
add d04339d enable session handle duplicate columns
add f4b7629 remove unused code
add 588c640 add new Series reader
add d77a770 merge master
add 881a829 Merge remote-tracking branch 'origin/master' into new_series_reader
add 14c3d21 Merge remote-tracking branch 'origin/master' into new_series_reader
add 4d65fd1 Merge remote-tracking branch 'origin/master' into new_series_reader
add ba80f38 Merge branch 'master' into new_series_reader
add 3092715 [IOTDB-418] add some impl of NewSeriesReaderWithoutValueFilter (#692)
add 9b58b2f disable align clause
add 7bb9271 disable align
add 9e2922d fix a bug
add 618e025 merge master
add bac8652 fix a bug
add c2b0295 Merge branch 'master' of https://github.com/apache/incubator-iotdb into new_query_interface
add b598149 merge master
add 9cfc814 add license to new file
add 71179e6 Merge branch 'master' of https://github.com/apache/incubator-iotdb into new_query_interface
add 5251c27 update disable align
add af597cd resolve conflict and fix bugs
add cd9cef9 fix test errors
add cabd7ac merge disable align
add 3d6d2ab merge master
add 8341d76 Some code refactor
add 93c2c25 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 33e5522 fix compile error
add ad08f92 fix
add 0a0a3fe optimize aggregation
add a2e84af fix overlap
add 1adc7a1 change disable align
add be53447 resolve conflicts
add 0666b76 fix bug
add bd4e66f Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 2c105fa Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add f1cd782 fix canUseStatistics
add 346db61 fix example
add 29a7354 fix canUseChunkStatistics
add 39a370a fix aggregation getPageStatistics bug
add 7552e4a rename
add 2ba8ec7 rename and optimize codes
add 2a2c465 remove unusned class
add 8f77fa4 refactor 50% raw data query
add 7c2dd96 refactor 75% raw data query
add e6f38ad Merge AggregateResult and AggreResultData; move init() to constructor
add 72b7613 update aggregate; exchange extend relationship of AVG and SUM
add 8c3db53 rename function to aggregate result
add 3856be6 fix SeriesDataReaderWithoutValueFilter close
add 4eb3661 Merge disable align
add 0028b38 Replace AggreResultDataPointReader and OldEngineDataSet by SingleDataSet
add 861d372 fix aggregate SUM and AVG
add c09f0cf resolve sonarcloud
add 45a59bb Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 301ea5c Merge branch 'master' into new_series_reader
add d357d9a Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add 0c4523e fix some bug of new_series_reader (#744)
add cf9c736 refactor abstract reader
add 0ccdd73 leverage statistics in SeriesDataReaderWithValueFilter
add 4771442 fix GroupByWithoutValueFilterDataSet
add 2d3cdc6 Refactor rowRecord.addField()
add 9f7aa13 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 27b566b Fix IoTDBFillIT
add be88067 Fix some bugs
add 5d54d4b Revert extend relationship of AVG and SUM
add f6d853b Fix IOTDBGroupByIT
add c923877 Fix IoTDBAggregationSmallDataIT
add d73bb01 resolve conflicts
add 3b5ee81 resolve conflicts
add fca9668 fix some bug
add 062d6a8 Exchange extend relationship of AVG and SUM
add b6a322c Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add ef6326b Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add d6196d0 fix some bugs
add af4187b fix bugs
add 5e9f11c fix some bug
add 87a5491 Revert extend relationship of AVG and SUM
add e12cba9 remove unused codes
add aa229d2 Add iterators to TVList to prevent data copy (#753)
add 0b38a38 [IOTDB-434] Refactor SeriesReaderByTimestamp (#756)
add 5a47f614 fix filter bug
add ab0c74e fix javadoc
add 3224d83 Merge remote-tracking branch 'origin/master' into new_series_reader
add c497d41 refactor QueryProcessor to Planner
add cfac2a6 refactor EngineQueryRouter related
add 1b00919 uncomment test
add 953609a Merge remote-tracking branch 'origin/master' into new_series_reader
add 086e84d remove unused interface
add e806928 [IOTDB-438] Modify SeriesReader to uniform usage (#758)
add f0ec067 delete hasNext method in IReaderByTimestamp
add 8103f53 refactor ByTimestampReaderAdapter
add 94641c3 disable sonar for contributor pr
add e65cc7a [IOTDB-449] Manage TsFileSequenceReader in query by FileReaderManager (#760)
add 51a8788 modify group by
add 326b1ea simplify aggregation
add 0a81003 Merge remote-tracking branch 'origin/master' into new_series_reader
add 128f4d6 refactor exception
add 68bb28b fix endTime in GroupByEngineDataSet
add d98129b Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add b8a9146 move SeqTsFileRecoverTest output to target
add 908068a fix IoTDBGroupbyDeviceIT and IoTDBGroupByIT
add bfbb1f3 [IOTDB-443] Fix ReadOnlyMemChunk round float and double data incorrectly (#761)
add d0e46c9 [developing] support select ConstValue column, support query on notExistColumns for group by device
add 0241e4a Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 51ed987 Clear the relation of SeriesReaders (#764)
add 594703b [IOTDB-335] Merge different aggregations on same timeseries (#765)
add a1390bb optimize aggregation
add 1c8b37d fix some code smell
add 92a9e51 add override
add 28e2186 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 9937c59 add override in SeriesReader
add 1990ec4 test
add 5e99422 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 551c99e add some tests
add 055bbcb Test
add 5c2d3d5 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 72fd634 remove unused test class
add 9dcaa2c rename RawDataBatchReader to SeriesRawDataBatchReader
add 946fffc rename AggregateReader to SeriesAggregateReader
add 2d3264f fix defaultFillInterval
add ceea14c fix default fill type of int/long/float/double to LinearFill
add aa0d67b rename FillEngineExecutor to FillQueryExecutor
add 0b636dc fixed new_series_reader problem reported in sonar (#768)
add c311b36 Merge new_series_reader and solve conflicts
add e291c91 Rename
add 255d9ce some file package changes
add 1222a15 resolve conflicts
add 740f614 change package name
add 132fe56 Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add 7715c3b Solve conflicts
add 03e18f7 Add tests
add 5a06b8d Add test
add 3b06b1f Extract series test util
add 9e7a076 add doc
add c45fbbb resolve conflict after merging master
add d7e4a54 Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add 5570ec2 Add license
add 3404293 Merge branch 'master' into new_series_reader
add 4e998ab Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add 88f5a66 Enhance IT test for aggregation query with more than one functions on one series
add 8389530 Rename
add cdd8e61 add raw data query document
add cfdc6b5 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 98f3d31 Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add b1eb110 update raw data query and series reader doc
add bd9517b Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add b71fd95 [IOTDB-452] Do all aggregations of one series at one pass in GroupBy (#769)
add eb7565e Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add 0ee0a4f Add Aggregation desgin document
add eddc108 Enhance
add 7deb6eb Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add b45c505 Add SeriesReaderByTimestampTest for SeriesReaderByTimestamp (#773)
add e6ff2a5 optimze data query doc
add 2bf629e remove print in test
add 6c1cf27 Add Group By design document
add 4e2ad75 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 4db49d5 move package
add 3fb17fb simplify PlanExecutor
add a3e2367 Fix typo
add eb920ce Merge remote-tracking branch 'origin/master' into new_series_reader
add a5c5961 review planner and RawDataQueryExecutor (#779)
add 9501fcd optimize QueryRouter
add 46542d3 delete useless local variable in groupby
add 2ea5ff7 Resolve conflict from IOTDB-447
add 96cf31e resolve conflict from IOTDB-447
add 6db2b91 fix test
add 7414e48 Update TsFile query document (#778)
add 2cb7ffe remove print in IoTDBSessionIT
add b31a856 fix typo in RawDataQuery.md
add 5f47303 fix travis
add 8c51724 add some tests
add 8c4c156 fix travis
add 7d16f11 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add bb35953 Add Apache Header
add e04acb2 solve the group by device bug
add 3e01c49 Fix SeriesAggregateReaderTest
add 1d799d5 fix tsfile read doc
add 851e041 Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add a937845 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 414fdbe Merge remote-tracking branch 'origin/master' into new_series_reader
add dd3385c merge master
add f28cd4a fix doc
add 511ac74 fix fill filter
add 29303a4 solve the fill bug
add 5668225 delete useless IPointReader in IFill
add 8a0e49f fix upperbound filter
add 27f0852 fix upperbound filter
add b190f92 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 15630d0 Merge remote-tracking branch 'origin/master' into new_series_reader
add 6c9a4e8 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 7bad43b change the Linear Fill logic
add 305b02a add some comments
add 753239a [IoTDB-468] Restructure QueryPlan (#796)
add 5a563b8 fix OOM when there are too many columns in one query by adding a IChunkLoader cache
add 2b0a724 fix comments in AggregateResult and IoTDBDescriptor
add ec267af Merge remote-tracking branch 'origin/master' into new_series_reader
add 4326b38 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 792f60c fix conflict
add 8747fa0 [IoTDB-475] Improve the logic of AlignByDevicePlan in PhysicalGenerator (#803)
add 8e4a01a [IOTDB-466] group by device -> align by device && group by time range [] -> [) (#805)
add 812d739 [IOTDB-464] Vectorize the IReaderByTimestamp (#812)
add 0353cdf Merge remote-tracking branch 'origin/master' into new_series_reader
add c4dd626 optimize codes
add 484617c optimize tsfile read doc
add ce5f509 add config parameter
add ca636e7 add config parameter
add e2bf457 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 7c87036 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 35e1d2c print warn log if waitForAllTsProcessorClosed() too long time
add 6b060ef add comments if a tsfile is closed
add aa34ad8 set jmxport =31999 by default if there is no config file
add a057780 do not print "cant get cpu ratio" in Tests
add a421890 fix bug in ActiveTimeSeriesCounter Test
add 42fd2b7 wait at most 30s for finishing merge tasks before stop daemon.
add 3466683 remove priority in ChunkMetadata and add check in isPageOverlapped in SeriesReader
add 8918104 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add c92895b Merge remote-tracking branch 'origin/master' into new_series_reader
add 2bb1a8b Add more mergeAggrOnOneSeriesTest
add ec9b912 fix review
add 171949b fix sonar bug
add 964180e Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add 014d27c Remove useless UnSupportedDataTypeException string
add dd3f44a Update avg method and test values
add a6f752f Merge remote-tracking branch 'origin/master' into new_series_reader
add 855fef4 add group by device
add 67e4f64 Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add c5df90c add some comments
add 9a54e6e fix align by device doc
add 153d433 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 9eb9766 rename raw query data set with value filter
add d46a4c4 Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 91a37f8 fix a bug in tsfile test
add ae09b5b add ttl in seriesreader with value filter
add 719a938 Cached chunk (#802)
add 2b2f458 Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 1509a8b Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
add 4c0390f Merge branch 'new_series_reader' of github.com:apache/incubator-iotdb into new_series_reader
add 6658a0a [IOTDB-496]An extra line in CLI when the result is empty (#819)
add 7a161ed [IOTDB-482] Vectorized TimeGenerator (#818)
add 9fab09b enable warn level log for UTs
add 760da11 Merge remote-tracking branch 'origin/master' into ut_close_socket
add 70ba6c8 try to connect 6667 to check whether the socket is closed
add b453bba try to connect 6667 to check whether the socket is closed
add 9e3a004 check whether jmx port is closed
add e33be28 try 8181 port after environmentutil.cleanup
add 3c2b803 print temp logs for checking why 8181 can not be closed
add c148346 print temp logs for checking why 8181 can not be closed
add 2e8fe37 remove unused daemon in IT
add 46643be fix two daemon conflict in IoTDBRecoverIT
add 4c81b0c fix activeTimeseries null pointer
add 5cde236 print which files are left after cleaning a folder
add 2a434dd merge with master
add 2571fbf merge with master
add d0b2b63 try to fix 8181 port not closed successful
add 32b6a79 debug why files can not be deleted
add 05c45a3 debug why win can not delete files
add 9a69d97 fix a bug in TsFileIOWriter that the file field is not initialized
add 112e264 add a log to split test functions in a Test
add 207daa4 for debug
add 0daa791 for debug reader and writer
add aaf121d for debug
add aa829e4 for debug
add 506dd87 fix a reader not closed before delete data in UT
add f9da016 fix a reader not closed before delete data in UT
add 6c8380d add FileMonitor logger to monitot file open and close event
add 2410ff2 merge with ut_close_socket
add 4dc7261 fix bugs that file is not closed in
add 396771c move an error log to info log.(resourceLogger)
add 90c513c merge with ut_close_socket
add b1dbcb3 enable mergeLog for checking why merging is hanged
add ed7b548 try to set stoptime as 0 to accelerate MetrcsService close
add 487850d try to solve the bug 'if the flushing thread is too fast, the tmpMemTable.wait() may never wakeup' in TsFileProcessor syncFlush()
add 78bf351 try to solve the bug 'if the flushing thread is too fast, the tmpMemTable.wait() may never wakeup' in TsFileProcessor syncFlush() 2
add 2f2e1e0 debug why 8181 is not closed
add a87d9e4 [IOTDB-510][IOTDB-501]Fix nullPointException bug in TsProcessor (#831)
add 9570e2a resolve conflict after merging master
add 4aa9ff3 fix sonar bug and smell
add 77a01a5 add license
add f96fafd add some test
add f0e59f1 add header
new 40c19d2 Merge pull request #713 from apache/new_series_reader
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:
.travis.yml | 6 +-
.../org/apache/iotdb/client/AbstractClient.java | 104 ++--
.../SystemDesign/1-TsFile/4-Read.md | 541 ++++++++++++++++++++-
.../SystemDesign/5-DataQuery/1-DataQuery.md | 52 +-
.../SystemDesign/5-DataQuery/2-SeriesReader.md | 414 ++++++++++++++++
.../SystemDesign/5-DataQuery/3-RawDataQuery.md | 301 ++++++++++++
.../SystemDesign/5-DataQuery/4-AggregationQuery.md | 118 +++++
.../SystemDesign/5-DataQuery/5-GroupByQuery.md | 192 ++++++++
.../2-DML (Data Manipulation Language).md | 4 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +--
docs/Documentation/SystemDesign/0-Content.md | 4 +
docs/Documentation/SystemDesign/1-TsFile/4-Read.md | 537 ++++++++++++++++++++
.../2-DML (Data Manipulation Language).md | 20 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +--
hadoop/src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../resources/conf/iotdb-engine.properties | 18 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 20 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 52 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 84 ++--
.../db/conf/adapter/ActiveTimeSeriesCounter.java | 19 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 26 +-
.../db/engine/cache/CacheHitRatioMonitor.java | 5 +
.../engine/cache/CacheHitRatioMonitorMXBean.java | 2 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 150 ++++++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 13 +-
.../iotdb/db/engine/cache/RamUsageEstimator.java | 34 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 33 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 42 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 8 +-
.../db/engine/memtable/IWritableMemChunk.java | 16 +-
.../db/engine/memtable/MemSeriesLazyMerger.java | 50 --
.../engine/memtable/TimeValuePairInMemTable.java | 45 --
.../db/engine/memtable/TimeValuePairSorter.java | 55 ---
.../iotdb/db/engine/memtable/WritableMemChunk.java | 66 +--
.../iotdb/db/engine/merge/manage/MergeManager.java | 40 ++
.../db/engine/merge/manage/MergeResource.java | 6 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 6 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 17 +-
.../db/engine/querycontext/QueryDataSource.java | 13 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 131 ++---
.../engine/storagegroup/StorageGroupProcessor.java | 101 ++--
.../db/engine/storagegroup/TsFileProcessor.java | 274 +++++++----
.../db/engine/storagegroup/TsFileResource.java | 20 +-
.../db/exception/ConfigAdjusterException.java | 5 +-
.../exception/DiskSpaceInsufficientException.java | 4 +-
.../{ProcessException.java => IoTDBException.java} | 7 +-
.../apache/iotdb/db/exception/MergeException.java | 5 +-
.../exception/QueryInBatchStatementException.java | 6 +-
.../iotdb/db/exception/StartupException.java | 12 +-
.../iotdb/db/exception/StorageEngineException.java | 14 +-
.../db/exception/SyncConnectionException.java | 11 +-
.../SyncDeviceOwnerConflictException.java | 8 +-
.../iotdb/db/exception/SystemCheckException.java | 6 +-
.../db/exception/TsFileProcessorException.java | 8 +-
.../db/exception/metadata/MetadataException.java | 19 +-
.../metadata/TimeseriesAlreadyExistException.java | 4 +-
.../db/exception/path/MTreePathException.java | 1 -
.../exception/path/NotStorageGroupException.java | 4 +-
.../iotdb/db/exception/path/PathException.java | 10 +-
.../exception/query/LogicalOperatorException.java | 16 +-
.../exception/query/LogicalOptimizeException.java | 6 +-
.../db/exception/query/OutOfTTLException.java | 4 +-
.../db/exception/query/QueryProcessException.java | 16 +-
.../query/UnSupportedFillTypeException.java | 4 +-
...imeException.java => JDBCServiceException.java} | 14 +-
.../storageGroup/StorageGroupException.java | 7 +-
.../StorageGroupProcessorException.java | 10 +-
.../org/apache/iotdb/db/metadata/MManager.java | 11 +
.../db/qp/{QueryProcessor.java => Planner.java} | 30 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 390 ---------------
...ueryProcessExecutor.java => IPlanExecutor.java} | 48 +-
...QueryProcessExecutor.java => PlanExecutor.java} | 478 ++++++++++++++----
.../db/qp/logical/crud/BasicFunctionOperator.java | 8 +-
.../iotdb/db/qp/logical/crud/FilterOperator.java | 17 +-
.../iotdb/db/qp/logical/crud/InOperator.java | 8 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 20 +-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 2 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 176 +++++++
.../iotdb/db/qp/physical/crud/FillQueryPlan.java | 2 +-
.../iotdb/db/qp/physical/crud/GroupByPlan.java | 13 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 188 +------
.../db/qp/physical/crud/RawDataQueryPlan.java | 76 +++
.../iotdb/db/qp/strategy/LogicalGenerator.java | 15 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 177 +++----
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 20 +-
.../db/qp/strategy/optimizer/IFilterOptimizer.java | 3 +-
.../db/query/aggregation/AggreResultData.java | 192 --------
.../db/query/aggregation/AggregateFunction.java | 122 -----
.../db/query/aggregation/AggregateResult.java | 212 ++++++++
.../db/query/aggregation/impl/AvgAggrFunc.java | 173 -------
.../db/query/aggregation/impl/AvgAggrResult.java | 115 +++++
.../db/query/aggregation/impl/CountAggrFunc.java | 156 ------
.../db/query/aggregation/impl/CountAggrResult.java | 89 ++++
.../query/aggregation/impl/FirstValueAggrFunc.java | 154 ------
.../aggregation/impl/FirstValueAggrResult.java | 97 ++++
.../query/aggregation/impl/LastValueAggrFunc.java | 151 ------
.../aggregation/impl/LastValueAggrResult.java | 90 ++++
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 135 -----
.../query/aggregation/impl/MaxTimeAggrResult.java | 93 ++++
.../query/aggregation/impl/MaxValueAggrFunc.java | 170 -------
.../query/aggregation/impl/MaxValueAggrResult.java | 94 ++++
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 156 ------
.../query/aggregation/impl/MinTimeAggrResult.java | 85 ++++
.../query/aggregation/impl/MinValueAggrFunc.java | 166 -------
.../query/aggregation/impl/MinValueAggrResult.java | 90 ++++
.../db/query/aggregation/impl/SumAggrResult.java | 107 ++++
.../iotdb/db/query/control/FileReaderManager.java | 21 +-
.../db/query/control/QueryResourceManager.java | 29 +-
.../query/dataset/AggreResultDataPointReader.java | 56 ---
...erateDataSet.java => AlignByDeviceDataSet.java} | 139 +++---
.../db/query/dataset/NonAlignEngineDataSet.java | 45 +-
.../OldEngineDataSetWithoutValueFilter.java | 153 ------
...er.java => RawQueryDataSetWithValueFilter.java} | 28 +-
...java => RawQueryDataSetWithoutValueFilter.java} | 103 ++--
.../iotdb/db/query/dataset/SingleDataSet.java | 3 +-
.../dataset/groupby/GroupByEngineDataSet.java | 86 +---
.../groupby/GroupByWithValueFilterDataSet.java | 71 +--
.../groupby/GroupByWithoutValueFilterDataSet.java | 385 +++++++--------
.../db/query/executor/AggregateEngineExecutor.java | 336 -------------
.../db/query/executor/AggregationExecutor.java | 289 +++++++++++
...lEngineExecutor.java => FillQueryExecutor.java} | 57 ++-
.../{IEngineQueryRouter.java => IQueryRouter.java} | 6 +-
.../{EngineQueryRouter.java => QueryRouter.java} | 123 +++--
...gineExecutor.java => RawDataQueryExecutor.java} | 98 ++--
.../db/query/externalsort/ExternalSortJob.java | 2 +-
.../query/externalsort/ExternalSortJobEngine.java | 7 +-
.../db/query/externalsort/ExternalSortJobPart.java | 2 +-
.../iotdb/db/query/externalsort/LineMerger.java | 6 +-
.../MultiSourceExternalSortJobPart.java | 2 +-
.../externalsort/SimpleExternalSortEngine.java | 15 +-
.../SingleSourceExternalSortJobPart.java | 28 +-
.../adapter/ByTimestampReaderAdapter.java | 67 ++-
.../serialize/IExternalSortFileDeserializer.java | 6 +-
.../serialize/IExternalSortFileSerializer.java | 2 +-
.../FixLengthIExternalSortFileDeserializer.java | 6 +-
.../impl/FixLengthTimeValuePairSerializer.java | 2 +-
...greFuncFactory.java => AggreResultFactory.java} | 44 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 71 +--
.../org/apache/iotdb/db/query/fill/LinearFill.java | 51 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 39 +-
.../ChunkDataIterator.java} | 44 +-
.../{chunkRelated => chunk}/ChunkReaderWrap.java | 14 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 36 +-
.../DiskChunkReaderByTimestamp.java | 64 +--
.../db/query/reader/chunk/MemChunkLoader.java | 32 +-
.../{chunkRelated => chunk}/MemChunkReader.java | 58 +--
.../chunk/MemPageReader.java} | 31 +-
.../reader/chunkRelated/CachedDiskChunkReader.java | 88 ----
.../chunkRelated/MemChunkReaderByTimestamp.java | 78 ---
.../FileSeriesReaderByTimestampAdapter.java | 49 --
.../fileRelated/UnSealedTsFileIterateReader.java | 130 -----
.../UnSealedTsFileReaderByTimestamp.java | 96 ----
.../CachedUnseqResourceMergeReader.java | 11 +-
.../NewUnseqResourceMergeReader.java | 199 --------
.../OldUnseqResourceMergeReader.java | 140 ------
.../resourceRelated/ResourceRelatedUtil.java | 48 --
.../resourceRelated/SeqResourceIterateReader.java | 157 ------
.../SeqResourceReaderByTimestamp.java | 190 --------
.../UnseqResourceReaderByTimestamp.java | 101 ----
.../db/query/reader/series/IAggregateReader.java | 34 +-
.../reader/{ => series}/IReaderByTimestamp.java | 9 +-
.../reader/{ => series}/ManagedSeriesReader.java | 8 +-
.../query/reader/series/SeriesAggregateReader.java | 102 ++++
.../reader/series/SeriesRawDataBatchReader.java | 132 +++++
.../reader/series/SeriesRawDataPointReader.java | 100 ++++
.../iotdb/db/query/reader/series/SeriesReader.java | 471 ++++++++++++++++++
.../reader/series/SeriesReaderByTimestamp.java | 93 ++++
.../seriesRelated/SeriesReaderByTimestamp.java | 57 ---
.../seriesRelated/SeriesReaderWithValueFilter.java | 115 -----
.../SeriesReaderWithoutValueFilter.java | 270 ----------
.../universal/CachedPriorityMergeReader.java | 8 +-
.../db/query/reader/universal/IterateReader.java | 90 ----
.../reader/universal/PriorityMergeReader.java | 48 +-
.../universal/PriorityMergeReaderByTimestamp.java | 75 ---
.../timegenerator/AbstractNodeConstructor.java | 75 ---
.../query/timegenerator/EngineNodeConstructor.java | 69 ---
.../query/timegenerator/EngineTimeGenerator.java | 67 ---
.../query/timegenerator/ServerTimeGenerator.java | 76 +++
.../java/org/apache/iotdb/db/service/IService.java | 2 +
.../org/apache/iotdb/db/service/JDBCService.java | 7 +-
.../org/apache/iotdb/db/service/JMXService.java | 10 +-
.../apache/iotdb/db/service/MetricsService.java | 6 +-
.../apache/iotdb/db/service/RegisterManager.java | 2 +-
.../org/apache/iotdb/db/service/StartupChecks.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 321 ++++++------
.../java/org/apache/iotdb/db/utils/FileUtils.java | 8 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 1 +
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 66 +--
.../iotdb/db/utils/datastructure/BinaryTVList.java | 26 +-
.../db/utils/datastructure/BooleanTVList.java | 27 +-
.../iotdb/db/utils/datastructure/DoubleTVList.java | 31 +-
.../iotdb/db/utils/datastructure/FloatTVList.java | 31 +-
.../iotdb/db/utils/datastructure/IntTVList.java | 27 +-
.../iotdb/db/utils/datastructure/LongTVList.java | 26 +-
.../iotdb/db/utils/datastructure/TVList.java | 122 ++++-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 6 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 80 +--
.../iotdb/db/engine/merge/MergeOverLapTest.java | 39 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 190 ++++----
.../engine/modification/DeletionFileNodeTest.java | 68 +--
.../db/engine/modification/DeletionQueryTest.java | 27 +-
.../storagegroup/StorageGroupProcessorTest.java | 44 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 96 ++--
.../engine/storagegroup/TsFileProcessorTest.java | 144 +++---
.../iotdb/db/integration/IOTDBGroupByIT.java | 43 +-
.../integration/IOTDBGroupByInnerIntervalIT.java | 26 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 170 +++++--
.../integration/IoTDBAggregationSmallDataIT.java | 129 +++--
...upbyDeviceIT.java => IoTDBAlignByDeviceIT.java} | 67 ++-
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 4 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 10 +-
.../apache/iotdb/db/integration/IoTDBFillIT.java | 2 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 3 +
.../iotdb/db/integration/IoTDBRecoverIT.java | 2 +
.../db/integration/IoTDBSequenceDataQueryIT.java | 23 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 53 +-
.../{QueryProcessorTest.java => PlannerTest.java} | 7 +-
.../iotdb/db/qp/bench/QueryParseBenchmark.java | 11 +-
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 9 +-
.../db/qp/other/TSPlanContextPropertyTest.java | 9 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 38 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 288 +++++------
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 206 --------
.../iotdb/db/qp/plan/TestConcatOptimizer.java | 103 ++--
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 196 --------
.../dataset/EngineDataSetWithValueFilterTest.java | 14 +-
.../query/executor/GroupByEngineDataSetTest.java | 27 +-
.../query/externalsort/ExternalSortEngineTest.java | 40 +-
.../db/query/externalsort/FakeChunkReaderWrap.java | 6 +-
...ExternalSortFileSerializerDeserializerTest.java | 6 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 2 +
.../fileRelated/UnSealedTsFileReaderTest.java | 112 -----
.../NewUnseqResourceMergeReaderTest.java | 109 -----
.../resourceRelated/SeqResourceReaderTest.java | 116 -----
.../resourceRelated/UnseqResourceReaderTest.java | 146 ------
.../reader/series/SeriesAggregateReaderTest.java | 116 +++++
.../reader/series/SeriesReaderByTimestampTest.java | 84 ++++
.../db/query/reader/series/SeriesReaderTest.java | 127 +++++
.../reader/series/SeriesReaderTestUtil.java} | 156 +++---
.../reader/seriesRelated/FakedIBatchPoint.java | 110 -----
.../reader/seriesRelated/FakedIPointReader.java | 79 ---
.../SeriesReaderWithValueFilterTest.java | 59 ---
.../SeriesReaderWithoutValueFilterTest.java | 74 ---
.../query/reader/universal/FakedSeriesReader.java | 10 +-
.../universal/FakedSeriesReaderByTimestamp.java | 79 ---
.../PriorityMergeReaderByTimestampTest.java | 172 -------
.../reader/universal/PriorityMergeReaderTest.java | 8 +-
.../reader/universal/PriorityMergeReaderTest2.java | 13 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 69 ++-
.../db/utils/datastructure/LongTVListTest.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 21 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 9 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 25 +-
server/src/test/resources/logback.xml | 13 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +
.../org/apache/iotdb/session/IoTDBSessionIT.java | 60 ++-
.../apache/iotdb/tsfile/common/cache/LRUCache.java | 8 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 11 +
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 5 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 8 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 412 ++++++++--------
.../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 4 +-
.../apache/iotdb/tsfile/read}/TimeValuePair.java | 2 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 11 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 52 +-
.../org/apache/iotdb/tsfile/read/common/Field.java | 40 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 3 +-
.../apache/iotdb/tsfile/read/common/RowRecord.java | 5 +
.../iotdb/tsfile/read/common/SignalBatchData.java | 5 +
.../common/{RowRecord.java => TimeColumn.java} | 67 ++-
...kLoaderImpl.java => CachedChunkLoaderImpl.java} | 16 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 8 +-
.../iotdb/tsfile/read/filter/GroupByFilter.java | 22 +-
.../tsfile/read/filter/basic/UnaryFilter.java | 4 +
.../query/dataset/DataSetWithTimeGenerator.java | 4 +-
.../tsfile/read/query/dataset/QueryDataSet.java | 34 --
.../query/executor/ExecutorWithTimeGenerator.java | 4 +-
.../read/query/timegenerator/TimeGenerator.java | 99 +++-
.../query/timegenerator/TimeGeneratorImpl.java | 130 -----
.../query/timegenerator/TsFileTimeGenerator.java | 51 ++
.../read/query/timegenerator/node/AndNode.java | 86 ++--
.../read/query/timegenerator/node/LeafNode.java | 54 +-
.../tsfile/read/query/timegenerator/node/Node.java | 5 +-
.../read/query/timegenerator/node/OrNode.java | 121 +++--
.../tsfile/read/reader/BatchDataIterator.java | 44 +-
.../iotdb/tsfile/read/reader/IAggregateReader.java | 35 --
.../{IBatchReader.java => IChunkReader.java} | 12 +-
.../reader/{IBatchReader.java => IPageReader.java} | 10 +-
.../iotdb/tsfile/read}/reader/IPointReader.java | 12 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 87 ++--
.../read/reader/chunk/ChunkReaderByTimestamp.java | 4 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 42 +-
.../reader/series/AbstractFileSeriesReader.java | 37 +-
.../read/reader/series/EmptyFileSeriesReader.java | 5 -
.../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 13 -
.../apache/iotdb/tsfile/write/TsFileWriter.java | 23 +-
.../write/writer/ForceAppendTsFileWriter.java | 8 +-
.../write/writer/RestorableTsFileIOWriter.java | 5 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 9 +-
.../decoder/delta/DeltaBinaryEncoderLongTest.java | 18 +-
.../apache/iotdb/tsfile/read/ExpressionTest.java | 60 +++
.../org/apache/iotdb/tsfile/read/ReadTest.java | 18 +-
.../iotdb/tsfile/read/common/BatchDataTest.java | 82 ++++
.../tsfile/read/controller/ChunkLoaderTest.java | 2 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 6 +
.../read/query/executor/QueryExecutorTest.java | 4 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 38 +-
.../query/timegenerator/ReaderByTimestampTest.java | 4 +-
.../query/timegenerator/TimeGeneratorTest.java | 9 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 6 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 56 +--
.../iotdb/tsfile/utils/TsPrimitiveTypeTest.java | 60 +++
.../iotdb/tsfile/write/TsFileWriterTest.java | 26 +-
.../iotdb/tsfile/write/writer/PageWriterTest.java | 18 +-
316 files changed, 10263 insertions(+), 10572 deletions(-)
create mode 100644 docs/Documentation-CHN/SystemDesign/5-DataQuery/2-SeriesReader.md
create mode 100644 docs/Documentation-CHN/SystemDesign/5-DataQuery/3-RawDataQuery.md
create mode 100644 docs/Documentation-CHN/SystemDesign/5-DataQuery/4-AggregationQuery.md
create mode 100644 docs/Documentation-CHN/SystemDesign/5-DataQuery/5-GroupByQuery.md
copy {server => hive-connector}/src/test/resources/logback.xml (88%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
rename server/src/main/java/org/apache/iotdb/db/exception/{ProcessException.java => IoTDBException.java} (85%)
copy server/src/main/java/org/apache/iotdb/db/exception/runtime/{FlushRunTimeException.java => JDBCServiceException.java} (74%)
rename server/src/main/java/org/apache/iotdb/db/qp/{QueryProcessor.java => Planner.java} (84%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
rename server/src/main/java/org/apache/iotdb/db/qp/executor/{IQueryProcessExecutor.java => IPlanExecutor.java} (73%)
rename server/src/main/java/org/apache/iotdb/db/qp/executor/{QueryProcessExecutor.java => PlanExecutor.java} (65%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AlignByDevicePlan.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/AvgAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/AvgAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstValueAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstValueAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastValueAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastValueAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrResult.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrResult.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
rename server/src/main/java/org/apache/iotdb/db/query/dataset/{DeviceIterateDataSet.java => AlignByDeviceDataSet.java} (67%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/OldEngineDataSetWithoutValueFilter.java
rename server/src/main/java/org/apache/iotdb/db/query/dataset/{EngineDataSetWithValueFilter.java => RawQueryDataSetWithValueFilter.java} (78%)
rename server/src/main/java/org/apache/iotdb/db/query/dataset/{NewEngineDataSetWithoutValueFilter.java => RawQueryDataSetWithoutValueFilter.java} (80%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
rename server/src/main/java/org/apache/iotdb/db/query/executor/{FillEngineExecutor.java => FillQueryExecutor.java} (60%)
rename server/src/main/java/org/apache/iotdb/db/query/executor/{IEngineQueryRouter.java => IQueryRouter.java} (91%)
rename server/src/main/java/org/apache/iotdb/db/query/executor/{EngineQueryRouter.java => QueryRouter.java} (59%)
rename server/src/main/java/org/apache/iotdb/db/query/executor/{EngineExecutor.java => RawDataQueryExecutor.java} (57%)
rename server/src/main/java/org/apache/iotdb/db/query/factory/{AggreFuncFactory.java => AggreResultFactory.java} (62%)
rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated/DiskChunkReader.java => chunk/ChunkDataIterator.java} (63%)
rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunk}/ChunkReaderWrap.java (88%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkLoader.java => server/src/main/java/org/apache/iotdb/db/query/reader/chunk/DiskChunkLoader.java (60%)
rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunk}/DiskChunkReaderByTimestamp.java (55%)
rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/IDataReader.java => server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemChunkLoader.java (60%)
rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunk}/MemChunkReader.java (60%)
rename server/src/main/java/org/apache/iotdb/db/query/{aggregation/impl/SumAggrFunc.java => reader/chunk/MemPageReader.java} (58%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/CachedDiskChunkReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
rename server/src/main/java/org/apache/iotdb/db/query/reader/{resourceRelated => resource}/CachedUnseqResourceMergeReader.java (86%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/NewUnseqResourceMergeReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/OldUnseqResourceMergeReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/ResourceRelatedUtil.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java => server/src/main/java/org/apache/iotdb/db/query/reader/series/IAggregateReader.java (55%)
rename server/src/main/java/org/apache/iotdb/db/query/reader/{ => series}/IReaderByTimestamp.java (83%)
rename server/src/main/java/org/apache/iotdb/db/query/reader/{ => series}/ManagedSeriesReader.java (77%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataBatchReader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataPointReader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestamp.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/ServerTimeGenerator.java
rename server/src/test/java/org/apache/iotdb/db/integration/{IoTDBGroupbyDeviceIT.java => IoTDBAlignByDeviceIT.java} (98%)
rename server/src/test/java/org/apache/iotdb/db/qp/{QueryProcessorTest.java => PlannerTest.java} (96%)
delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/NewUnseqResourceMergeReaderTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
copy server/src/test/java/org/apache/iotdb/db/{engine/merge/MergeTest.java => query/reader/series/SeriesReaderTestUtil.java} (66%)
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
rename {server/src/main/java/org/apache/iotdb/db/utils => tsfile/src/main/java/org/apache/iotdb/tsfile/read}/TimeValuePair.java (98%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/{RowRecord.java => TimeColumn.java} (50%)
rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/{ChunkLoaderImpl.java => CachedChunkLoaderImpl.java} (86%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorImpl.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileTimeGenerator.java
rename server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java => tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/BatchDataIterator.java (53%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IAggregateReader.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/{IBatchReader.java => IChunkReader.java} (81%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/{IBatchReader.java => IPageReader.java} (83%)
rename {server/src/main/java/org/apache/iotdb/db/query => tsfile/src/main/java/org/apache/iotdb/tsfile/read}/reader/IPointReader.java (77%)
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/ExpressionTest.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/BatchDataTest.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsPrimitiveTypeTest.java
[incubator-iotdb] 01/01: Merge pull request #713 from
apache/new_series_reader
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 40c19d2b368901558a47233625febe123636ac61
Merge: 3ded47f f0e59f1
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Sun Feb 23 15:06:28 2020 +0800
Merge pull request #713 from apache/new_series_reader
[IOTDB-418] New series reader
.travis.yml | 6 +-
.../org/apache/iotdb/client/AbstractClient.java | 104 ++--
.../SystemDesign/1-TsFile/4-Read.md | 541 ++++++++++++++++++++-
.../SystemDesign/5-DataQuery/1-DataQuery.md | 52 +-
.../SystemDesign/5-DataQuery/2-SeriesReader.md | 414 ++++++++++++++++
.../SystemDesign/5-DataQuery/3-RawDataQuery.md | 301 ++++++++++++
.../SystemDesign/5-DataQuery/4-AggregationQuery.md | 118 +++++
.../SystemDesign/5-DataQuery/5-GroupByQuery.md | 192 ++++++++
.../2-DML (Data Manipulation Language).md | 4 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +--
docs/Documentation/SystemDesign/0-Content.md | 4 +
docs/Documentation/SystemDesign/1-TsFile/4-Read.md | 537 ++++++++++++++++++++
.../2-DML (Data Manipulation Language).md | 20 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +--
hadoop/src/test/resources/logback.xml | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../resources/conf/iotdb-engine.properties | 18 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 20 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 52 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 84 ++--
.../db/conf/adapter/ActiveTimeSeriesCounter.java | 19 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 26 +-
.../db/engine/cache/CacheHitRatioMonitor.java | 5 +
.../engine/cache/CacheHitRatioMonitorMXBean.java | 2 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 150 ++++++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 13 +-
.../iotdb/db/engine/cache/RamUsageEstimator.java | 34 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 33 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 42 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 8 +-
.../db/engine/memtable/IWritableMemChunk.java | 16 +-
.../db/engine/memtable/MemSeriesLazyMerger.java | 50 --
.../engine/memtable/TimeValuePairInMemTable.java | 45 --
.../db/engine/memtable/TimeValuePairSorter.java | 55 ---
.../iotdb/db/engine/memtable/WritableMemChunk.java | 66 +--
.../iotdb/db/engine/merge/manage/MergeManager.java | 40 ++
.../db/engine/merge/manage/MergeResource.java | 6 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 6 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 17 +-
.../db/engine/querycontext/QueryDataSource.java | 13 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 131 ++---
.../engine/storagegroup/StorageGroupProcessor.java | 101 ++--
.../db/engine/storagegroup/TsFileProcessor.java | 274 +++++++----
.../db/engine/storagegroup/TsFileResource.java | 20 +-
.../db/exception/ConfigAdjusterException.java | 5 +-
.../exception/DiskSpaceInsufficientException.java | 4 +-
.../{ProcessException.java => IoTDBException.java} | 7 +-
.../apache/iotdb/db/exception/MergeException.java | 5 +-
.../exception/QueryInBatchStatementException.java | 6 +-
.../iotdb/db/exception/StartupException.java | 12 +-
.../iotdb/db/exception/StorageEngineException.java | 14 +-
.../db/exception/SyncConnectionException.java | 11 +-
.../SyncDeviceOwnerConflictException.java | 8 +-
.../iotdb/db/exception/SystemCheckException.java | 6 +-
.../db/exception/TsFileProcessorException.java | 8 +-
.../db/exception/metadata/MetadataException.java | 19 +-
.../metadata/TimeseriesAlreadyExistException.java | 4 +-
.../db/exception/path/MTreePathException.java | 1 -
.../exception/path/NotStorageGroupException.java | 4 +-
.../iotdb/db/exception/path/PathException.java | 10 +-
.../exception/query/LogicalOperatorException.java | 16 +-
.../exception/query/LogicalOptimizeException.java | 6 +-
.../db/exception/query/OutOfTTLException.java | 4 +-
.../db/exception/query/QueryProcessException.java | 16 +-
.../query/UnSupportedFillTypeException.java | 4 +-
.../JDBCServiceException.java} | 13 +-
.../storageGroup/StorageGroupException.java | 7 +-
.../StorageGroupProcessorException.java | 10 +-
.../org/apache/iotdb/db/metadata/MManager.java | 11 +
.../db/qp/{QueryProcessor.java => Planner.java} | 30 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 390 ---------------
...ueryProcessExecutor.java => IPlanExecutor.java} | 48 +-
...QueryProcessExecutor.java => PlanExecutor.java} | 478 ++++++++++++++----
.../db/qp/logical/crud/BasicFunctionOperator.java | 8 +-
.../iotdb/db/qp/logical/crud/FilterOperator.java | 17 +-
.../iotdb/db/qp/logical/crud/InOperator.java | 8 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 20 +-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 2 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 176 +++++++
.../iotdb/db/qp/physical/crud/FillQueryPlan.java | 2 +-
.../iotdb/db/qp/physical/crud/GroupByPlan.java | 13 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 188 +------
.../db/qp/physical/crud/RawDataQueryPlan.java | 76 +++
.../iotdb/db/qp/strategy/LogicalGenerator.java | 15 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 177 +++----
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 20 +-
.../db/qp/strategy/optimizer/IFilterOptimizer.java | 3 +-
.../db/query/aggregation/AggreResultData.java | 192 --------
.../db/query/aggregation/AggregateFunction.java | 122 -----
.../db/query/aggregation/AggregateResult.java | 212 ++++++++
.../db/query/aggregation/impl/AvgAggrFunc.java | 173 -------
.../db/query/aggregation/impl/AvgAggrResult.java | 115 +++++
.../db/query/aggregation/impl/CountAggrFunc.java | 156 ------
.../db/query/aggregation/impl/CountAggrResult.java | 89 ++++
.../query/aggregation/impl/FirstValueAggrFunc.java | 154 ------
.../aggregation/impl/FirstValueAggrResult.java | 97 ++++
.../query/aggregation/impl/LastValueAggrFunc.java | 151 ------
.../aggregation/impl/LastValueAggrResult.java | 90 ++++
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 135 -----
.../query/aggregation/impl/MaxTimeAggrResult.java | 93 ++++
.../query/aggregation/impl/MaxValueAggrFunc.java | 170 -------
.../query/aggregation/impl/MaxValueAggrResult.java | 94 ++++
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 156 ------
.../query/aggregation/impl/MinTimeAggrResult.java | 85 ++++
.../query/aggregation/impl/MinValueAggrFunc.java | 166 -------
.../query/aggregation/impl/MinValueAggrResult.java | 90 ++++
.../db/query/aggregation/impl/SumAggrResult.java | 107 ++++
.../iotdb/db/query/control/FileReaderManager.java | 21 +-
.../db/query/control/QueryResourceManager.java | 29 +-
.../query/dataset/AggreResultDataPointReader.java | 56 ---
...erateDataSet.java => AlignByDeviceDataSet.java} | 139 +++---
.../db/query/dataset/NonAlignEngineDataSet.java | 45 +-
.../OldEngineDataSetWithoutValueFilter.java | 153 ------
...er.java => RawQueryDataSetWithValueFilter.java} | 28 +-
...java => RawQueryDataSetWithoutValueFilter.java} | 103 ++--
.../iotdb/db/query/dataset/SingleDataSet.java | 3 +-
.../dataset/groupby/GroupByEngineDataSet.java | 86 +---
.../groupby/GroupByWithValueFilterDataSet.java | 71 +--
.../groupby/GroupByWithoutValueFilterDataSet.java | 385 +++++++--------
.../db/query/executor/AggregateEngineExecutor.java | 336 -------------
.../db/query/executor/AggregationExecutor.java | 289 +++++++++++
...lEngineExecutor.java => FillQueryExecutor.java} | 57 ++-
.../{IEngineQueryRouter.java => IQueryRouter.java} | 6 +-
.../{EngineQueryRouter.java => QueryRouter.java} | 123 +++--
...gineExecutor.java => RawDataQueryExecutor.java} | 98 ++--
.../db/query/externalsort/ExternalSortJob.java | 2 +-
.../query/externalsort/ExternalSortJobEngine.java | 7 +-
.../db/query/externalsort/ExternalSortJobPart.java | 2 +-
.../iotdb/db/query/externalsort/LineMerger.java | 6 +-
.../MultiSourceExternalSortJobPart.java | 2 +-
.../externalsort/SimpleExternalSortEngine.java | 15 +-
.../SingleSourceExternalSortJobPart.java | 28 +-
.../adapter/ByTimestampReaderAdapter.java | 67 ++-
.../serialize/IExternalSortFileDeserializer.java | 6 +-
.../serialize/IExternalSortFileSerializer.java | 2 +-
.../FixLengthIExternalSortFileDeserializer.java | 6 +-
.../impl/FixLengthTimeValuePairSerializer.java | 2 +-
...greFuncFactory.java => AggreResultFactory.java} | 44 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 71 +--
.../org/apache/iotdb/db/query/fill/LinearFill.java | 51 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 39 +-
.../ChunkDataIterator.java} | 44 +-
.../{chunkRelated => chunk}/ChunkReaderWrap.java | 14 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 36 +-
.../DiskChunkReaderByTimestamp.java | 64 +--
.../db/query/reader/chunk/MemChunkLoader.java | 41 +-
.../{chunkRelated => chunk}/MemChunkReader.java | 58 +--
.../chunk/MemPageReader.java} | 31 +-
.../reader/chunkRelated/CachedDiskChunkReader.java | 88 ----
.../chunkRelated/MemChunkReaderByTimestamp.java | 78 ---
.../FileSeriesReaderByTimestampAdapter.java | 49 --
.../fileRelated/UnSealedTsFileIterateReader.java | 130 -----
.../UnSealedTsFileReaderByTimestamp.java | 96 ----
.../CachedUnseqResourceMergeReader.java | 11 +-
.../NewUnseqResourceMergeReader.java | 199 --------
.../OldUnseqResourceMergeReader.java | 140 ------
.../resourceRelated/ResourceRelatedUtil.java | 48 --
.../resourceRelated/SeqResourceIterateReader.java | 157 ------
.../SeqResourceReaderByTimestamp.java | 190 --------
.../UnseqResourceReaderByTimestamp.java | 101 ----
.../db/query/reader/series}/IAggregateReader.java | 36 +-
.../reader/{ => series}/IReaderByTimestamp.java | 9 +-
.../reader/{ => series}/ManagedSeriesReader.java | 8 +-
.../query/reader/series/SeriesAggregateReader.java | 102 ++++
.../reader/series/SeriesRawDataBatchReader.java | 132 +++++
.../reader/series/SeriesRawDataPointReader.java | 100 ++++
.../iotdb/db/query/reader/series/SeriesReader.java | 471 ++++++++++++++++++
.../reader/series/SeriesReaderByTimestamp.java | 93 ++++
.../seriesRelated/SeriesReaderByTimestamp.java | 57 ---
.../seriesRelated/SeriesReaderWithValueFilter.java | 115 -----
.../SeriesReaderWithoutValueFilter.java | 270 ----------
.../universal/CachedPriorityMergeReader.java | 8 +-
.../db/query/reader/universal/IterateReader.java | 90 ----
.../reader/universal/PriorityMergeReader.java | 48 +-
.../universal/PriorityMergeReaderByTimestamp.java | 75 ---
.../timegenerator/AbstractNodeConstructor.java | 75 ---
.../query/timegenerator/EngineNodeConstructor.java | 69 ---
.../query/timegenerator/EngineTimeGenerator.java | 67 ---
.../query/timegenerator/ServerTimeGenerator.java | 76 +++
.../java/org/apache/iotdb/db/service/IService.java | 2 +
.../org/apache/iotdb/db/service/JDBCService.java | 7 +-
.../org/apache/iotdb/db/service/JMXService.java | 10 +-
.../apache/iotdb/db/service/MetricsService.java | 6 +-
.../apache/iotdb/db/service/RegisterManager.java | 2 +-
.../org/apache/iotdb/db/service/StartupChecks.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 321 ++++++------
.../java/org/apache/iotdb/db/utils/FileUtils.java | 8 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 1 +
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 66 +--
.../iotdb/db/utils/datastructure/BinaryTVList.java | 26 +-
.../db/utils/datastructure/BooleanTVList.java | 27 +-
.../iotdb/db/utils/datastructure/DoubleTVList.java | 31 +-
.../iotdb/db/utils/datastructure/FloatTVList.java | 31 +-
.../iotdb/db/utils/datastructure/IntTVList.java | 27 +-
.../iotdb/db/utils/datastructure/LongTVList.java | 26 +-
.../iotdb/db/utils/datastructure/TVList.java | 122 ++++-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 6 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 80 +--
.../iotdb/db/engine/merge/MergeOverLapTest.java | 39 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 190 ++++----
.../engine/modification/DeletionFileNodeTest.java | 68 +--
.../db/engine/modification/DeletionQueryTest.java | 27 +-
.../storagegroup/StorageGroupProcessorTest.java | 44 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 96 ++--
.../engine/storagegroup/TsFileProcessorTest.java | 144 +++---
.../iotdb/db/integration/IOTDBGroupByIT.java | 43 +-
.../integration/IOTDBGroupByInnerIntervalIT.java | 26 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 170 +++++--
.../integration/IoTDBAggregationSmallDataIT.java | 129 +++--
...upbyDeviceIT.java => IoTDBAlignByDeviceIT.java} | 67 ++-
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 4 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 10 +-
.../apache/iotdb/db/integration/IoTDBFillIT.java | 2 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 3 +
.../iotdb/db/integration/IoTDBRecoverIT.java | 2 +
.../db/integration/IoTDBSequenceDataQueryIT.java | 23 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 53 +-
.../{QueryProcessorTest.java => PlannerTest.java} | 7 +-
.../iotdb/db/qp/bench/QueryParseBenchmark.java | 11 +-
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 9 +-
.../db/qp/other/TSPlanContextPropertyTest.java | 9 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 38 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 288 +++++------
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 206 --------
.../iotdb/db/qp/plan/TestConcatOptimizer.java | 103 ++--
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 196 --------
.../dataset/EngineDataSetWithValueFilterTest.java | 14 +-
.../query/executor/GroupByEngineDataSetTest.java | 27 +-
.../query/externalsort/ExternalSortEngineTest.java | 40 +-
.../db/query/externalsort/FakeChunkReaderWrap.java | 6 +-
...ExternalSortFileSerializerDeserializerTest.java | 6 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 2 +
.../fileRelated/UnSealedTsFileReaderTest.java | 112 -----
.../NewUnseqResourceMergeReaderTest.java | 109 -----
.../resourceRelated/SeqResourceReaderTest.java | 116 -----
.../resourceRelated/UnseqResourceReaderTest.java | 146 ------
.../reader/series/SeriesAggregateReaderTest.java | 116 +++++
.../reader/series/SeriesReaderByTimestampTest.java | 84 ++++
.../db/query/reader/series/SeriesReaderTest.java | 127 +++++
.../query/reader/series/SeriesReaderTestUtil.java | 177 +++++++
.../reader/seriesRelated/FakedIBatchPoint.java | 110 -----
.../reader/seriesRelated/FakedIPointReader.java | 79 ---
.../SeriesReaderWithValueFilterTest.java | 59 ---
.../SeriesReaderWithoutValueFilterTest.java | 74 ---
.../query/reader/universal/FakedSeriesReader.java | 10 +-
.../universal/FakedSeriesReaderByTimestamp.java | 79 ---
.../PriorityMergeReaderByTimestampTest.java | 172 -------
.../reader/universal/PriorityMergeReaderTest.java | 8 +-
.../reader/universal/PriorityMergeReaderTest2.java | 13 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 69 ++-
.../db/utils/datastructure/LongTVListTest.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 21 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 9 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 25 +-
server/src/test/resources/logback.xml | 13 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +
.../org/apache/iotdb/session/IoTDBSessionIT.java | 60 ++-
.../apache/iotdb/tsfile/common/cache/LRUCache.java | 8 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 11 +
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 5 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 8 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 412 ++++++++--------
.../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 4 +-
.../apache/iotdb/tsfile/read}/TimeValuePair.java | 2 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 11 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 52 +-
.../org/apache/iotdb/tsfile/read/common/Field.java | 40 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 3 +-
.../apache/iotdb/tsfile/read/common/RowRecord.java | 5 +
.../iotdb/tsfile/read/common/SignalBatchData.java | 5 +
.../common/{RowRecord.java => TimeColumn.java} | 67 ++-
...kLoaderImpl.java => CachedChunkLoaderImpl.java} | 16 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 8 +-
.../iotdb/tsfile/read/filter/GroupByFilter.java | 22 +-
.../tsfile/read/filter/basic/UnaryFilter.java | 4 +
.../query/dataset/DataSetWithTimeGenerator.java | 4 +-
.../tsfile/read/query/dataset/QueryDataSet.java | 34 --
.../query/executor/ExecutorWithTimeGenerator.java | 4 +-
.../read/query/timegenerator/TimeGenerator.java | 99 +++-
.../query/timegenerator/TimeGeneratorImpl.java | 130 -----
.../query/timegenerator/TsFileTimeGenerator.java | 51 ++
.../read/query/timegenerator/node/AndNode.java | 86 ++--
.../read/query/timegenerator/node/LeafNode.java | 54 +-
.../tsfile/read/query/timegenerator/node/Node.java | 5 +-
.../read/query/timegenerator/node/OrNode.java | 121 +++--
.../tsfile/read/reader/BatchDataIterator.java | 44 +-
.../iotdb/tsfile/read/reader/IChunkReader.java | 17 +-
.../{IDataReader.java => reader/IPageReader.java} | 13 +-
.../iotdb/tsfile/read}/reader/IPointReader.java | 12 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 87 ++--
.../read/reader/chunk/ChunkReaderByTimestamp.java | 4 +-
.../iotdb/tsfile/read/reader/page/PageReader.java | 42 +-
.../reader/series/AbstractFileSeriesReader.java | 37 +-
.../read/reader/series/EmptyFileSeriesReader.java | 5 -
.../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 13 -
.../apache/iotdb/tsfile/write/TsFileWriter.java | 23 +-
.../write/writer/ForceAppendTsFileWriter.java | 8 +-
.../write/writer/RestorableTsFileIOWriter.java | 5 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 9 +-
.../decoder/delta/DeltaBinaryEncoderLongTest.java | 18 +-
.../apache/iotdb/tsfile/read/ExpressionTest.java | 60 +++
.../org/apache/iotdb/tsfile/read/ReadTest.java | 18 +-
.../iotdb/tsfile/read/common/BatchDataTest.java | 82 ++++
.../tsfile/read/controller/ChunkLoaderTest.java | 2 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 6 +
.../read/query/executor/QueryExecutorTest.java | 4 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 38 +-
.../query/timegenerator/ReaderByTimestampTest.java | 4 +-
.../query/timegenerator/TimeGeneratorTest.java | 9 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 6 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 56 +--
.../iotdb/tsfile/utils/TsPrimitiveTypeTest.java | 60 +++
.../iotdb/tsfile/write/TsFileWriterTest.java | 26 +-
.../iotdb/tsfile/write/writer/PageWriterTest.java | 18 +-
315 files changed, 10368 insertions(+), 10471 deletions(-)