You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/03/27 15:45:16 UTC

[iotdb] 09/11: Merge branch 'master' of https://github.com/apache/iotdb into InsertTabletNode

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

haonan pushed a commit to branch InsertTabletNode
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 5896bac873288de51128356481c4e07b1bb51593
Merge: 61e494b 44fb2d1
Author: HTHou <hh...@outlook.com>
AuthorDate: Fri Mar 25 16:20:30 2022 +0800

    Merge branch 'master' of https://github.com/apache/iotdb into InsertTabletNode

 docs/UserGuide/API/Programming-MQTT.md             |   2 +-
 docs/zh/UserGuide/API/Programming-MQTT.md          |   2 +-
 example/mqtt-customize/README.md                   |   4 +-
 ...apache.iotdb.db.protocol.mqtt.PayloadFormatter} |   0
 .../iotdb/metrics/dropwizard/MetricName.java       |  27 ++-
 .../reporter/DropwizardMetricsExporter.java        | 183 +++++++++------------
 .../apache/iotdb/commons/conf/IoTDBConstant.java   |   1 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  13 ++
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  57 ++++---
 .../iotdb/db/mpp/buffer/IDataBlockManager.java     |  12 +-
 .../iotdb/db/mpp/common/MPPQueryContext.java       |   6 +-
 .../apache/iotdb/db/mpp/execution/Coordinator.java |   2 +-
 .../db/protocol/mqtt/PayloadFormatManager.java     |  89 +++++++++-
 .../iotdb/db/service/InternalServiceImpl.java      |  30 +++-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   2 +
 .../db/mpp/sql/plan/DistributionPlannerTest.java   |   5 +-
 .../db/protocol/mqtt/PayloadFormatManagerTest.java |   7 +
 thrift/src/main/thrift/mpp.thrift                  |  59 ++++++-
 18 files changed, 339 insertions(+), 162 deletions(-)