Merge branch 'master' into update-tsfile-version-0902

apache · Sep 4, 2024 · 416ca76 · 416ca76
2 parents eb8f71b + 7f6211e
commit 416ca76
Show file tree

Hide file tree

Showing 120 changed files with 1,914 additions and 431 deletions.
diff --git a/.github/workflows/multi-language-client.yml b/.github/workflows/multi-language-client.yml
@@ -56,11 +56,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install libboost-all-dev
       - name: Install CPP Dependencies (Mac)
+        # remove some xcode to release disk space
         if: runner.os == 'macOS'
         shell: bash
         run: |
           brew install boost
-          brew install bison
+          sudo rm -rf /Applications/Xcode_14.3.1.app
+          sudo rm -rf /Applications/Xcode_15.0.1.app
+          sudo rm -rf /Applications/Xcode_15.1.app
+          sudo rm -rf /Applications/Xcode_15.2.app
+          sudo rm -rf /Applications/Xcode_15.3.app
       - name: Install CPP Dependencies (Windows)
         if: runner.os == 'Windows'
         run: |
@@ -76,7 +81,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.m2
-          key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2-
       - name: Build IoTDB server
         shell: bash
@@ -99,7 +104,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: cpp-IT-${{ runner.os }}
-          path: iotdb-client/client-cpp/target/build/test/Testing
+          path: distribution/target/apache-iotdb-*-all-bin/apache-iotdb-*-all-bin/logs
           retention-days: 1
 
   go:

