This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-3364
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 7ea03463fc [IOTDB-3364] Fix Query stucked with null valued aligned
timeseries bug
add 42609b36a4 [IOTDB-3178] Refactor integration test for the new cluster
(#5901)
add d99d80772c jdbc getSchema error (#6115)
add 20804df90e [IOTDB-3334] Fix mismatched data columns and headers bug in
AlignByDevice query (#6104)
add 611861c1b7 [IOTDB-3178] Emergency Bug Fix For IT framework (#6121)
add b95b7040c4 [IOTDB-3355] Adapt metric framework for config node and
check metrics (#6096)
add 91490bea64 Merge remote-tracking branch 'origin/master' into IOTDB-3364
add b4dc3dd2fb Fix UT
No new revisions were added by this update.
Summary of changes:
.github/workflows/{cluster.yml => cluster-it.yml} | 22 +-
confignode/pom.xml | 44 +++-
confignode/src/assembly/resources/conf/logback.xml | 11 +
.../iotdb/confignode/service/ConfigNode.java | 5 +
.../resources/confignode1conf}/iotdb-metric.yml | 0
.../resources/confignode2conf}/iotdb-metric.yml | 2 +-
.../resources/confignode3conf}/iotdb-metric.yml | 2 +-
consensus/pom.xml | 67 ++++++-
distribution/src/assembly/confignode.xml | 4 +
{integration => integration-test}/README.md | 88 ++++----
integration-test/checkstyle.xml | 37 ++++
.../import-control.xml | 21 +-
{integration => integration-test}/pom.xml | 55 +++--
.../src/assembly/cluster-test.xml | 47 ++---
.../iotdb/db/query/udf/example/Accumulator.java | 0
.../apache/iotdb/db/query/udf/example/Adder.java | 0
.../apache/iotdb/db/query/udf/example/Counter.java | 0
.../db/query/udf/example/ExampleUDFConstant.java | 0
.../org/apache/iotdb/db/query/udf/example/Max.java | 0
.../iotdb/db/query/udf/example/Multiplier.java | 0
.../SlidingSizeWindowConstructorTester0.java | 0
.../SlidingSizeWindowConstructorTester1.java | 0
.../SlidingTimeWindowConstructionTester.java | 0
.../db/query/udf/example/TerminateTester.java | 0
.../iotdb/db/query/udf/example/ValidateTester.java | 0
.../iotdb/db/query/udf/example/WindowStartEnd.java | 0
.../java/org/apache/iotdb/it/env/Cluster1Env.java | 17 +-
.../org/apache/iotdb/it}/env/ClusterEnvBase.java | 222 ++++++++-------------
.../org/apache/iotdb/it}/env/ClusterEnvConfig.java | 2 +-
.../org/apache/iotdb/it/env/ClusterNodeBase.java | 190 ++++++++++++++++++
.../org/apache/iotdb/it}/env/ConfigFactory.java | 4 +-
.../java/org/apache/iotdb/it/env/ConfigNode.java | 115 +++++++++++
.../java/org/apache/iotdb/it/env/DataNode.java | 119 +++++++++++
.../java/org/apache/iotdb/it}/env/EnvFactory.java | 11 +-
.../org/apache/iotdb/it}/env/RemoteEnvConfig.java | 2 +-
.../org/apache/iotdb/it}/env/RemoteServerEnv.java | 2 +-
.../apache/iotdb/itbase/category/ClusterIT.java | 2 +-
.../iotdb/itbase/category/LocalStandaloneIT.java | 2 +-
.../org/apache/iotdb/itbase/category/RemoteIT.java | 2 +-
.../org/apache/iotdb/itbase/env/BaseConfig.java | 0
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 0
.../java/org/apache/iotdb/itbase/env/BaseNode.java | 22 +-
.../org/apache/iotdb/db/it/IoTDBExampleIT.java | 65 ++++++
.../iotdb/db/it/IoTDBExampleParallel1IT.java | 60 +++---
.../iotdb/db/it/IoTDBExampleParallel2IT.java | 99 +++++++++
.../iotdb/db/it/IoTDBExampleParallel3IT.java | 116 +++++++++++
.../org/apache/iotdb/db/it}/env/StandaloneEnv.java | 4 +-
.../iotdb/db/it}/env/StandaloneEnvConfig.java | 4 +-
.../src/test/resources/iotdb-engine.properties | 0
.../src/test/resources/logback-test.xml | 2 +-
integration/checkstyle.xml | 221 ++++++++++++++++++++
.../import-control.xml | 21 +-
.../db/integration/aligned/IoTDBEmptyDataIT.java | 3 +
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 1 +
.../metrics/config/MetricConfigDescriptor.java | 5 +
.../iotdb/metrics/config/MetricConstant.java | 2 +
pom.xml | 2 +
server/src/assembly/resources/conf/logback.xml | 11 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 22 ++
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 8 +-
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 177 +++++++++++++---
.../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 62 ++++--
.../java/org/apache/iotdb/db/service/DataNode.java | 1 -
.../java/org/apache/iotdb/db/service/IoTDB.java | 1 -
.../db/service/metrics/predefined/FileMetrics.java | 36 ++--
.../db/mpp/plan/plan/QueryLogicalPlanUtil.java | 14 +-
.../test/resources/datanode1conf/iotdb-metric.yml | 34 +++-
.../test/resources/datanode2conf/iotdb-metric.yml | 34 +++-
.../test/resources/datanode3conf/iotdb-metric.yml | 34 +++-
.../file/metadata/statistics/TimeStatistics.java | 14 ++
.../tsfile/read/query/dataset/QueryDataSet.java | 4 +
72 files changed, 1775 insertions(+), 415 deletions(-)
rename .github/workflows/{cluster.yml => cluster-it.yml} (72%)
copy {metrics/interface/src/main/assembly/resources/conf =>
confignode/src/test/resources/confignode1conf}/iotdb-metric.yml (100%)
copy {metrics/interface/src/main/assembly/resources/conf =>
confignode/src/test/resources/confignode2conf}/iotdb-metric.yml (96%)
copy {metrics/interface/src/main/assembly/resources/conf =>
confignode/src/test/resources/confignode3conf}/iotdb-metric.yml (96%)
copy {integration => integration-test}/README.md (61%)
create mode 100644 integration-test/checkstyle.xml
copy docs/UserGuide/IoTDB-Introduction/What-is-IoTDB.md =>
integration-test/import-control.xml (57%)
copy {integration => integration-test}/pom.xml (90%)
copy distribution/src/assembly/server.xml =>
integration-test/src/assembly/cluster-test.xml (63%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/Accumulator.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/Adder.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/Counter.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/ExampleUDFConstant.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/Max.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/Multiplier.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/SlidingSizeWindowConstructorTester0.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/SlidingSizeWindowConstructorTester1.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/SlidingTimeWindowConstructionTester.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/TerminateTester.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/ValidateTester.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/db/query/udf/example/WindowStartEnd.java
(100%)
copy
node-commons/src/main/java/org/apache/iotdb/commons/concurrent/IoTDBDefaultThreadExceptionHandler.java
=> integration-test/src/main/java/org/apache/iotdb/it/env/Cluster1Env.java
(65%)
copy {integration/src/main/java/org/apache/iotdb/integration =>
integration-test/src/main/java/org/apache/iotdb/it}/env/ClusterEnvBase.java
(51%)
copy {integration/src/main/java/org/apache/iotdb/integration =>
integration-test/src/main/java/org/apache/iotdb/it}/env/ClusterEnvConfig.java
(99%)
create mode 100644
integration-test/src/main/java/org/apache/iotdb/it/env/ClusterNodeBase.java
copy {integration/src/main/java/org/apache/iotdb/integration =>
integration-test/src/main/java/org/apache/iotdb/it}/env/ConfigFactory.java (95%)
create mode 100644
integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNode.java
create mode 100644
integration-test/src/main/java/org/apache/iotdb/it/env/DataNode.java
copy {integration/src/main/java/org/apache/iotdb/integration =>
integration-test/src/main/java/org/apache/iotdb/it}/env/EnvFactory.java (85%)
copy {integration/src/main/java/org/apache/iotdb/integration =>
integration-test/src/main/java/org/apache/iotdb/it}/env/RemoteEnvConfig.java
(95%)
copy {integration/src/main/java/org/apache/iotdb/integration =>
integration-test/src/main/java/org/apache/iotdb/it}/env/RemoteServerEnv.java
(98%)
copy
integration/src/main/java/org/apache/iotdb/itbase/category/RemoteTest.java =>
integration-test/src/main/java/org/apache/iotdb/itbase/category/ClusterIT.java
(96%)
copy
integration/src/main/java/org/apache/iotdb/itbase/category/RemoteTest.java =>
integration-test/src/main/java/org/apache/iotdb/itbase/category/LocalStandaloneIT.java
(95%)
copy
integration/src/main/java/org/apache/iotdb/itbase/category/RemoteTest.java =>
integration-test/src/main/java/org/apache/iotdb/itbase/category/RemoteIT.java
(96%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
(100%)
copy {integration =>
integration-test}/src/main/java/org/apache/iotdb/itbase/env/BaseEnv.java (100%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IFragInstanceStateTracker.java
=> integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseNode.java
(73%)
create mode 100644
integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java
copy
integration/src/test/java/org/apache/iotdb/db/integration/IoTDBKillQueryIT.java
=>
integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel1IT.java
(52%)
create mode 100644
integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel2IT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleParallel3IT.java
copy {integration/src/test/java/org/apache/iotdb/db/integration =>
integration-test/src/test/java/org/apache/iotdb/db/it}/env/StandaloneEnv.java
(94%)
copy {integration/src/test/java/org/apache/iotdb/db/integration =>
integration-test/src/test/java/org/apache/iotdb/db/it}/env/StandaloneEnvConfig.java
(97%)
copy {integration =>
integration-test}/src/test/resources/iotdb-engine.properties (100%)
copy {integration => integration-test}/src/test/resources/logback-test.xml
(99%)
create mode 100644 integration/checkstyle.xml
copy docs/UserGuide/IoTDB-Introduction/What-is-IoTDB.md =>
integration/import-control.xml (57%)
