Merge remote-tracking branch 'upstream/master' into table-mods

# Conflicts: # iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java
apache · Feb 8, 2025 · 55f518f · 55f518f
2 parents 25c0514 + d900883
commit 55f518f
Show file tree

Hide file tree

Showing 644 changed files with 32,449 additions and 9,363 deletions.
diff --git a/.github/workflows/compile-check.yml b/.github/workflows/compile-check.yml
@@ -51,4 +51,4 @@ jobs:
       - name: Compiler Test
         shell: bash
         run: |
-          mvn clean compile -P with-integration-tests -ntp
+          mvn clean package -P with-integration-tests -DskipTests -ntp
diff --git a/.github/workflows/daily-it.yml b/.github/workflows/daily-it.yml
@@ -33,8 +33,6 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: IT/UT Test
         shell: bash
-        # we do not compile client-cpp for saving time, it is tested in client.yml
-        # we can skip influxdb-protocol because it has been tested separately in influxdb-protocol.yml
         run: |
           mvn clean verify \
           -P with-integration-tests \
@@ -49,3 +47,37 @@ jobs:
           name: cluster-log-java${{ matrix.java }}-${{ runner.os }}
           path: integration-test/target/cluster-logs
           retention-days: 3
+  SingleRegionTableModel:
+    strategy:
+      fail-fast: false
+      max-parallel: 15
+      matrix:
+        java: [ 8, 17 ]
+    runs-on: [ self-hosted, iotdb ]
+    #      group: self-hosted
+    #      labels: iotdb
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: liberica
+          java-version: ${{ matrix.java }}
+      - name: IT/UT Test
+        shell: bash
+        # we do not compile client-cpp for saving time, it is tested in client.yml
+        # we can skip influxdb-protocol because it has been tested separately in influxdb-protocol.yml
+        run: |
+          mvn clean verify \
+          -P with-integration-tests \
+          -DskipUTs \
+          -DintegrationTest.forkCount=2 -DDataNodeMaxHeapSize=1024 -DintegrationTest.dataRegionPerDataNode=1\
+          -pl integration-test \
+          -am -PTableSimpleIT
+      - name: Upload Artifact
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: table-standalone-log-java${{ matrix.java }}-${{ runner.os }}
+          path: integration-test/target/cluster-logs
+          retention-days: 3
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>iotdb-code-coverage</artifactId>
     <packaging>pom</packaging>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>iotdb-distribution</artifactId>
     <packaging>pom</packaging>
@@ -33,25 +33,25 @@
         <dependency>
             <groupId>org.apache.iotdb</groupId>
             <artifactId>iotdb-server</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.2-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.apache.iotdb</groupId>
             <artifactId>iotdb-cli</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.2-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.apache.iotdb</groupId>
             <artifactId>iotdb-confignode</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.2-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.apache.iotdb</groupId>
             <artifactId>library-udf</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
@@ -174,7 +174,7 @@
                 <dependency>
                     <groupId>org.apache.iotdb</groupId>
                     <artifactId>iotdb-ainode</artifactId>
-                    <version>2.0.0-SNAPSHOT</version>
+                    <version>2.0.2-SNAPSHOT</version>
                 </dependency>
             </dependencies>
             <build>

diff --git a/example/client-cpp-example/pom.xml b/example/client-cpp-example/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>client-cpp-example</artifactId>
     <name>IoTDB: Example: CPP Client</name>

diff --git a/example/jdbc/pom.xml b/example/jdbc/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>jdbc-example</artifactId>
     <name>IoTDB: Example: JDBC</name>

diff --git a/example/mqtt-customize/pom.xml b/example/mqtt-customize/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>customize-mqtt-example</artifactId>
     <name>IoTDB: Example: Customized MQTT</name>

diff --git a/example/mqtt/pom.xml b/example/mqtt/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>mqtt-example</artifactId>
     <name>IoTDB: Example: MQTT</name>

diff --git a/example/pipe-count-point-processor/pom.xml b/example/pipe-count-point-processor/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>pipe-count-point-processor-example</artifactId>
     <name>IoTDB: Example: Pipe: Count Point Processor</name>

diff --git a/example/pipe-opc-ua-sink/pom.xml b/example/pipe-opc-ua-sink/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pipe-opc-ua-sink-example</artifactId>

diff --git a/example/pom.xml b/example/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>iotdb-examples</artifactId>
     <packaging>pom</packaging>

diff --git a/example/rest-java-example/pom.xml b/example/rest-java-example/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>rest-java-example</artifactId>
     <name>IoTDB: Example: Java Rest</name>

diff --git a/example/schema/pom.xml b/example/schema/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>iotdb-examples</artifactId>
         <groupId>org.apache.iotdb</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>schema-example</artifactId>
     <name>IoTDB: Example: Schema</name>

diff --git a/example/session/pom.xml b/example/session/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.iotdb</groupId>
         <artifactId>iotdb-examples</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>client-example</artifactId>
     <name>IoTDB: Example: Session Client</name>

diff --git a/example/session/src/main/java/org/apache/iotdb/SubscriptionSessionExample.java b/example/session/src/main/java/org/apache/iotdb/SubscriptionSessionExample.java
@@ -24,11 +24,11 @@
 import org.apache.iotdb.rpc.subscription.config.ConsumerConstant;
 import org.apache.iotdb.rpc.subscription.config.TopicConstant;
 import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.subscription.SubscriptionSession;
