mergemaster0729

.github/workflows/multi-language-client.yml

@@ -40,21 +40,22 @@ jobs:
       - name: Install CPP Dependencies (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
         shell: bash
-        run: sudo apt-get update && sudo apt-get install libboost-all-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install libboost-all-dev
       - name: Install CPP Dependencies (Mac)
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
           brew install boost
           brew install bison
-          echo 'export PATH="/opt/homebrew/opt/bison/bin:$PATH"' >> ~/.bash_profile
-          source ~/.bash_profile && export LDFLAGS="-L/opt/homebrew/opt/bison/lib"
       - name: Install CPP Dependencies (Windows)
         if: matrix.os == 'windows-latest'
         run: |
           choco install winflexbison3
-          choco install boost-msvc-14.3 --version=1.84.0.1
-          echo C:\\local\\boost_1_84_0 >> $env:GITHUB_PATH
+          choco install boost-msvc-14.3
+          $boost_path = (Get-ChildItem -Path 'C:\local\' -Filter 'boost_*').FullName
+          echo $boost_path >> $env:GITHUB_PATH
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:

distribution/src/assembly/all.xml

@@ -48,65 +48,65 @@
     <fileSets>
         <fileSet>
             <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf</directory>
+            <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf</directory>
         </fileSet>
         <fileSet>
             <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory>
+            <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory>
         </fileSet>
         <fileSet>
             <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory>
+            <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>tools</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory>
+            <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>tools</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory>
+            <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <!--        <fileSet>-->
         <!--            <outputDirectory>datanode</outputDirectory>-->
-        <!--            <directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode</directory>-->
+        <!--            <directory>${project.basedir}/../distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode</directory>-->
         <!--        </fileSet>-->
         <!--        <fileSet>-->
         <!--            <outputDirectory>confignode</outputDirectory>-->
-        <!--            <directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>-->
+        <!--            <directory>${project.basedir}/../distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>-->
         <!--        </fileSet>-->
     </fileSets>
     <files>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
+            <source>${project.basedir}/../iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
             <outputDirectory>conf</outputDirectory>
             <fileMode>0755</fileMode>
         </file>
     </files>
     <!--    <files>-->
     <!--        <file>-->
-    <!--            <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source>-->
+    <!--            <source>${project.basedir}/../server/src/assembly/resources/conf/datanode-env.sh</source>-->
     <!--            <destName>datanode/conf/datanode-env.sh</destName>-->
     <!--            <fileMode>0755</fileMode>-->
     <!--        </file>-->

distribution/src/assembly/cli.xml

@@ -39,18 +39,18 @@
     <fileSets>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>tools</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory>
+            <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory>
             <fileMode>0755</fileMode>
         </fileSet>
     </fileSets>
     <files>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
+            <source>${project.basedir}/../iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
             <outputDirectory>conf</outputDirectory>
             <fileMode>0755</fileMode>
         </file>

distribution/src/assembly/client-cpp.xml

@@ -28,7 +28,7 @@
     <baseDirectory>apache-iotdb-${project.version}-client-cpp-${os.classifier}-bin</baseDirectory>
     <fileSets>
         <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-client/client-cpp/target/client-cpp-${project.version}-cpp-${os.classifier}</directory>
+            <directory>${project.basedir}/../iotdb-client/client-cpp/target/client-cpp-${project.version}-cpp-${os.classifier}</directory>
             <outputDirectory>${file.separator}</outputDirectory>
         </fileSet>
     </fileSets>

distribution/src/assembly/common-files.xml

@@ -22,27 +22,27 @@
 <component xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.1.0 http://maven.apache.org/xsd/assembly-component-2.1.0.xsd">
     <fileSets>
         <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/licenses</directory>
+            <directory>${project.basedir}/../licenses</directory>
             <outputDirectory>licenses</outputDirectory>
         </fileSet>
     </fileSets>
     <files>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/README.md</source>
+            <source>${project.basedir}/../README.md</source>
         </file>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/README_ZH.md</source>
+            <source>${project.basedir}/../README_ZH.md</source>
         </file>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/LICENSE-binary</source>
+            <source>${project.basedir}/../LICENSE-binary</source>
             <destName>LICENSE</destName>
         </file>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/NOTICE-binary</source>
+            <source>${project.basedir}/../NOTICE-binary</source>
             <destName>NOTICE</destName>
         </file>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/RELEASE_NOTES.md</source>
+            <source>${project.basedir}/../RELEASE_NOTES.md</source>
         </file>
     </files>
 </component>

distribution/src/assembly/confignode.xml

@@ -38,25 +38,25 @@
     </dependencySets>
     <fileSets>
         <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory>
             <outputDirectory>sbin</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory>
+            <directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory>
             <outputDirectory>conf</outputDirectory>
         </fileSet>
         <fileSet>
             <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory>
+            <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
         </fileSet>
         <!--    <fileSet>-->
-        <!--      <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/tools</directory>-->
+        <!--      <directory>${project.basedir}/../confignode/src/assembly/resources/tools</directory>-->
         <!--      <outputDirectory>tools</outputDirectory>-->
         <!--      <fileMode>0755</fileMode>-->
         <!--    </fileSet>-->

distribution/src/assembly/datanode.xml

@@ -40,41 +40,41 @@
     <fileSets>
         <!--        <fileSet>-->
         <!--            <outputDirectory>conf</outputDirectory>-->
-        <!--            <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf</directory>-->
+        <!--            <directory>${project.basedir}/../server/src/assembly/resources/conf</directory>-->
         <!--        </fileSet>-->
         <fileSet>
             <outputDirectory>conf</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory>
+            <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>tools</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory>
+            <directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>sbin</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory>
+            <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <outputDirectory>tools</outputDirectory>
-            <directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory>
+            <directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory>
             <fileMode>0755</fileMode>
         </fileSet>
     </fileSets>
     <files>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source>
+            <source>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source>
             <destName>conf/datanode-env.sh</destName>
             <fileMode>0755</fileMode>
         </file>

distribution/src/assembly/library-udf.xml

@@ -38,23 +38,23 @@
     </dependencySets>
     <fileSets>
         <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/library-udf/src/assembly/tools</directory>
+            <directory>${project.basedir}/../library-udf/src/assembly/tools</directory>
             <outputDirectory/>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/licenses</directory>
+            <directory>${project.basedir}/../licenses</directory>
             <outputDirectory>licenses</outputDirectory>
         </fileSet>
     </fileSets>
     <files>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/LICENSE-binary</source>
+            <source>${project.basedir}/../LICENSE-binary</source>
             <outputDirectory>licenses</outputDirectory>
             <destName>LICENSE</destName>
         </file>
         <file>
-            <source>${maven.multiModuleProjectDirectory}/NOTICE-binary</source>
+            <source>${project.basedir}/../NOTICE-binary</source>
             <outputDirectory>licenses</outputDirectory>
             <destName>NOTICE</destName>
         </file>

example/pipe-opc-ua-sink/src/main/java/org/apache/iotdb/opcua/ClientExampleRunner.java

@@ -132,13 +132,15 @@ public void run() {
         Thread.sleep(1000);
         System.exit(0);
       } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
         e.printStackTrace();
       }
     }
 
     try {
       Thread.sleep(999_999_999);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       e.printStackTrace();
     }
   }

