(iotdb) branch master updated: Fix query result is empty in order by time align by device

[jackietien]

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

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 4cc5b2ba48d Fix query result is empty in order by time align by device
4cc5b2ba48d is described below

commit 4cc5b2ba48dee78819af37935771bc7059c9afc3
Author: Beyyes <cgf1...@foxmail.com>
AuthorDate: Fri Jan 19 10:02:17 2024 +0800

    Fix query result is empty in order by time align by device
---
 .../db/queryengine/plan/planner/distribution/SourceRewriter.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
index d982f9ba988..4cf27f21fb9 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
@@ -133,7 +133,12 @@ public class SourceRewriter extends 
SimplePlanNodeRewriter<DistributionPlanConte
 
     String device = node.getDevice();
     List<TRegionReplicaSet> regionReplicaSets =
-        analysis.getPartitionInfo(device, context.getPartitionTimeFilter());
+        !analysis.useLogicalView()
+            ? new ArrayList<>(analysis.getPartitionInfo(device, 
context.getPartitionTimeFilter()))
+            : new ArrayList<>(
+                analysis.getPartitionInfo(
+                    analysis.getOutputDeviceToQueriedDevicesMap().get(device),
+                    context.getPartitionTimeFilter()));
 
     List<PlanNode> singleDeviceViewList = new ArrayList<>();
     for (TRegionReplicaSet tRegionReplicaSet : regionReplicaSets) {
@@ -183,7 +188,7 @@ public class SourceRewriter extends 
SimplePlanNodeRewriter<DistributionPlanConte
       String outputDevice = node.getDevices().get(i);
       PlanNode child = node.getChildren().get(i);
       List<TRegionReplicaSet> regionReplicaSets =
-          analysis.isAllDevicesInOneTemplate()
+          !analysis.useLogicalView()
               ? new ArrayList<>(
                   analysis.getPartitionInfo(outputDevice, 
context.getPartitionTimeFilter()))
               : new ArrayList<>(