This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch feature/metric2021 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4e3a3cd08a9930cedc356dc9a73a344e521572fa Merge: 2efa8f8 6eda5e4 Author: xiangdong huang <[email protected]> AuthorDate: Fri Feb 26 14:39:39 2021 +0800 Merge remote-tracking branch 'origin/master' into feature/metric2021 .../cluster/client/sync/SyncClientAdaptor.java | 21 ++ .../manage/FilePartitionedSnapshotLogManager.java | 18 +- .../log/manage/PartitionedSnapshotLogManager.java | 18 +- .../apache/iotdb/cluster/metadata/CMManager.java | 341 ++++++++++++++++----- .../iotdb/cluster/query/LocalQueryExecutor.java | 18 ++ .../iotdb/cluster/server/DataClusterServer.java | 13 + .../server/handlers/caller/GetDevicesHandler.java | 60 ++++ .../cluster/server/service/DataAsyncService.java | 10 + .../cluster/server/service/DataSyncService.java | 9 + pom.xml | 6 - .../system.properties-changelist.md | 8 +- server/pom.xml | 4 - .../iotdb/db/engine/cache/ChunkMetadataCache.java | 7 + .../iotdb/db/engine/cache/LRULinkedHashMap.java | 2 +- .../apache/iotdb/db/mqtt/BrokerAuthenticator.java | 2 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 8 +- .../db/qp/physical/crud/InsertMultiTabletPlan.java | 16 +- .../iotdb/db/qp/physical/sys/ShowDevicesPlan.java | 26 ++ .../db/qp/physical/sys/ShowTimeSeriesPlan.java | 2 +- .../iotdb/db/query/dataset/ShowDevicesResult.java | 44 +++ .../db/query/dataset/UDTFNonAlignDataSet.java | 2 +- .../db/engine/cache/ChunkMetadataCacheTest.java | 44 ++- ...TDBKillQueryTest.java => IoTDBKillQueryIT.java} | 2 +- ...ryTimeoutTest.java => IoTDBQueryTimeoutIT.java} | 2 +- .../{IoTDBTracingTest.java => IoTDBTracingIT.java} | 2 +- .../db/query/dataset/ShowDevicesResultTest.java} | 29 +- .../db/utils/datastructure/BinaryTVListTest.java | 2 +- .../db/utils/datastructure/BooleanTVListTest.java | 2 +- .../db/utils/datastructure/DoubleTVListTest.java | 2 +- .../db/utils/datastructure/FloatTVListTest.java | 2 +- .../db/utils/datastructure/IntTVListTest.java | 2 +- .../db/utils/datastructure/LongTVListTest.java | 2 +- session/pom.xml | 4 - thrift/src/main/thrift/cluster.thrift | 5 + 34 files changed, 588 insertions(+), 147 deletions(-)
