This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch mem_control
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 2dae547 fix engine properties
add 0964b95 [IOTDB-902] Optimize max_time aggregation and fix order by
time desc aggregation bug (#1751)
add 2600bf8 [IOTDB-749] Handle select * from root OOM (#1367)
add bcd8990 [IOTDB-931] update start-cli bash (#1847)
add 97f7365 merge master
No new revisions were added by this update.
Summary of changes:
cli/pom.xml | 13 +
cli/src/assembly/resources/sbin/start-cli.bat | 8 +-
cli/src/assembly/resources/sbin/start-cli.sh | 8 +-
.../java/org/apache/iotdb/cli/AbstractCli.java | 14 +-
.../org/apache/iotdb/cli/StartClientScriptIT.java | 26 +-
.../resources/conf/iotdb-engine.properties | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 23 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 35 +-
...ception.java => PathNumOverLimitException.java} | 23 +-
.../org/apache/iotdb/db/metadata/MManager.java | 14 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 27 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 33 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 53 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 50 +-
.../qp/strategy/optimizer/ILogicalOptimizer.java | 4 +-
.../db/query/aggregation/AggregateResult.java | 38 +-
.../db/query/aggregation/impl/AvgAggrResult.java | 6 +-
.../db/query/aggregation/impl/CountAggrResult.java | 2 +-
.../aggregation/impl/FirstValueAggrResult.java | 19 +-
...grResult.java => FirstValueDescAggrResult.java} | 66 +--
.../aggregation/impl/LastValueAggrResult.java | 12 +-
...ggrResult.java => LastValueDescAggrResult.java} | 70 +--
.../query/aggregation/impl/MaxTimeAggrResult.java | 25 +-
...eAggrResult.java => MaxTimeDescAggrResult.java} | 75 +--
.../query/aggregation/impl/MaxValueAggrResult.java | 9 +-
.../query/aggregation/impl/MinTimeAggrResult.java | 23 +-
...tAggrResult.java => MinTimeDescAggrResult.java} | 63 +--
.../query/aggregation/impl/MinValueAggrResult.java | 6 +-
.../db/query/aggregation/impl/SumAggrResult.java | 2 +-
.../db/query/control/QueryResourceManager.java | 49 +-
.../query/dataset/groupby/GroupByFillDataSet.java | 86 ++-
.../groupby/GroupByWithValueFilterDataSet.java | 13 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 2 +-
.../dataset/groupby/LocalGroupByExecutor.java | 19 +-
.../db/query/executor/AggregationExecutor.java | 88 +--
.../db/query/executor/RawDataQueryExecutor.java | 11 +-
.../iotdb/db/query/executor/fill/LinearFill.java | 5 +-
.../db/query/factory/AggregateResultFactory.java | 54 +-
.../reader/series/DescSeriesReaderByTimestamp.java | 53 --
.../db/query/reader/series/IAggregateReader.java | 1 +
.../query/reader/series/SeriesAggregateReader.java | 4 +
.../iotdb/db/query/reader/series/SeriesReader.java | 5 +-
.../reader/series/SeriesReaderByTimestamp.java | 25 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 62 ++-
.../iotdb/db/integration/IOTDBGroupByIT.java | 194 ++++++-
.../integration/IOTDBGroupByInnerIntervalIT.java | 262 +++++----
.../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 11 +-
.../IoTDBAggregationAlignByDeviceIT.java | 113 ----
.../iotdb/db/integration/IoTDBAggregationIT.java | 156 +++++-
.../integration/IoTDBAggregationLargeDataIT.java | 398 ++++++++++----
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 10 +-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 596 +++++++++++++--------
.../integration/IoTDBGroupByFillWithRangeIT.java | 21 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 30 ++
.../db/integration/IoTDBSequenceDataQueryIT.java | 9 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 11 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 6 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 2 +-
.../db/query/aggregation/AggregateResultTest.java | 94 ++--
.../reader/series/SeriesAggregateReaderTest.java | 2 +-
.../reader/series/SeriesReaderByTimestampTest.java | 8 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 15 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 14 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 16 -
.../iotdb/tsfile/read/common/DescBatchData.java | 13 +-
.../iotdb/tsfile/read/filter/GroupByFilter.java | 6 +-
.../tsfile/read/filter/GroupByFilterTest.java | 2 +-
67 files changed, 1961 insertions(+), 1262 deletions(-)
copy
server/src/main/java/org/apache/iotdb/db/exception/query/{QueryProcessException.java
=> PathNumOverLimitException.java} (50%)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{CountAggrResult.java
=> FirstValueDescAggrResult.java} (53%)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{LastValueAggrResult.java
=> LastValueDescAggrResult.java} (60%)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{MaxTimeAggrResult.java
=> MaxTimeDescAggrResult.java} (53%)
copy
server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{CountAggrResult.java
=> MinTimeDescAggrResult.java} (51%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/reader/series/DescSeriesReaderByTimestamp.java
delete mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationAlignByDeviceIT.java
