fix: add test for where clause and template change. correct pushdown in PBTree mode.

Author: xiangmy21

integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBShowTimeseriesOrderByTimeseriesIT.java

@@ -37,6 +37,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -45,18 +47,13 @@
 @Category({LocalStandaloneIT.class, ClusterIT.class})
 public class IoTDBShowTimeseriesOrderByTimeseriesIT extends AbstractSchemaIT {
 
-  private static final List<String> BASE_TIMESERIES =
-      Arrays.asList(
-          "root.db1.devA.m1",
-          "root.db1.devA.m2",
-          "root.db1.devB.m1",
-          "root.db1.devB.x",
-          "root.db2.devA.m1",
-          "root.db2.devC.m0",
-          "root.db2.devC.m3",
-          "root.db3.z.m1",
-          "root.db3.z.m10",
-          "root.db3.z.m2");
+  private static final List<String> BASE_TIMESERIES_DB1 =
+      Arrays.asList("root.db1.devA.m1", "root.db1.devB.m1", "root.db1.devA.m2", "root.db1.devB.x");
+  private static final List<String> BASE_TIMESERIES_DB2 =
+      Arrays.asList("root.db2.devA.m1", "root.db2.devC.m3", "root.db2.devC.m0");
+  private static final List<String> BASE_TIMESERIES = // combine db1 and db2
+      Stream.concat(BASE_TIMESERIES_DB1.stream(), BASE_TIMESERIES_DB2.stream())
+          .collect(Collectors.toList());
 
   public IoTDBShowTimeseriesOrderByTimeseriesIT(SchemaTestMode schemaTestMode) {
     super(schemaTestMode);
@@ -84,7 +81,6 @@ private void prepareComplexSchema() throws Exception {
         Statement statement = connection.createStatement()) {
       statement.execute("CREATE DATABASE root.db1");
       statement.execute("CREATE DATABASE root.db2");
-      statement.execute("CREATE DATABASE root.db3");
 
       for (String ts : BASE_TIMESERIES) {
         statement.execute(
@@ -119,13 +115,13 @@ public void testOrderAscWithoutLimit() throws Exception {
   @Test
   public void testOrderDescWithOffsetLimit() throws Exception {
     prepareComplexSchema();
-    List<String> expected = new ArrayList<>(BASE_TIMESERIES);
+    List<String> expected = new ArrayList<>(BASE_TIMESERIES_DB1);
     Collections.sort(expected);
     Collections.reverse(expected);
-    expected = expected.subList(2, 6); // offset 2 limit 4
+    expected = expected.subList(1, 3); // offset 1 limit 2
 
     List<String> actual =
-        queryTimeseries("show timeseries root.db*.** order by timeseries desc offset 2 limit 4");
+        queryTimeseries("show timeseries root.db1.** order by timeseries desc offset 1 limit 2");
     assertEquals(expected, actual);
   }
 
@@ -135,14 +131,14 @@ public void testInsertThenQueryOrder() throws Exception {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
       statement.execute(
-          "create timeseries root.db0.devX.a with datatype=INT32, encoding=RLE, compression=SNAPPY");
+          "create timeseries root.db1.devX.a with datatype=INT32, encoding=RLE, compression=SNAPPY");
     }
 
-    List<String> expected = new ArrayList<>(BASE_TIMESERIES);
-    expected.add("root.db0.devX.a");
+    List<String> expected = new ArrayList<>(BASE_TIMESERIES_DB1);
+    expected.add("root.db1.devX.a");
     Collections.sort(expected);
 
-    List<String> actual = queryTimeseries("show timeseries root.db*.** order by timeseries");
+    List<String> actual = queryTimeseries("show timeseries root.db1.** order by timeseries");
     assertEquals(expected, actual);
   }
 
@@ -154,12 +150,12 @@ public void testDeleteSubtreeThenQueryOrder() throws Exception {
       statement.execute("delete timeseries root.db2.devC.**");
     }
 
-    List<String> expected = new ArrayList<>(BASE_TIMESERIES);
+    List<String> expected = new ArrayList<>(BASE_TIMESERIES_DB2);
     expected.remove("root.db2.devC.m0");
     expected.remove("root.db2.devC.m3");
     Collections.sort(expected);
 
-    List<String> actual = queryTimeseries("show timeseries root.db*.** order by timeseries");
+    List<String> actual = queryTimeseries("show timeseries root.db2.** order by timeseries");
     assertEquals(expected, actual);
   }
 
@@ -172,18 +168,18 @@ public void testOffsetLimitAfterDeletesAndAdds() throws Exception {
       statement.execute(
           "create timeseries root.db1.devC.m0 with datatype=INT32, encoding=RLE, compression=SNAPPY");
       statement.execute(
-          "create timeseries root.db4.devZ.z with datatype=INT32, encoding=RLE, compression=SNAPPY");
+          "create timeseries root.db1.devZ.z with datatype=INT32, encoding=RLE, compression=SNAPPY");
     }
 
-    List<String> expected = new ArrayList<>(BASE_TIMESERIES);
+    List<String> expected = new ArrayList<>(BASE_TIMESERIES_DB1);
     expected.remove("root.db1.devB.x");
     expected.add("root.db1.devC.m0");
-    expected.add("root.db4.devZ.z");
+    expected.add("root.db1.devZ.z");
     Collections.sort(expected);
-    expected = expected.subList(5, 10); // offset 5 limit 5
+    expected = expected.subList(2, 4); // offset 2 limit 2
 
     List<String> actual =
-        queryTimeseries("show timeseries root.db*.** order by timeseries offset 5 limit 5");
+        queryTimeseries("show timeseries root.db1.** order by timeseries offset 2 limit 2");
     assertEquals(expected, actual);
   }
 
@@ -218,4 +214,49 @@ public void testConflictWithTimeCondition() throws Exception {
       }
     }
   }
