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 91daeab4495e1860646628f3421b2d14813744e3 Merge: 713f6fa 40ae1e9 Author: qiaojialin <[email protected]> AuthorDate: Sat Mar 14 09:52:21 2020 +0800 Merge remote-tracking branch 'origin/master' .../org/apache/iotdb/db/engine/StorageEngine.java | 24 ++- .../iotdb/db/engine/cache/TsFileMetaDataCache.java | 9 +- .../engine/storagegroup/StorageGroupProcessor.java | 51 ++--- .../org/apache/iotdb/db/metadata/MManager.java | 2 +- .../iotdb/db/qp/physical/crud/AggregationPlan.java | 4 + .../iotdb/db/qp/strategy/PhysicalGenerator.java | 1 - .../qp/strategy/optimizer/ConcatPathOptimizer.java | 2 +- .../db/query/aggregation/AggregateResult.java | 100 +++++----- .../db/query/aggregation/impl/AvgAggrResult.java | 9 + .../aggregation/impl/FirstValueAggrResult.java | 6 + .../aggregation/impl/LastValueAggrResult.java | 6 + .../dataset/RawQueryDataSetWithoutValueFilter.java | 45 +++-- .../dataset/groupby/GroupByEngineDataSet.java | 13 +- .../dataset/groupby/GroupByExecutor.java} | 32 +-- .../groupby/GroupByWithValueFilterDataSet.java | 26 ++- .../groupby/GroupByWithoutValueFilterDataSet.java | 216 ++++----------------- .../dataset/groupby/LocalGroupByExecutor.java | 203 +++++++++++++++++++ .../db/query/executor/AggregationExecutor.java | 16 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 11 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 2 +- .../iotdb/db/query/executor/QueryRouter.java | 23 ++- .../db/query/executor/RawDataQueryExecutor.java | 10 +- .../java/org/apache/iotdb/db/query/fill/IFill.java | 8 + .../iotdb/db/query/reader/series/SeriesReader.java | 4 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 50 +++-- .../org/apache/iotdb/db/utils/FilePathUtils.java | 6 + .../iotdb/db/qp/plan/ConcatOptimizerTest.java | 22 +++ .../tsfile/read/common/ExceptionBatchData.java | 27 ++- .../tsfile/read/query/dataset/QueryDataSet.java | 3 + .../read/query/timegenerator/TimeGenerator.java | 7 +- .../read/query/timegenerator/node/LeafNode.java | 38 ++-- .../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +- .../apache/iotdb/tsfile/write/ReadWriteTest.java | 180 +++++++++++++++++ .../tsfile/write/TimeGeneratorReadEmptyTest.java | 141 ++++++++++++++ .../tsfile/write/TimeGeneratorReadWriteTest.java | 182 +++++++++++++++++ 35 files changed, 1097 insertions(+), 384 deletions(-)
