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/incubator-iotdb.git.
from c197a80 Merge pull request #1631 from wyh-ztf/cluster_w
add 5ce2c12 support merge and flush
add 45cfa41 improve async applier
add 37cca06 Merge branch 'cluster_new' of
https://github.com/apache/incubator-iotdb into cluster_new
No new revisions were added by this update.
Summary of changes:
.../resources/conf/iotdb-cluster.properties | 2 +-
cluster/src/assembly/resources/conf/logback.xml | 5 +--
.../apache/iotdb/cluster/config/ClusterConfig.java | 2 +-
.../cluster/log/applier/AsyncDataLogApplier.java | 30 ++++++++++------
.../iotdb/cluster/log/applier/BaseApplier.java | 2 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 2 ++
.../apache/iotdb/cluster/utils/PartitionUtils.java | 6 +++-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 42 ++++++++++------------
8 files changed, 49 insertions(+), 42 deletions(-)