+
+  @Test
+  public void testWhereClauseOffsetAppliedAfterFilter() throws Exception {
+    try (Connection connection = EnvFactory.getEnv().getConnection();
+        Statement statement = connection.createStatement()) {
+      statement.execute("CREATE DATABASE root.ln");
+      statement.execute(
+          "create timeseries root.ln.wf01.wt01.status with datatype=INT32, encoding=RLE, compression=SNAPPY");
+      statement.execute(
+          "create timeseries root.ln.wf02.wt01.status with datatype=INT32, encoding=RLE, compression=SNAPPY");
+      statement.execute(
+          "create timeseries root.ln.wf02.wt02.status with datatype=INT32, encoding=RLE, compression=SNAPPY");
+    }
+
+    List<String> actual =
+        queryTimeseries(
+            "show timeseries root.ln.** where timeseries contains 'wf02.wt' order by timeseries offset 1 limit 1");
+    assertEquals(Collections.singletonList("root.ln.wf02.wt02.status"), actual);
+  }
+
+  @Test
+  public void testAlterTemplateUpdatesOffsetOrder() throws Exception {
+    try (Connection connection = EnvFactory.getEnv().getConnection();
+        Statement statement = connection.createStatement()) {
+      statement.execute("CREATE DATABASE root.sg1");
+      statement.execute("create device template t1 (s1 INT32)");
+      statement.execute("set device template t1 to root.sg1.d1");
+      statement.execute("create timeseries using device template on root.sg1.d1");
+      statement.execute("set device template t1 to root.sg1.d2");
+      statement.execute("create timeseries using device template on root.sg1.d2");
+    }
+
+    List<String> before =
+        queryTimeseries("show timeseries root.sg1.** order by timeseries desc offset 1 limit 1");
+    assertEquals(Arrays.asList("root.sg1.d1.s1"), before);
+
+    try (Connection connection = EnvFactory.getEnv().getConnection();
+        Statement statement = connection.createStatement()) {
+      statement.execute("alter device template t1 add (s2 INT32)");
+    }
+
+    List<String> after =
+        queryTimeseries("show timeseries root.sg1.** order by timeseries desc offset 2 limit 2");
+    assertEquals(Arrays.asList("root.sg1.d1.s2", "root.sg1.d1.s1"), after);
+  }
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java

