(iotdb) branch beyyes/joinOperator updated: merge

[caogaofei]

This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch beyyes/joinOperator
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/beyyes/joinOperator by this 
push:
     new fbaa6ea6c21 merge
fbaa6ea6c21 is described below

commit fbaa6ea6c21baf94711b4f4369335739f2f28751
Author: Beyyes <cgf1...@foxmail.com>
AuthorDate: Wed Sep 11 14:40:57 2024 +0800

    merge
---
 .../queryengine/common/header/DatasetHeader.java   |  4 ++++
 .../plan/relational/analyzer/JoinTest.java         | 24 +++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java
index 8eb177dea8d..8d8d57c3e5b 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java
@@ -148,6 +148,10 @@ public class DatasetHeader {
     return respAliasColumns;
   }
 
+  public List<String> getColumnToTsBlockIndexList() {
+    return this.columnToTsBlockIndexList;
+  }
+
   public Map<String, Integer> getColumnNameIndexMap() {
     if (columnToTsBlockIndexMap == null || columnToTsBlockIndexMap.isEmpty()) {
       return columnToTsBlockIndexMap;
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java
index 3f17f59a519..57ccc739ff4 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java
@@ -78,18 +78,18 @@ public class JoinTest {
   @Test
   public void innerJoinTest1() {
     // join on
-    //        assertInnerJoinTest1(
-    //            "SELECT t1.time, t1.tag1, t1.tag2, t1.attr2, t1.s1, t1.s2,"
-    //                + "t2.tag1, t2.tag3, t2.attr2, t2.s1, t2.s3 "
-    //                + "FROM table1 t1 JOIN table1 t2 ON t1.time = t2.time 
OFFSET 3 LIMIT 6",
-    //            false);
-    //
-    //        // implicit join
-    //        assertInnerJoinTest1(
-    //            "SELECT t1.time, t1.tag1, t1.tag2, t1.attr2, t1.s1, t1.s2,"
-    //                + "t2.tag1, t2.tag3, t2.attr2, t2.s1, t2.s3 "
-    //                + "FROM table1 t1, table1 t2 WHERE t1.time = t2.time 
OFFSET 3 LIMIT 6",
-    //            false);
+    assertInnerJoinTest1(
+        "SELECT t1.time, t1.tag1, t1.tag2, t1.attr2, t1.s1, t1.s2,"
+            + "t2.tag1, t2.tag3, t2.attr2, t2.s1, t2.s3 "
+            + "FROM table1 t1 JOIN table1 t2 ON t1.time = t2.time OFFSET 3 
LIMIT 6",
+        false);
+
+    // implicit join
+    assertInnerJoinTest1(
+        "SELECT t1.time, t1.tag1, t1.tag2, t1.attr2, t1.s1, t1.s2,"
+            + "t2.tag1, t2.tag3, t2.attr2, t2.s1, t2.s3 "
+            + "FROM table1 t1, table1 t2 WHERE t1.time = t2.time OFFSET 3 
LIMIT 6",
+        false);
 
     // join using
     assertInnerJoinTest1(