Fixed the bug that update / delete devices with no effect may end up changing all the devices

Author: Caideyipi

integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDeviceIT.java

@@ -226,6 +226,9 @@ public void testDevice() throws SQLException {
             e.getMessage());
       }
 
+      // Test filter with no effect
+      statement.execute("update table0 set model = null where model = 'A' and model = 'B'");
+
       // Test null
       statement.execute("update table0 set model = null where model <> substring(device_id, 1, 1)");
       TestUtils.assertResultSetEqual(
@@ -249,6 +252,9 @@ public void testDevice() throws SQLException {
       TestUtils.assertResultSetSize(
           statement.executeQuery("show devices from table0 offset 1 limit 1"), 1);
 
+      // Test delete devices with no effect
+      statement.execute("delete devices from table0 where region_id = '1' and region_id = '2'");
+
       // Test delete devices
       statement.execute("delete devices from table0 where region_id = '1' and plant_id = '木兰'");
       TestUtils.assertResultSetSize(statement.executeQuery("show devices from table0"), 1);

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java

@@ -4080,6 +4080,11 @@ public SettableFuture<ConfigTaskResult> dropTable(
   public SettableFuture<ConfigTaskResult> deleteDevice(
       final DeleteDevice deleteDevice, final String queryId, final SessionInfo sessionInfo) {
     final SettableFuture<ConfigTaskResult> future = SettableFuture.create();
+    if (!deleteDevice.isMayDeleteDevice()) {
+      DeleteDeviceTask.buildTSBlock(0, future);
+      return future;
+    }
+
     try (final ConfigNodeClient client =
         CLUSTER_DELETION_CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
 

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java

@@ -480,7 +480,7 @@ protected Scope visitUpdate(final Update node, final Optional<Scope> context) {
       final TranslationMap translationMap = analyzeTraverseDevice(node, context, true);
       final TsTable table =
           DataNodeTableCache.getInstance().getTable(node.getDatabase(), node.getTableName());
-      node.parseRawExpression(
+      if (!node.parseRawExpression(
           null,
           table,
           table.getColumnList().stream()
@@ -489,7 +489,10 @@ protected Scope visitUpdate(final Update node, final Optional<Scope> context) {
                       columnSchema.getColumnCategory().equals(TsTableColumnCategory.ATTRIBUTE))
               .map(TsTableColumnSchema::getColumnName)
               .collect(Collectors.toList()),
-          queryContext);
+          queryContext)) {
+        analysis.setFinishQueryAfterAnalyze();
+        return null;
+      }
 
       // If node.location is absent, this is a pipe-transferred update, namely the assignments are
       // already parsed at the sender

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceCacheAttributeGuard.java

@@ -39,7 +39,7 @@
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.stream.Collectors;
 
-import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertIdValuesToDeviceID;
+import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertTagValuesToDeviceID;
 
 public class TableDeviceCacheAttributeGuard {
 
@@ -147,7 +147,7 @@ public void handleContainer(final String database, final UpdateContainer contain
                       (nodes, attributes) ->
                           cache.updateAttributes(
                               database,
-                              convertIdValuesToDeviceID(table, nodes.toArray(new String[0])),
+                              convertTagValuesToDeviceID(table, nodes.toArray(new String[0])),
                               attributes)));
     } else {
       ((UpdateClearContainer) container)

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java

@@ -218,7 +218,7 @@ public Map<String, List<DeviceEntry>> fetchDeviceSchemaForDataQuery(
   }
 
   // Used by show/count device and update device.
-  // Update device will not access cache
+  // Update / Delete device will not access cache
   public boolean parseFilter4TraverseDevice(
       final TsTable tableInstance,
       final List<Expression> expressionList,
@@ -376,9 +376,9 @@ private boolean tryGetTableDeviceInCache(
       final List<String> attributeColumns,
       final List<IDeviceID> fetchPaths,
       final boolean isDirectDeviceQuery,
-      final String[] idValues,
+      final String[] tagValues,
       final MPPQueryContext queryContext) {
-    final IDeviceID deviceID = convertIdValuesToDeviceID(tableInstance.getTableName(), idValues);
+    final IDeviceID deviceID = convertTagValuesToDeviceID(tableInstance.getTableName(), tagValues);
     final Map<String, Binary> attributeMap = cache.getDeviceAttribute(database, deviceID);
 
     // 1. AttributeMap == null means cache miss
@@ -414,9 +414,9 @@ private boolean tryGetTreeDeviceInCache(
       final TsTable tableInstance,
       final Predicate<AlignedDeviceEntry> check,
       final List<IDeviceID> fetchPaths,
-      final String[] idValues) {
+      final String[] tagValues) {
     final IDeviceID deviceID =
-        DataNodeTreeViewSchemaUtils.convertToIDeviceID(tableInstance, idValues);
+        DataNodeTreeViewSchemaUtils.convertToIDeviceID(tableInstance, tagValues);
     final IDeviceSchema schema = TableDeviceSchemaCache.getInstance().getDeviceSchema(deviceID);
     final String database;
     if (!(schema instanceof TreeDeviceNormalSchema) || Objects.isNull(check)) {
@@ -435,7 +435,7 @@ private boolean tryGetTreeDeviceInCache(
     return true;
   }
 
-  public static IDeviceID convertIdValuesToDeviceID(
+  public static IDeviceID convertTagValuesToDeviceID(
       final String tableName, final String[] idValues) {
     // Convert to IDeviceID
     final String[] deviceIdNodes = new String[idValues.length + 1];

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java

@@ -46,7 +46,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertIdValuesToDeviceID;
+import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertTagValuesToDeviceID;
 
 public class TableDeviceSchemaValidator {
   private final SqlParser relationSqlParser = new SqlParser();
@@ -127,7 +127,7 @@ private ValidateResult validateDeviceSchemaInCache(
           TableDeviceSchemaCache.getInstance()
               .getDeviceAttribute(
                   schemaValidation.getDatabase(),
-                  convertIdValuesToDeviceID(
+                  convertTagValuesToDeviceID(
                       schemaValidation.getTableName(), (String[]) deviceIdList.get(i)));
       if (attributeMap == null) {
         result.missingDeviceIndexList.add(i);
@@ -165,7 +165,7 @@ private ValidateResult fetchAndValidateDeviceSchema(
     for (final int index : previousValidateResult.missingDeviceIndexList) {
       final Map<String, Binary> attributeMap =
           fetchedDeviceSchema.get(
-              convertIdValuesToDeviceID(
+              convertTagValuesToDeviceID(
                   schemaValidation.getTableName(), (String[]) deviceIdList.get(index)));
       if (attributeMap == null) {
         result.missingDeviceIndexList.add(index);

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java

@@ -24,6 +24,7 @@
 import org.apache.iotdb.commons.schema.filter.SchemaFilter;
 import org.apache.iotdb.commons.schema.table.TsTable;
 import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
+import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
 import org.apache.iotdb.db.queryengine.common.SessionInfo;
 import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor;
 import org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource;
@@ -32,6 +33,7 @@
 import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
 import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner;
 import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation;
+import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry;
 import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
 import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
 import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
@@ -66,13 +68,27 @@ public class DeleteDevice extends AbstractTraverseDevice {
 
   // Used for data deletion
   private List<TableDeletionEntry> modEntries;
+  private boolean mayDeleteDevice;
 
   public DeleteDevice(final NodeLocation location, final Table table, final Expression where) {
     super(location, table, where);
   }
 
+  @Override
+  public boolean parseRawExpression(
+      final Map<String, List<DeviceEntry>> entries,
+      final TsTable tableInstance,
+      final List<String> attributeColumns,
+      final MPPQueryContext context) {
+    return mayDeleteDevice =
+        super.parseRawExpression(entries, tableInstance, attributeColumns, context);
+  }
+
+  public boolean isMayDeleteDevice() {
+    return mayDeleteDevice;
+  }
+
   public void parseModEntries(final TsTable table) {
-    // TODO: Fallback to precise devices if modEnries parsing failure encountered
     modEntries = AnalyzeUtils.parseExpressions2ModEntries(where, table);
   }
 

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java

@@ -152,7 +152,7 @@
 import java.util.stream.Collectors;
 
 import static org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator.makeLayout;
-import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertIdValuesToDeviceID;
+import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertTagValuesToDeviceID;
 import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR;
 
 /**
@@ -1449,7 +1449,7 @@ private void updateAttribute(
     if (!isRecovering) {
       TableDeviceSchemaCache.getInstance()
           .updateAttributes(
-              databaseName, convertIdValuesToDeviceID(tableName, deviceId), resultMap);
+              databaseName, convertTagValuesToDeviceID(tableName, deviceId), resultMap);
     }
     deviceAttributeCacheUpdater.update(tableName, deviceId, resultMap);
   }