filter

Author: Caideyipi

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/v2/impl/RestApiServiceImpl.java

@@ -111,7 +111,12 @@ public Response executeFastLastQueryStatement(
           new PartialPath(prefixPathList.getPrefixPaths().toArray(new String[0]));
       Map<PartialPath, Map<String, TimeValuePair>> resultMap = new HashMap<>();
 
+      final String prefixString = prefixPath.toString();
       for (ISchemaRegion region : SchemaEngine.getInstance().getAllSchemaRegions()) {
+        if (!prefixString.startsWith(region.getDatabaseFullPath())
+            && !region.getDatabaseFullPath().startsWith(prefixString)) {
+          continue;
+        }
         region.fillLastQueryMap(prefixPath, resultMap);
       }
       // Check cache first

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java

@@ -819,8 +819,12 @@ public TSExecuteStatementResp executeFastLastDataQueryForOnePrefixPath(
       final Map<PartialPath, Map<String, TimeValuePair>> resultMap = new HashMap<>();
       int sensorNum = 0;
 
+      final String prefixString = prefixPath.toString();
       for (final ISchemaRegion region : SchemaEngine.getInstance().getAllSchemaRegions()) {
-        // Do not filter by database, since we assume all the regions match the prefix path
+        if (!prefixString.startsWith(region.getDatabaseFullPath())
+            && !region.getDatabaseFullPath().startsWith(prefixString)) {
+          continue;
+        }
         sensorNum += region.fillLastQueryMap(prefixPath, resultMap);
       }