You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yc...@apache.org on 2024/07/24 03:03:01 UTC

(iotdb) 01/01: try to fix activeScan in table model

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

ycycse pushed a commit to branch ycy/fixActiveScan
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit e8946572b08636156884c100e2eeb4bbe2d826e5
Author: ycycse <yc...@gmail.com>
AuthorDate: Wed Jul 24 11:02:47 2024 +0800

    try to fix activeScan in table model
---
 .../iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
index 39d3011a0d0..e40e725ca8c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
@@ -3653,7 +3653,9 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
     for (Map.Entry<PartialPath, DeviceContext> entry :
         node.getDevicePathToContextMap().entrySet()) {
       PartialPath devicePath = entry.getKey();
-      IDeviceID deviceID = IDeviceID.Factory.DEFAULT_FACTORY.create(devicePath.getNodes());
+      IDeviceID deviceID =
+          IDeviceID.Factory.DEFAULT_FACTORY.create(
+              new String[] {devicePath.getFullPath(), devicePath.getTailNode()});
       deviceIDToContext.put(deviceID, entry.getValue());
       ttlCache.put(deviceID, DataNodeTTLCache.getInstance().getTTL(deviceID));
     }
@@ -3692,7 +3694,9 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
     for (Map.Entry<PartialPath, Map<PartialPath, List<TimeseriesContext>>> entryMap :
         node.getDeviceToTimeseriesSchemaInfo().entrySet()) {
       PartialPath devicePath = entryMap.getKey();
-      IDeviceID deviceID = IDeviceID.Factory.DEFAULT_FACTORY.create(devicePath.getNodes());
+      IDeviceID deviceID =
+          IDeviceID.Factory.DEFAULT_FACTORY.create(
+              new String[] {devicePath.getFullPath(), devicePath.getTailNode()});
       Map<String, TimeseriesContext> timeseriesSchemaInfoMap =
           getTimeseriesSchemaInfoMap(entryMap, dataDriverContext);
       timeseriesToSchemaInfo.put(deviceID, timeseriesSchemaInfoMap);