This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 055bbcb Test
add 1c8b37d fix some code smell
add 5c2d3d5 Merge remote-tracking branch 'origin/new_series_reader' into
new_series_reader
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +-
.../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 | 6 -
.../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 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 7 +-
.../db/query/executor/AggregationExecutor.java | 6 +-
.../db/query/executor/FillEngineExecutor.java | 4 +-
.../iotdb/db/query/executor/IQueryRouter.java | 8 +-
.../iotdb/db/query/executor/QueryRouter.java | 6 +-
.../db/query/timegenerator/EngineLeafNode.java | 1 -
.../query/timegenerator/EngineNodeConstructor.java | 6 -
.../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 +-
.../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 | 18 +--
.../engine/storagegroup/TsFileProcessorTest.java | 10 +-
.../integration/IoTDBAggregationSmallDataIT.java | 2 +-
.../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 | 84 ++++++------
.../iotdb/db/qp/plan/TestConcatOptimizer.java | 8 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 6 +-
.../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 -
74 files changed, 381 insertions(+), 450 deletions(-)
rename
server/src/main/java/org/apache/iotdb/db/exception/query/{PlannerException.java
=> QueryProcessException.java} (70%)