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 290bc6a  Merge branch 'master' into cluster_new
     add 2a811dd  fix pull schema out of order

No new revisions were added by this update.

Summary of changes:
 .../cluster/client/sync/SyncClientAdaptor.java     |  16 ++-
 .../iotdb/cluster/log/applier/BaseApplier.java     |   9 +-
 .../apache/iotdb/cluster/metadata/CMManager.java   |   4 +-
 .../apache/iotdb/cluster/metadata/MetaPuller.java  |  16 +--
 .../iotdb/cluster/partition/PartitionTable.java    |   1 +
 .../iotdb/cluster/query/ClusterPlanExecutor.java   |   8 +-
 .../iotdb/cluster/server/DataClusterServer.java    |  13 +++
 ...dler.java => PullMeasurementSchemaHandler.java} |   6 +-
 .../caller/PullTimeseriesSchemaHandler.java        |  10 +-
 .../cluster/server/member/DataGroupMember.java     |  49 +++++++-
 .../cluster/server/member/MetaGroupMember.java     | 126 +++++++--------------
 .../cluster/server/service/DataAsyncService.java   |  25 ++++
 .../cluster/server/service/DataSyncService.java    |  21 ++++
 .../iotdb/cluster/common/TestAsyncDataClient.java  |  14 +++
 .../cluster/log/applier/DataLogApplierTest.java    |  22 +++-
 .../cluster/log/manage/RaftLogManagerTest.java     |   5 +
 .../iotdb/cluster/partition/SlotManagerTest.java   |   9 ++
 ....java => PullMeasurementSchemaHandlerTest.java} |   7 +-
 .../cluster/server/member/DataGroupMemberTest.java |  13 ++-
 .../cluster/server/member/MetaGroupMemberTest.java |  14 ++-
 .../org/apache/iotdb/db/metadata/MManager.java     |   5 +
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |  11 ++
 thrift/src/main/thrift/cluster.thrift              |   5 +
 .../tsfile/write/schema/MeasurementSchema.java     |   5 +
 24 files changed, 276 insertions(+), 138 deletions(-)
 copy 
cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/{PullTimeseriesSchemaHandler.java
 => PullMeasurementSchemaHandler.java} (91%)
 rename 
cluster/src/test/java/org/apache/iotdb/cluster/server/handlers/caller/{PullTimeseriesSchemaHandlerTest.java
 => PullMeasurementSchemaHandlerTest.java} (91%)

Reply via email to