You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/04/19 03:32:55 UTC
[incubator-iotdb] branch cluster_read updated (b332bbf -> 7f7de28)
This is an automated email from the ASF dual-hosted git repository.
lta pushed a change to branch cluster_read
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from b332bbf Merge branch 'cluster' into cluster_read
new d925e45 fix bug of qp executor test and add prune expression tree
new 1052863 add query node process for query with value
new 7f7de28 complete clsuer query with value filter
The 1775 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/iotdb/cluster/entity/Server.java | 2 +
.../org/apache/iotdb/cluster/query/PathType.java | 3 +
.../dataset/ClusterDataSetWithTimeGenerator.java | 78 +++++----
.../executor/ClusterExecutorWithTimeGenerator.java | 36 ++--
.../ClusterExecutorWithoutTimeGenerator.java | 23 ++-
.../cluster/query/executor/ClusterQueryRouter.java | 10 +-
.../cluster/query/expression/TrueExpression.java | 22 +--
.../query/factory/ClusterSeriesReaderFactory.java | 61 ++++---
.../coordinatornode/ClusterRpcQueryManager.java | 38 ++---
.../ClusterRpcSingleQueryManager.java | 188 +++++++++++++--------
.../coordinatornode/IClusterRpcQueryManager.java | 64 +++++++
.../IClusterRpcSingleQueryManager.java | 35 +++-
.../querynode/ClusterLocalQueryManager.java | 29 ++--
.../querynode/ClusterLocalSingleQueryManager.java | 170 +++++++++++++------
.../querynode/IClusterLocalQueryManager.java | 67 ++++++++
.../querynode/IClusterLocalSingleQueryManager.java | 63 +++++++
.../AbstractClusterPointReader.java | 73 ++++++++
.../ClusterFilterSeriesReader.java} | 100 +++--------
.../ClusterSelectSeriesReader.java} | 83 ++++-----
.../querynode/ClusterBatchReaderByTimestamp.java | 78 +++++++++
.../ClusterBatchReaderWithoutTimeGenerator.java | 80 +++++++++
.../querynode/ClusterFilterSeriesBatchReader.java | 93 ++++++++++
.../reader/querynode/IClusterBatchReader.java | 21 ++-
.../querynode/IClusterFilterSeriesBatchReader.java | 16 +-
.../timegenerator/ClusterNodeConstructor.java | 10 +-
.../utils}/ClusterRpcReaderUtils.java | 15 +-
.../iotdb/cluster/query/utils/ExpressionUtils.java | 127 ++++++++++++++
.../utils}/QueryPlanPartitionUtils.java | 54 ++++--
.../QuerySeriesDataByTimestampSyncProcessor.java | 42 +++++
.../QuerySeriesDataByTimestampRequest.java | 74 ++++++++
.../request/querydata/QuerySeriesDataRequest.java | 4 +
.../rpc/raft/response/BasicQueryDataResponse.java | 26 +--
.../QuerySeriesDataByTimestampResponse.java | 14 +-
.../querydata/QuerySeriesDataResponse.java | 17 +-
.../cluster/service/TSServiceClusterImpl.java | 16 ++
.../iotdb/cluster/qp/AbstractQPExecutorTest.java | 33 ++--
.../dataset/EngineDataSetWithTimeGenerator.java | 35 +---
.../tsfile/read/expression/ExpressionType.java | 2 +-
.../iotdb/tsfile/read/expression/IExpression.java | 2 +
.../read/expression/impl/BinaryExpression.java | 13 ++
.../read/expression/impl/GlobalTimeExpression.java | 6 +
.../expression/impl/SingleSeriesExpression.java | 6 +
.../tsfile/read/filter/basic/BinaryFilter.java | 3 +
.../iotdb/tsfile/read/filter/basic/Filter.java | 2 +
.../tsfile/read/filter/basic/UnaryFilter.java | 3 +
.../tsfile/read/filter/operator/AndFilter.java | 5 +
.../iotdb/tsfile/read/filter/operator/Eq.java | 6 +
.../iotdb/tsfile/read/filter/operator/Gt.java | 6 +
.../iotdb/tsfile/read/filter/operator/GtEq.java | 6 +
.../iotdb/tsfile/read/filter/operator/Lt.java | 6 +
.../iotdb/tsfile/read/filter/operator/LtEq.java | 6 +
.../iotdb/tsfile/read/filter/operator/NotEq.java | 6 +
.../tsfile/read/filter/operator/NotFilter.java | 5 +
.../tsfile/read/filter/operator/OrFilter.java | 5 +
.../query/dataset/DataSetWithTimeGenerator.java | 32 ----
.../tsfile/read/query/dataset/QueryDataSet.java | 36 ++++
56 files changed, 1507 insertions(+), 549 deletions(-)
copy iotdb/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java => cluster/src/main/java/org/apache/iotdb/cluster/query/expression/TrueExpression.java (65%)
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/manager/coordinatornode/IClusterRpcQueryManager.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/IClusterLocalQueryManager.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/manager/querynode/IClusterLocalSingleQueryManager.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/coordinatornode/AbstractClusterPointReader.java
copy cluster/src/main/java/org/apache/iotdb/cluster/query/reader/{ClusterSeriesReader.java => coordinatornode/ClusterFilterSeriesReader.java} (50%)
rename cluster/src/main/java/org/apache/iotdb/cluster/query/reader/{ClusterSeriesReader.java => coordinatornode/ClusterSelectSeriesReader.java} (66%)
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterBatchReaderByTimestamp.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterBatchReaderWithoutTimeGenerator.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/ClusterFilterSeriesBatchReader.java
copy iotdb/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java => cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/IClusterBatchReader.java (63%)
copy iotdb/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java => cluster/src/main/java/org/apache/iotdb/cluster/query/reader/querynode/IClusterFilterSeriesBatchReader.java (74%)
rename cluster/src/main/java/org/apache/iotdb/cluster/{utils/query => query/utils}/ClusterRpcReaderUtils.java (86%)
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/utils/ExpressionUtils.java
rename cluster/src/main/java/org/apache/iotdb/cluster/{utils/query => query/utils}/QueryPlanPartitionUtils.java (63%)
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/querydata/QuerySeriesDataByTimestampSyncProcessor.java
create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/querydata/QuerySeriesDataByTimestampRequest.java
copy iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java => cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/BasicQueryDataResponse.java (59%)
copy iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/MergeSeriesDataSource.java => cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/querydata/QuerySeriesDataByTimestampResponse.java (67%)