This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch jira_452
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 41afe11 [IOTDB-452] Do all aggregations of one series at one pass in
GroupBy
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 a1f4066 Merge remote-tracking branch 'upstream/new_series_reader'
into new_series_reader
add f20f9ce Solve conflicts
No new revisions were added by this update.
Summary of changes:
.../2-DML (Data Manipulation Language).md | 16 +-
.../resources/conf/iotdb-engine.properties | 7 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 11 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 10 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 33 ++--
.../apache/iotdb/db/engine/memtable/IMemTable.java | 9 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 9 +-
.../engine/storagegroup/StorageGroupProcessor.java | 10 +-
.../db/engine/storagegroup/TsFileProcessor.java | 13 +-
.../db/exception/ConfigAdjusterException.java | 3 +-
.../exception/DiskSpaceInsufficientException.java | 4 +-
.../apache/iotdb/db/exception/IoTDBException.java | 5 +-
.../apache/iotdb/db/exception/MergeException.java | 3 +-
.../exception/QueryInBatchStatementException.java | 4 +-
.../iotdb/db/exception/StartupException.java | 10 +-
.../iotdb/db/exception/StorageEngineException.java | 10 +-
.../db/exception/SyncConnectionException.java | 9 +-
.../SyncDeviceOwnerConflictException.java | 6 +-
.../iotdb/db/exception/SystemCheckException.java | 4 +-
.../db/exception/TsFileProcessorException.java | 6 +-
.../db/exception/metadata/MetadataException.java | 13 +-
.../metadata/TimeseriesAlreadyExistException.java | 4 +-
.../db/exception/path/MTreePathException.java | 1 -
.../exception/path/NotStorageGroupException.java | 4 +-
.../iotdb/db/exception/path/PathException.java | 14 +-
.../exception/query/LogicalOperatorException.java | 17 +-
.../exception/query/LogicalOptimizeException.java | 6 +-
.../db/exception/query/OutOfTTLException.java | 6 +-
...erException.java => QueryProcessException.java} | 16 +-
.../query/UnSupportedFillTypeException.java | 6 +-
.../storageGroup/StorageGroupException.java | 3 +-
.../StorageGroupProcessorException.java | 6 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 4 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 6 +-
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 22 +--
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 150 ++++++++--------
.../iotdb/db/qp/logical/crud/FilterOperator.java | 6 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 45 -----
.../iotdb/db/qp/strategy/LogicalGenerator.java | 11 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 24 ++-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 2 -
.../db/qp/strategy/optimizer/IFilterOptimizer.java | 6 +-
.../db/query/aggregation/AggregateResult.java | 4 +-
.../aggregation/impl/FirstValueAggrResult.java | 6 +-
.../db/query/dataset/DeviceIterateDataSet.java | 4 +-
.../db/query/dataset/NonAlignEngineDataSet.java | 17 +-
.../dataset/RawQueryDataSetWithoutValueFilter.java | 21 +--
.../groupby/GroupByWithoutValueFilterDataSet.java | 16 +-
.../db/query/executor/AggregationExecutor.java | 10 +-
...lEngineExecutor.java => FillQueryExecutor.java} | 32 +++-
.../iotdb/db/query/executor/IQueryRouter.java | 8 +-
.../iotdb/db/query/executor/QueryRouter.java | 10 +-
.../db/query/executor/RawDataQueryExecutor.java | 6 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 21 +--
.../org/apache/iotdb/db/query/fill/LinearFill.java | 18 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 15 +-
...egateReader.java => SeriesAggregateReader.java} | 4 +-
...chReader.java => SeriesRawDataBatchReader.java} | 14 +-
...ntReader.java => SeriesRawDataPointReader.java} | 9 +-
.../query/reader/seriesRelated/SeriesReader.java | 40 ++---
.../db/query/timegenerator/EngineLeafNode.java | 1 -
.../query/timegenerator/EngineNodeConstructor.java | 10 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 38 ++--
.../iotdb/db/utils/datastructure/TVList.java | 3 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 8 +-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 6 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 9 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 4 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 16 +-
.../engine/modification/DeletionFileNodeTest.java | 10 +-
.../db/engine/modification/DeletionQueryTest.java | 12 +-
.../storagegroup/FileNodeManagerBenchmark.java | 4 +-
.../storagegroup/StorageGroupProcessorTest.java | 12 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 22 +--
.../engine/storagegroup/TsFileProcessorTest.java | 10 +-
.../integration/IoTDBAggregationSmallDataIT.java | 2 +-
.../apache/iotdb/db/integration/IoTDBFillIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 11 +-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 4 +-
.../iotdb/db/qp/bench/QueryParseBenchmark.java | 4 +-
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 4 +-
.../db/qp/other/TSPlanContextPropertyTest.java | 4 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 4 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 98 +++++-----
.../iotdb/db/qp/plan/TestConcatOptimizer.java | 8 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 6 +-
.../reader/seriesRelated/FakedIBatchPoint.java | 110 ------------
.../reader/seriesRelated/FakedIPointReader.java | 79 --------
.../reader/seriesRelated/SeriesReaderTest.java} | 199 ++++++++++++++-------
.../iotdb/db/writelog/recover/LogReplayerTest.java | 3 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 1 -
.../apache/iotdb/tsfile/read/common/RowRecord.java | 2 -
.../apache/iotdb/tsfile/write/TsFileWriter.java | 23 ++-
95 files changed, 711 insertions(+), 843 deletions(-)
rename
server/src/main/java/org/apache/iotdb/db/exception/query/{PlannerException.java
=> QueryProcessException.java} (70%)
rename
server/src/main/java/org/apache/iotdb/db/query/executor/{FillEngineExecutor.java
=> FillQueryExecutor.java} (70%)
rename
server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/{AggregateReader.java
=> SeriesAggregateReader.java} (95%)
rename
server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/{RawDataBatchReader.java
=> SeriesRawDataBatchReader.java} (90%)
rename
server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/{RawDataPointReader.java
=> SeriesRawDataPointReader.java} (93%)
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
copy server/src/test/java/org/apache/iotdb/db/{engine/merge/MergeTest.java =>
query/reader/seriesRelated/SeriesReaderTest.java} (51%)
