You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2021/03/22 07:26:27 UTC

[iotdb] branch support_redirect_query updated (f5bbf85 -> 33798b6)

This is an automated email from the ASF dual-hosted git repository.

chaow pushed a change to branch support_redirect_query
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from f5bbf85  fix code smell
     add bb8a382  implement redirect with only partitionTable
     add a8b01f1  [IOTDB-1234] fix ImportCsv tool cannot parse empty string (#2857)
     add c9026e2  Optimize cluster query (#2859)
     add 32eaa9e  simplify the Avg formula on removing redundant operations (#2868)
     add 6ffd095  [IOTDB-1274] fix the insert blocked caused the bugs in mem control module
     add 9744a76  merge master
     add 33798b6  apply spotless

No new revisions were added by this update.

Summary of changes:
 .../cluster/query/ClusterDataQueryExecutor.java    | 167 ++++++++++++++------
 .../iotdb/cluster/query/LocalQueryExecutor.java    |  15 +-
 .../query/aggregate/ClusterAggregateExecutor.java  |   2 +-
 .../groupby/ClusterGroupByVFilterDataSet.java      |   2 +-
 .../cluster/query/reader/ClusterReaderFactory.java |  14 --
 .../cluster/query/reader/ClusterTimeGenerator.java | 114 +++++++++++++-
 .../iotdb/cluster/query/reader/EmptyReader.java    |   3 +-
 .../cluster/query/reader/ManagedMergeReader.java   |  13 --
 .../cluster/query/reader/MergedReaderByTime.java   |   8 +-
 .../reader/RemoteSeriesReaderByTimestamp.java      |  40 +++--
 .../iotdb/cluster/server/DataClusterServer.java    |  13 +-
 .../cluster/server/service/DataAsyncService.java   |  10 +-
 .../cluster/server/service/DataSyncService.java    |   5 +-
 .../iotdb/cluster/common/TestAsyncDataClient.java  |   9 +-
 .../cluster/common/TestManagedSeriesReader.java    |  23 +--
 .../query/ClusterDataQueryExecutorTest.java        |   6 +-
 .../query/manage/ClusterQueryManagerTest.java      |   2 +-
 .../query/reader/ClusterTimeGeneratorTest.java     |   2 +-
 .../reader/RemoteSeriesReaderByTimestampTest.java  |  68 +++++---
 .../cluster/server/member/DataGroupMemberTest.java |  30 ++--
 .../cluster/server/member/MetaGroupMemberTest.java |   8 +-
 .../db/query/aggregation/AggregateResult.java      |   4 +
 .../db/query/aggregation/impl/AvgAggrResult.java   |  25 +--
 .../db/query/aggregation/impl/CountAggrResult.java |  18 ++-
 .../aggregation/impl/FirstValueAggrResult.java     |  26 +++-
 .../aggregation/impl/FirstValueDescAggrResult.java |  20 ++-
 .../aggregation/impl/LastValueAggrResult.java      |  26 ++--
 .../aggregation/impl/LastValueDescAggrResult.java  |  37 +++--
 .../query/aggregation/impl/MaxTimeAggrResult.java  |  20 ++-
 .../aggregation/impl/MaxTimeDescAggrResult.java    |  31 +++-
 .../query/aggregation/impl/MaxValueAggrResult.java |  18 ++-
 .../query/aggregation/impl/MinTimeAggrResult.java  |  24 ++-
 .../aggregation/impl/MinTimeDescAggrResult.java    |  17 +-
 .../query/aggregation/impl/MinValueAggrResult.java |  18 ++-
 .../db/query/aggregation/impl/SumAggrResult.java   |  15 +-
 .../dataset/RawQueryDataSetWithValueFilter.java    | 172 ++++++++++++++-------
 .../db/query/executor/AggregationExecutor.java     |  87 +++++++----
 .../db/query/executor/RawDataQueryExecutor.java    |  25 +--
 .../adapter/ByTimestampReaderAdapter.java          |  48 +++---
 .../reader/chunk/DiskChunkReaderByTimestamp.java   |  55 +++----
 .../db/query/reader/series/IReaderByTimestamp.java |   2 +-
 .../reader/series/SeriesReaderByTimestamp.java     |  17 +-
 .../org/apache/iotdb/db/rescon/SystemInfo.java     |  56 +++----
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  26 +++-
 .../integration/IOTDBGroupByInnerIntervalIT.java   | 135 ++++++++--------
 .../aggregation/IoTDBAggregationIT.java            | 137 +++++++---------
 .../reader/series/SeriesReaderByTimestampTest.java |  12 +-
 .../java/org/apache/iotdb/session/Session.java     |  23 ++-
 thrift/src/main/thrift/cluster.thrift              |   4 +-
 .../query/dataset/DataSetWithTimeGenerator.java    |   2 +-
 .../tsfile/read/query/dataset/QueryDataSet.java    |  12 ++
 .../read/query/timegenerator/TimeGenerator.java    |  52 +++++--
 .../read/query/timegenerator/node/AndNode.java     |  18 +--
 .../read/query/timegenerator/node/OrNode.java      |  42 ++---
 .../tsfile/read/reader/FakedTimeGenerator.java     |  15 +-
 55 files changed, 1155 insertions(+), 638 deletions(-)