This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch cluster- in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 936c9eb493f0d1e28b1d37173e6686316db358d4 Merge: c2f0cb6 b6538cd Author: xiangdong huang <[email protected]> AuthorDate: Wed Aug 11 19:03:05 2021 +0800 merge with master .github/workflows/client.yml | 11 +- docs/UserGuide/Ecosystem Integration/Grafana.md | 17 ++ docs/zh/UserGuide/Ecosystem Integration/Grafana.md | 32 ++- grafana/readme.md | 17 ++ grafana/readme_zh.md | 23 ++ .../resources/conf/iotdb-engine.properties | 12 +- .../org/apache/iotdb/db/auth/AuthorityChecker.java | 1 + .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 21 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 36 ++- .../iotdb/db/engine/memtable/AbstractMemTable.java | 14 +- .../apache/iotdb/db/engine/memtable/IMemTable.java | 6 + .../db/engine/storagegroup/TsFileProcessor.java | 52 ++++- .../db/qp/logical/crud/BasicFunctionOperator.java | 22 +- .../iotdb/db/qp/logical/crud/InOperator.java | 4 + .../iotdb/db/qp/logical/crud/QueryOperator.java | 7 +- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 20 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 5 +- .../org/apache/iotdb/db/integration/IoTDBInIT.java | 255 +++++++++++++++++++++ .../iotdb/db/integration/IoTDBQueryDemoIT.java | 62 +++++ .../iotdb/db/integration/IoTDBRestartIT.java | 9 +- .../dataset/groupby/GroupByFillDataSetTest.java | 2 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 6 +- .../apache/iotdb/spark/db/EnvironmentUtils.java | 6 +- 23 files changed, 578 insertions(+), 62 deletions(-)
