This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from ba7e1fb fix missing notify when a TsFile is closed during flush
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 8253181 add expression in group by align by device (#1853)
add 4a1dc2d [IOTDB-886]fix float loss precision (#1796)
add ac0af88 Remove duplicate declaration of plugin
org.apache.maven.plugins:maven-assembly-plugin in tsfile model (#1852)
add 7ee2a8b Merge branch 'master' into cluster_premerge
add ab78554 Merge branch 'cluster_premerge' into cluster_new
add 4934084 remove EnvironmentUtils in cross test
add 54c9c5f Merge branch 'cluster_premerge' into cluster_new
add 29e4ad3 fix tests
add 55ebf81 fix query offset and hardlink
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 +-
.../cluster/client/sync/SyncClientAdaptor.java | 109 +---
.../apache/iotdb/cluster/metadata/CMManager.java | 117 +++-
.../cluster/query/ClusterConcatPathOptimizer.java | 6 +-
.../apache/iotdb/cluster/query/ClusterPlanner.java | 12 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 26 +-
.../query/aggregate/ClusterAggregateExecutor.java | 17 +-
.../cluster/query/manage/ClusterQueryManager.java | 6 +-
.../cluster/query/reader/ClusterReaderFactory.java | 4 +-
.../iotdb/cluster/query/reader/EmptyReader.java | 10 +
.../iotdb/cluster/server/DataClusterServer.java | 11 +-
.../server/handlers/caller/GenericHandler.java | 15 +
.../cluster/server/service/DataAsyncService.java | 7 +-
.../cluster/server/service/DataSyncService.java | 5 +-
.../cluster/client/sync/SyncClientAdaptorTest.java | 12 +-
.../iotdb/cluster/common/EnvironmentUtils.java | 2 +-
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 3 +-
.../iotdb/cluster/common/TestAsyncDataClient.java | 8 +-
.../cluster/log/applier/DataLogApplierTest.java | 8 +-
.../cluster/log/manage/RaftLogManagerTest.java | 1 +
.../cluster/log/snapshot/DataSnapshotTest.java | 16 +
.../query/ClusterAggregateExecutorTest.java | 6 +-
.../query/ClusterDataQueryExecutorTest.java | 4 +-
.../cluster/query/ClusterFillExecutorTest.java | 6 +-
.../query/ClusterPhysicalGeneratorTest.java | 3 +-
.../cluster/query/ClusterPlanExecutorTest.java | 3 +-
.../cluster/query/ClusterQueryRouterTest.java | 16 +-
.../ClusterGroupByNoVFilterDataSetTest.java | 2 +-
.../groupby/ClusterGroupByVFilterDataSetTest.java | 2 +-
.../query/groupby/MergeGroupByExecutorTest.java | 8 +-
.../query/groupby/RemoteGroupByExecutorTest.java | 4 +-
.../query/manage/ClusterQueryManagerTest.java | 17 +-
.../query/reader/ClusterTimeGeneratorTest.java | 3 +-
.../cluster/server/member/DataGroupMemberTest.java | 26 +-
.../cluster/server/member/MetaGroupMemberTest.java | 4 +-
.../iotdb/cross/tests/utils/EnvironmentUtils.java | 280 ----------
.../resources/conf/iotdb-engine.properties | 14 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 38 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 42 +-
.../engine/storagegroup/StorageGroupProcessor.java | 1 +
...ception.java => PathNumOverLimitException.java} | 27 +-
.../org/apache/iotdb/db/metadata/MManager.java | 15 +-
.../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 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 1 +
.../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 | 28 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 50 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 9 +
.../iotdb/db/integration/IOTDBGroupByIT.java | 195 ++++++-
.../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/IoTDBAlignByDeviceIT.java | 42 ++
.../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 | 7 +-
.../iotdb/db/utils/TypeInferenceUtilsTest.java | 4 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 14 +-
thrift/src/main/thrift/cluster.thrift | 9 +-
tsfile/pom.xml | 20 -
.../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 +-
109 files changed, 2347 insertions(+), 1756 deletions(-)
delete mode 100644
cross-tests/src/test/java/org/apache/iotdb/cross/tests/utils/EnvironmentUtils.java
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
