You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/11/02 03:20:22 UTC
[iotdb] branch beyyes/master updated (a05a7d30b7 -> 7fafe5cac4)
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch beyyes/master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from a05a7d30b7 remove spacing in =
add 267ab13524 Fix isBlocked bug of schema query (#7862)
add 2d9dd5be83 [IOTDB-4814] Using 1C1D as the default mode in integration test (#7855)
add 388c988eb4 [IOTDB-4230]fix start-cli.sh does not support -e (#7866)
add b419918d50 Change log level (#7868)
add 09e256656f Change to Debug level (#7871)
add 6823e6ec57 Add debug level judgement firstly (#7872)
add ff5b62f113 init (#7863)
add b73f8d07a2 Rename iotdb-engine.properties to iotdb-datanode.properties in UTs (#7869)
add 7fafe5cac4 Merge branch 'master' into beyyes/master
No new revisions were added by this update.
Summary of changes:
.../{cluster-it.yml => cluster-it-1c1d.yml} | 15 ++-
.../{cluster-it.yml => cluster-it-1c3d.yml} | 7 +-
.github/workflows/main-unix.yml | 5 +-
.github/workflows/standalone-it-for-mpp.yml | 79 ------------
cli/src/assembly/resources/sbin/start-cli.sh | 37 +-----
.../src/test/resources/iotdb-datanode.properties | 5 +-
.../src/test/resources/iotdb-engine.properties | 21 ----
docs/UserGuide/Alert/Triggers.md | 8 +-
.../Process-Data/UDF-User-Defined-Function.md | 14 +--
docs/zh/UserGuide/Alert/Triggers.md | 4 +-
.../Process-Data/UDF-User-Defined-Function.md | 12 +-
integration-test/README.md | 50 ++++----
integration-test/pom.xml | 23 +---
.../org/apache/iotdb/it/env/ConfigFactory.java | 41 ++-----
.../org/apache/iotdb/it/env/DataNodeWrapper.java | 1 +
.../java/org/apache/iotdb/it/env/EnvFactory.java | 20 ++--
.../env/{RemoteServerConfig.java => EnvType.java} | 11 +-
.../{StandaloneOnMppEnv.java => OneCopyEnv.java} | 22 +---
.../iotdb/it/env/StandaloneDataNodeWrapper.java | 32 -----
.../src/test/resources/iotdb-datanode.properties | 9 +-
.../src/test/resources/iotdb-engine.properties | 21 ----
.../src/test/resources/iotdb-datanode.properties | 9 +-
.../src/test/resources/iotdb-engine.properties | 21 ----
pom.xml | 3 +-
.../resources/conf/iotdb-datanode.properties | 4 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +
.../statemachine/SchemaRegionStateMachine.java | 2 +-
.../fragment/FragmentInstanceExecution.java | 2 +-
.../fragment/FragmentInstanceStateMachine.java | 14 ++-
.../operator/schema/CountMergeOperator.java | 65 ++++++----
.../operator/schema/NodePathsCountOperator.java | 35 +++---
.../schema/SchemaQueryOrderByHeatOperator.java | 133 ++++++++++++---------
.../db/mpp/plan/execution/QueryExecution.java | 2 +-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 4 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 4 +-
.../operator/schema/CountMergeOperatorTest.java | 4 +-
.../src/test/resources/iotdb-datanode.properties | 5 +-
session/src/test/resources/iotdb-engine.properties | 20 ----
.../src/test/resources/iotdb-datanode.properties | 5 +-
.../src/test/resources/iotdb-engine.properties | 21 ----
41 files changed, 294 insertions(+), 513 deletions(-)
copy .github/workflows/{cluster-it.yml => cluster-it-1c1d.yml} (89%)
rename .github/workflows/{cluster-it.yml => cluster-it-1c3d.yml} (94%)
delete mode 100644 .github/workflows/standalone-it-for-mpp.yml
mode change 100644 => 100755 cli/src/assembly/resources/sbin/start-cli.sh
copy server/src/main/resources/META-INF/services/org.apache.iotdb.db.protocol.mqtt.PayloadFormatter => cross-tests/src/test/resources/iotdb-datanode.properties (92%)
delete mode 100644 cross-tests/src/test/resources/iotdb-engine.properties
copy integration-test/src/main/java/org/apache/iotdb/it/env/{RemoteServerConfig.java => EnvType.java} (79%)
rename integration-test/src/main/java/org/apache/iotdb/it/env/{StandaloneOnMppEnv.java => OneCopyEnv.java} (67%)
delete mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/StandaloneDataNodeWrapper.java
copy site/src/main/.asf.yaml => integration-test/src/test/resources/iotdb-datanode.properties (90%)
delete mode 100644 integration-test/src/test/resources/iotdb-engine.properties
copy site/src/main/.asf.yaml => integration/src/test/resources/iotdb-datanode.properties (90%)
delete mode 100644 integration/src/test/resources/iotdb-engine.properties
copy server/src/main/resources/META-INF/services/org.apache.iotdb.db.protocol.mqtt.PayloadFormatter => session/src/test/resources/iotdb-datanode.properties (92%)
delete mode 100644 session/src/test/resources/iotdb-engine.properties
copy server/src/main/resources/META-INF/services/org.apache.iotdb.db.protocol.mqtt.PayloadFormatter => spark-iotdb-connector/src/test/resources/iotdb-datanode.properties (92%)
delete mode 100644 spark-iotdb-connector/src/test/resources/iotdb-engine.properties