+import org.apache.iotdb.session.subscription.SubscriptionTreeSession;
 import org.apache.iotdb.session.subscription.consumer.AckStrategy;
 import org.apache.iotdb.session.subscription.consumer.ConsumeResult;
-import org.apache.iotdb.session.subscription.consumer.SubscriptionPullConsumer;
-import org.apache.iotdb.session.subscription.consumer.SubscriptionPushConsumer;
+import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer;
+import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer;
 import org.apache.iotdb.session.subscription.payload.SubscriptionMessage;
 import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet;
 import org.apache.iotdb.session.subscription.payload.SubscriptionTsFileHandler;
@@ -122,7 +122,8 @@ private static void dataQuery() throws Exception {
   /** single pull consumer subscribe topic with path and time range */
   private static void dataSubscription1() throws Exception {
     // Create topics
-    try (final SubscriptionSession subscriptionSession = new SubscriptionSession(HOST, PORT)) {
+    try (final SubscriptionTreeSession subscriptionSession =
+        new SubscriptionTreeSession(HOST, PORT)) {
       subscriptionSession.open();
       final Properties config = new Properties();
       config.put(TopicConstant.PATH_KEY, "root.db.d1.s1");
@@ -136,7 +137,7 @@ 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");
-    try (SubscriptionPullConsumer consumer1 = new SubscriptionPullConsumer(config)) {
+    try (SubscriptionTreePullConsumer consumer1 = new SubscriptionTreePullConsumer(config)) {
       consumer1.open();
       consumer1.subscribe(TOPIC_1);
       while (true) {
@@ -160,7 +161,8 @@ private static void dataSubscription1() throws Exception {
       }
 
       // Show topics and subscriptions
-      try (final SubscriptionSession subscriptionSession = new SubscriptionSession(HOST, PORT)) {
+      try (final SubscriptionTreeSession subscriptionSession =
+          new SubscriptionTreeSession(HOST, PORT)) {
         subscriptionSession.open();
         subscriptionSession.getTopics().forEach((System.out::println));
         subscriptionSession.getSubscriptions().forEach((System.out::println));
@@ -172,7 +174,8 @@ private static void dataSubscription1() throws Exception {
 
   /** multi pull consumer subscribe topic with tsfile format */
   private static void dataSubscription2() throws Exception {
-    try (final SubscriptionSession subscriptionSession = new SubscriptionSession(HOST, PORT)) {
+    try (final SubscriptionTreeSession subscriptionSession =
+        new SubscriptionTreeSession(HOST, PORT)) {
       subscriptionSession.open();
       final Properties config = new Properties();
       config.put(TopicConstant.START_TIME_KEY, CURRENT_TIME + 33);
@@ -189,8 +192,8 @@ private static void dataSubscription2() throws Exception {
               () -> {
                 int retryCount = 0;
                 // Subscription: builder-style ctor
-                try (final SubscriptionPullConsumer consumer2 =
-                    new SubscriptionPullConsumer.Builder()
+                try (final SubscriptionTreePullConsumer consumer2 =
+                    new SubscriptionTreePullConsumer.Builder()
                         .consumerId("c" + idx)
                         .consumerGroupId("cg2")
                         .autoCommit(false)
@@ -238,7 +241,8 @@ private static void dataSubscription2() throws Exception {
 
   /** multi push consumer subscribe topic with tsfile format and snapshot mode */
   private static void dataSubscription3() throws Exception {
-    try (final SubscriptionSession subscriptionSession = new SubscriptionSession(HOST, PORT)) {
+    try (final SubscriptionTreeSession subscriptionSession =
+        new SubscriptionTreeSession(HOST, PORT)) {
       subscriptionSession.open();
       final Properties config = new Properties();
       config.put(TopicConstant.FORMAT_KEY, TopicConstant.FORMAT_TS_FILE_HANDLER_VALUE);
@@ -253,8 +257,8 @@ private static void dataSubscription3() throws Exception {
           new Thread(
               () -> {
                 // Subscription: builder-style ctor
-                try (final SubscriptionPushConsumer consumer3 =
-                    new SubscriptionPushConsumer.Builder()
+                try (final SubscriptionTreePushConsumer consumer3 =
+                    new SubscriptionTreePushConsumer.Builder()
                         .consumerId("c" + idx)
                         .consumerGroupId("cg3")
                         .ackStrategy(AckStrategy.AFTER_CONSUME)
@@ -284,7 +288,8 @@ private static void dataSubscription3() throws Exception {
 
   /** multi pull consumer subscribe topic with tsfile format and snapshot mode */
   private static void dataSubscription4() throws Exception {
-    try (final SubscriptionSession subscriptionSession = new SubscriptionSession(HOST, PORT)) {
+    try (final SubscriptionTreeSession subscriptionSession =
+        new SubscriptionTreeSession(HOST, PORT)) {
       subscriptionSession.open();
       final Properties config = new Properties();
       config.put(TopicConstant.FORMAT_KEY, TopicConstant.FORMAT_TS_FILE_HANDLER_VALUE);
@@ -300,8 +305,8 @@ private static void dataSubscription4() throws Exception {
           new Thread(
               () -> {
                 // Subscription: builder-style ctor
-                try (final SubscriptionPullConsumer consumer4 =
-                    new SubscriptionPullConsumer.Builder()
+                try (final SubscriptionTreePullConsumer consumer4 =
+                    new SubscriptionTreePullConsumer.Builder()
                         .consumerId("c" + idx)
                         .consumerGroupId("cg4")
                         .autoCommit(true)