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/05/23 07:46:50 UTC

[incubator-iotdb] branch cluster_framework updated (c37f9e8 -> 6b81794)

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

lta pushed a change to branch cluster_framework
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    omit c37f9e8  modify it
    omit f691bc2  modify node as client manager
    omit e9b6efa  reformat codes
    omit 567f733  add node as client thread manager
    omit 08f4e55  replace set error msg with add error msg
    omit c7e9083  modify VirtualNode and remove groupIdMapNodeCache in Router
    omit 47b581c  format codes
    omit cde6fac  add cluster framework and nonquery module and query metadata module
     add 167a30e  add fill feature
     add fe9937a  add aggre feature without timegenerator
     add aa3aa0d  fix a serve bug of filter serializable
     add 4abde09  add aggregation query it
     add 3020603  Increase the function of query polling
     add 3ee37c3  fix some error bugs: add select series group entity, add query for all nodes features
     add 9487dbf  add it test of aggregation function
     add a4ec93c  update Query of NodeTool
     add 2a02dbe  implement Status of NodeTool
     add 618cc39  improve robustness of query metadata
     add d079f5e  Merge branch 'cluster' into cluster_fill_aggre_groupby
     add 6a733d9  fix a serve bug of set readmetadata level
     add 20c93d1  fix a serve bug
     add 3577857  fix a bug
     add ba0d647  remove system.out
     add 45fece1  remove syso
     add 2bb0a04  add group by features
     add 78f7800  fix a serve bug, concurrent hashmap modification
     add d10c2f1  remove useless code
     add ce845f2  make nodetool get accurate leader of data group
     add 99ffb6b  Merge remote-tracking branch 'origin/cluster' into cluster
     add 0d4a985  Merge branch 'cluster' of github.com:apache/incubator-iotdb into cluster
     add 626f2a3  add group by it and add ClusterNullableBatach data to handle null timevalue pair
     add 39c8865  fix non-query bug: fail to execute when leader down
     add 2a30289  Merge branch 'cluster' of github.com:apache/incubator-iotdb into cluster
     add 61e8452  remove useless code
     add 7ca00da  fix  some bug
     add 2ac9056  format codes
     add 411ea77  remove groupIdMapNodeCache
     add 41a49ad  add cluster_framework
     add 51f91b6  fix lots of conflicts with cluster_framework
     add 6b81794  fix some issues according to review

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c37f9e8)
            \
             N -- N -- N   refs/heads/cluster_framework (6b81794)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../concurrent/pool/QueryTimerThreadManager.java   |  74 --------
 .../cluster/concurrent/pool/ThreadPoolManager.java |  11 +-
 .../apache/iotdb/cluster/config/ClusterConfig.java |   6 +-
 .../org/apache/iotdb/cluster/entity/Server.java    |  25 +--
 .../cluster/qp/executor/AbstractQPExecutor.java    |   8 +-
 .../qp/executor/ClusterQueryProcessExecutor.java   |  24 ++-
 .../cluster/qp/executor/NonQueryExecutor.java      |  43 ++++-
 .../cluster/qp/executor/QueryMetadataExecutor.java | 206 ++++++++++++++++++---
 .../apache/iotdb/cluster/qp/task/BatchQPTask.java  |   3 +-
 .../iotdb/cluster/qp/task/DataQueryTask.java       |  30 +--
 .../iotdb/cluster/rpc/raft/NodeAsClient.java       |   8 -
 .../rpc/raft/impl/RaftNodeAsClientManager.java     |   6 +-
 .../raft/processor/QueryMetricAsyncProcessor.java  |  44 -----
 .../nonquery/DataGroupNonQueryAsyncProcessor.java  |   3 +-
 .../nonquery/MetaGroupNonQueryAsyncProcessor.java  |   2 +-
 .../rpc/raft/request/QueryMetricRequest.java       |  35 ----
 .../rpc/raft/response/BasicQueryDataResponse.java  |  43 -----
 .../rpc/raft/response/QueryMetricResponse.java     |  46 -----
 .../cluster/service/TSServiceClusterImpl.java      |  24 ++-
 .../iotdb/cluster/utils/QPExecutorUtils.java       |   2 +-
 .../org/apache/iotdb/cluster/utils/RaftUtils.java  | 206 +++++++--------------
 ...readManagerTest.java => QPTaskManagerTest.java} |  16 +-
 .../iotdb/cluster}/integration/Constant.java       |   2 +-
 .../integration/IoTDBMetadataFetchAbstract.java    |   3 +-
 .../apache/iotdb/cluster/utils/RaftUtilsTest.java  |  22 +--
 .../java/org/apache/iotdb/cluster/utils/Utils.java |   4 +
 .../iotdb/cluster/utils/hash/MD5HashTest.java      |   1 +
 .../UserGuideV0.7.0/7-Tools-NodeTool.md            |  58 +++++-
 iotdb/iotdb/conf/iotdb-cluster.properties          |   6 +-
 .../io/LocalTextModificationAccessor.java          |   1 +
 .../db/qp/executor/IQueryProcessExecutor.java      |   3 +-
 .../iotdb/db/qp/executor/QueryProcessExecutor.java |   5 +-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |   1 +
 .../db/query/aggregation/impl/MeanAggrFunc.java    |   2 +-
 .../groupby/GroupByWithOnlyTimeFilterDataSet.java  |   7 +-
 .../groupby/GroupByWithValueFilterDataSet.java     |  20 +-
 ...neQueryRouter.java => AbstractQueryRouter.java} |  52 +++++-
 .../db/query/executor/AggregateEngineExecutor.java |  85 ++++++---
 .../iotdb/db/query/executor/EngineQueryRouter.java |  47 +----
 .../db/query/executor/FillEngineExecutor.java      |  11 +-
 .../db/query/executor/IFillEngineExecutor.java     |  16 +-
 .../java/org/apache/iotdb/db/query/fill/IFill.java |  14 +-
 .../org/apache/iotdb/db/query/fill/LinearFill.java |   4 +-
 .../apache/iotdb/db/query/fill/PreviousFill.java   |   6 +-
 .../timegenerator/AbstractNodeConstructor.java     |   3 -
 .../integration/IoTDBAggregationLargeDataIT.java   |   2 -
 .../apache/iotdb/tsfile/read/common/BatchData.java |   4 +-
 47 files changed, 599 insertions(+), 645 deletions(-)
 delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/concurrent/pool/QueryTimerThreadManager.java
 delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/QueryMetricAsyncProcessor.java
 delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryMetricRequest.java
 delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/BasicQueryDataResponse.java
 delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryMetricResponse.java
 copy cluster/src/test/java/org/apache/iotdb/cluster/concurrent/pool/{QPTaskThreadManagerTest.java => QPTaskManagerTest.java} (80%)
 copy {iotdb/src/test/java/org/apache/iotdb/db => cluster/src/test/java/org/apache/iotdb/cluster}/integration/Constant.java (98%)
 copy iotdb/src/main/java/org/apache/iotdb/db/query/executor/{IEngineQueryRouter.java => AbstractQueryRouter.java} (59%)
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java => iotdb/src/main/java/org/apache/iotdb/db/query/executor/IFillEngineExecutor.java (67%)