@@ -18,6 +18,7 @@
  */
 package org.apache.iotdb.db.queryengine.plan.planner;
 
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.path.PartialPath;
 import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
 import org.apache.iotdb.commons.schema.template.Template;
@@ -90,6 +91,7 @@
 import org.apache.iotdb.db.queryengine.plan.statement.pipe.PipeEnrichedStatement;
 import org.apache.iotdb.db.queryengine.plan.statement.sys.ExplainAnalyzeStatement;
 import org.apache.iotdb.db.queryengine.plan.statement.sys.ShowQueriesStatement;
+import org.apache.iotdb.db.schemaengine.SchemaEngineMode;
 
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.file.metadata.IDeviceID;
@@ -582,17 +584,27 @@ public PlanNode visitShowTimeSeries(
     boolean singleSchemaRegion =
         analysis.getSchemaPartitionInfo() != null
             && analysis.getSchemaPartitionInfo().getDistributionInfo().size() == 1;
+    boolean isMemorySchemaEngine =
+        CommonDescriptor.getInstance()
+            .getConfig()
+            .getSchemaEngineMode()
+            .equals(SchemaEngineMode.Memory.toString());
+    boolean isNeedSortDescInPBTree =
+        !isMemorySchemaEngine && showTimeSeriesStatement.getNameOrdering() == Ordering.DESC;
     boolean canPushDownOffsetLimit =
         singleSchemaRegion
+            && !isNeedSortDescInPBTree
             && !showTimeSeriesStatement.isOrderByHeat()
             && showTimeSeriesStatement.getSchemaFilter() == null;
 
-    if (showTimeSeriesStatement.isOrderByHeat()) {
-      limit = 0;
-      offset = 0;
-    } else if (!canPushDownOffsetLimit) {
-      limit = showTimeSeriesStatement.getLimitWithOffset();
-      offset = 0;
+    if (!canPushDownOffsetLimit) {
+      if (showTimeSeriesStatement.isOrderByHeat() || isNeedSortDescInPBTree) {
+        limit = 0;
+        offset = 0;
+      } else {
+        limit = showTimeSeriesStatement.getLimitWithOffset();
+        offset = 0;
+      }
     }
     boolean orderByTimeseries = showTimeSeriesStatement.isOrderByTimeseries();
     boolean orderByTimeseriesDesc =
@@ -613,8 +625,9 @@ public PlanNode visitShowTimeSeries(
                 orderByTimeseriesDesc)
             .planSchemaQueryMerge(showTimeSeriesStatement.isOrderByHeat());
 
-    // order by timeseries name in multi-region case: still need global SortNode
-    if (showTimeSeriesStatement.isOrderByTimeseries() && !singleSchemaRegion) {
+    // order by timeseries name in multi-region or PBTree-DESC case: still need global SortNode
+    if (showTimeSeriesStatement.isOrderByTimeseries()
+        && (!singleSchemaRegion || isNeedSortDescInPBTree)) {
       SortItem sortItem =
           new SortItem(ColumnHeaderConstant.TIMESERIES, showTimeSeriesStatement.getNameOrdering());
       planBuilder = planBuilder.planOrderBy(Collections.singletonList(sortItem));

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/basic/BasicMNode.java

@@ -46,7 +46,7 @@ public class BasicMNode implements IMemMNode {
   private IMemMNode parent;
   private final BasicMNodeInfo basicMNodeInfo;
 
-  /** Cached count of measurements in this node's subtree, restored on restart. */
+  /** Cached count of measurements in this node's subtree, rebuilt on restart. */
   private long subtreeMeasurementCount = 0L;
 
   /** from root to this node, only be set when used once for InternalMNode */