example/session/src/main/java/org/apache/iotdb/SubscriptionSessionExample.java

@@ -136,38 +136,38 @@ private static void dataSubscription1() throws Exception {
     final Properties config = new Properties();
     config.put(ConsumerConstant.CONSUMER_ID_KEY, "c1");
     config.put(ConsumerConstant.CONSUMER_GROUP_ID_KEY, "cg1");
-    final SubscriptionPullConsumer consumer1 = new SubscriptionPullConsumer(config);
-    consumer1.open();
-    consumer1.subscribe(TOPIC_1);
-    while (true) {
-      final List<SubscriptionMessage> messages = consumer1.poll(POLL_TIMEOUT_MS);
-      if (messages.isEmpty()) {
-        retryCount++;
-        if (retryCount >= MAX_RETRY_TIMES) {
-          break;
+    try (SubscriptionPullConsumer consumer1 = new SubscriptionPullConsumer(config)) {
+      consumer1.open();
+      consumer1.subscribe(TOPIC_1);
+      while (true) {
+        final List<SubscriptionMessage> messages = consumer1.poll(POLL_TIMEOUT_MS);
+        if (messages.isEmpty()) {
+          retryCount++;
+          if (retryCount >= MAX_RETRY_TIMES) {
+            break;
+          }
         }
-      }
-      for (final SubscriptionMessage message : messages) {
-        for (final SubscriptionSessionDataSet dataSet : message.getSessionDataSetsHandler()) {
-          System.out.println(dataSet.getColumnNames());
-          System.out.println(dataSet.getColumnTypes());
-          while (dataSet.hasNext()) {
-            System.out.println(dataSet.next());
+        for (final SubscriptionMessage message : messages) {
+          for (final SubscriptionSessionDataSet dataSet : message.getSessionDataSetsHandler()) {
+            System.out.println(dataSet.getColumnNames());
+            System.out.println(dataSet.getColumnTypes());
+            while (dataSet.hasNext()) {
+              System.out.println(dataSet.next());
+            }
           }
         }
+        // Auto commit
       }
-      // Auto commit
-    }
 
-    // Show topics and subscriptions
-    try (final SubscriptionSession subscriptionSession = new SubscriptionSession(HOST, PORT)) {
-      subscriptionSession.open();
-      subscriptionSession.getTopics().forEach((System.out::println));
-      subscriptionSession.getSubscriptions().forEach((System.out::println));
-    }
+      // Show topics and subscriptions
+      try (final SubscriptionSession subscriptionSession = new SubscriptionSession(HOST, PORT)) {
+        subscriptionSession.open();
+        subscriptionSession.getTopics().forEach((System.out::println));
+        subscriptionSession.getSubscriptions().forEach((System.out::println));
+      }
 
-    consumer1.unsubscribe(TOPIC_1);
-    consumer1.close();
+      consumer1.unsubscribe(TOPIC_1);
+    }
   }
 
   /** multi pull consumer subscribe topic with tsfile format */