diff --git a/example/session/src/main/java/org/apache/iotdb/TabletExample.java b/example/session/src/main/java/org/apache/iotdb/TabletExample.java
@@ -90,9 +90,11 @@ private static Map<String, ArrayList<Object>> loadCSVData(
             case BOOLEAN:
               ret.get(measurement).add(Boolean.parseBoolean(items[idx]));
               break;
+            case DATE:
             case INT32:
               ret.get(measurement).add(Integer.parseInt(items[idx]));
               break;
+            case TIMESTAMP:
             case INT64:
               ret.get(measurement).add(Long.parseLong(items[idx]));
               break;
@@ -102,6 +104,8 @@ private static Map<String, ArrayList<Object>> loadCSVData(
             case DOUBLE:
               ret.get(measurement).add(Double.parseDouble(items[idx]));
               break;
+            case STRING:
+            case BLOB:
             case TEXT:
               ret.get(measurement).add(BytesUtils.valueOf(items[idx]));
               break;

diff --git a/example/udf/src/main/java/org/apache/iotdb/udf/UDAFExample.java b/example/udf/src/main/java/org/apache/iotdb/udf/UDAFExample.java
@@ -110,6 +110,10 @@ public void addInput(State state, Column[] columns, BitMap bitMap) {
         return;
       case TEXT:
       case BOOLEAN:
+      case TIMESTAMP:
+      case STRING:
+      case BLOB:
+      case DATE:
       default:
         throw new UnSupportedDataTypeException(
             String.format("Unsupported data type in aggregation AVG : %s", dataType));

diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/UDAFAvg.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/UDAFAvg.java
@@ -101,7 +101,11 @@ public void addInput(State state, Column[] columns, BitMap bitMap) {
         addDoubleInput(avgState, columns, bitMap);
         return;
       case TEXT:
+      case STRING:
+      case BLOB:
       case BOOLEAN:
+      case TIMESTAMP:
+      case DATE:
       default:
         throw new UnSupportedDataTypeException(
             String.format("Unsupported data type in aggregation AVG : %s", dataType));

diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/UDAFSum.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/UDAFSum.java
@@ -101,7 +101,11 @@ public void addInput(State state, Column[] columns, BitMap bitMap) {
         addDoubleInput(sumState, columns, bitMap);
         return;
       case TEXT:
+      case STRING:
+      case BLOB:
       case BOOLEAN:
+      case TIMESTAMP:
+      case DATE:
       default:
         throw new UnSupportedDataTypeException(
             String.format("Unsupported data type in aggregation AVG : %s", dataType));

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
@@ -474,6 +474,16 @@ public CommonConfig setPipeMetaSyncerSyncIntervalMinutes(long pipeMetaSyncerSync
     return this;
   }
 
+  @Override
+  public CommonConfig setPipeConnectorRequestSliceThresholdBytes(
+      int pipeConnectorRequestSliceThresholdBytes) {
+    setProperty(
+        "pipe_connector_request_slice_threshold_bytes",
+        String.valueOf(pipeConnectorRequestSliceThresholdBytes));
+
+    return this;
+  }
+
   // For part of the log directory
   public String getClusterConfigStr() {
     return fromConsensusFullNameToAbbr(properties.getProperty(CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS))

diff --git a/...tion-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java b/...tion-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
@@ -483,4 +483,12 @@ public CommonConfig setPipeMetaSyncerSyncIntervalMinutes(long pipeMetaSyncerSync
     cnConfig.setPipeMetaSyncerSyncIntervalMinutes(pipeMetaSyncerSyncIntervalMinutes);
     return this;
   }
+
+  @Override
+  public CommonConfig setPipeConnectorRequestSliceThresholdBytes(
+      int pipeConnectorRequestSliceThresholdBytes) {
+    dnConfig.setPipeConnectorRequestSliceThresholdBytes(pipeConnectorRequestSliceThresholdBytes);
+    cnConfig.setPipeConnectorRequestSliceThresholdBytes(pipeConnectorRequestSliceThresholdBytes);
+    return this;
+  }
 }
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
@@ -339,4 +339,10 @@ public CommonConfig setPipeMetaSyncerInitialSyncDelayMinutes(
   public CommonConfig setPipeMetaSyncerSyncIntervalMinutes(long pipeMetaSyncerSyncIntervalMinutes) {
     return this;
   }
+
+  @Override
+  public CommonConfig setPipeConnectorRequestSliceThresholdBytes(
+      int pipeConnectorRequestSliceThresholdBytes) {
+    return this;
+  }
 }
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
@@ -150,4 +150,7 @@ CommonConfig setPipeHeartbeatIntervalSecondsForCollectingPipeMeta(
   CommonConfig setPipeMetaSyncerInitialSyncDelayMinutes(long pipeMetaSyncerInitialSyncDelayMinutes);
 
   CommonConfig setPipeMetaSyncerSyncIntervalMinutes(long pipeMetaSyncerSyncIntervalMinutes);
+
+  CommonConfig setPipeConnectorRequestSliceThresholdBytes(
+      int pipeConnectorRequestSliceThresholdBytes);
 }
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
@@ -101,7 +101,8 @@ public void testSetClusterName() throws Exception {
     EnvFactory.getEnv().getDataNodeWrapper(0).start();
     // set cluster name on datanode
     Awaitility.await()
-        .atMost(10, TimeUnit.SECONDS)
+        .atMost(30, TimeUnit.SECONDS)
+        .pollDelay(1, TimeUnit.SECONDS)
         .until(
             () -> {
               try (Connection connection = EnvFactory.getEnv().getConnection();

diff --git a/...ration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java b/...ration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java
@@ -36,7 +36,12 @@ public void setUp() {
     MultiEnvFactory.createEnv(2);
     senderEnv = MultiEnvFactory.getEnv(0);
     receiverEnv = MultiEnvFactory.getEnv(1);
+    setupConfig();
+    senderEnv.initClusterEnvironment();
+    receiverEnv.initClusterEnvironment();
+  }
 
+  protected void setupConfig() {
     // TODO: delete ratis configurations
     senderEnv
         .getConfig()
@@ -54,9 +59,6 @@ public void setUp() {
     // 10 min, assert that the operations will not time out
     senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
     receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
-
-    senderEnv.initClusterEnvironment();
-    receiverEnv.initClusterEnvironment();
   }
 
   @After

diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java
@@ -36,7 +36,12 @@ public void setUp() {
     MultiEnvFactory.createEnv(2);
     senderEnv = MultiEnvFactory.getEnv(0);
     receiverEnv = MultiEnvFactory.getEnv(1);
+    setupConfig();
+    senderEnv.initClusterEnvironment();
+    receiverEnv.initClusterEnvironment();
+  }
 
+  protected void setupConfig() {
     // TODO: delete ratis configurations
     senderEnv
         .getConfig()
@@ -54,9 +59,6 @@ public void setUp() {
     // 10 min, assert that the operations will not time out
     senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
     receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
-
-    senderEnv.initClusterEnvironment();
-    receiverEnv.initClusterEnvironment();
   }
 
   @After