Next

Author: Caideyipi

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

@@ -566,23 +566,32 @@ public TSStatus invalidateLastCache(final String database) {
 
   @Override
   public TSStatus invalidateSchemaCache(final TInvalidateCacheReq req) {
-    DataNodeSchemaLockManager.getInstance().takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+    DataNodeSchemaLockManager.getInstance()
+        .takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     try {
-      TreeDeviceSchemaCacheManager.getInstance().takeWriteLock();
+      DataNodeSchemaLockManager.getInstance()
+          .takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TREE);
       try {
-        final String database = req.getFullPath();
-        // req.getFullPath() is a database path
-        ClusterTemplateManager.getInstance().invalid(database);
-        // clear table related cache
-        DataNodeTableCache.getInstance().invalid(database);
-        tableDeviceSchemaCache.invalidate(database);
-        LOGGER.info("Schema cache of {} has been invalidated", req.getFullPath());
-        return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
+        TreeDeviceSchemaCacheManager.getInstance().takeWriteLock();
+        try {
+          final String database = req.getFullPath();
+          // req.getFullPath() is a database path
+          ClusterTemplateManager.getInstance().invalid(database);
+          // clear table related cache
+          DataNodeTableCache.getInstance().invalid(database);
+          tableDeviceSchemaCache.invalidate(database);
+          LOGGER.info("Schema cache of {} has been invalidated", req.getFullPath());
+          return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
+        } finally {
+          TreeDeviceSchemaCacheManager.getInstance().releaseWriteLock();
+        }
       } finally {
-        TreeDeviceSchemaCacheManager.getInstance().releaseWriteLock();
+        DataNodeSchemaLockManager.getInstance()
+            .releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TREE);
       }
     } finally {
-      DataNodeSchemaLockManager.getInstance().releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+      DataNodeSchemaLockManager.getInstance()
+          .releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     }
   }
 
@@ -649,7 +658,7 @@ public TSStatus rollbackSchemaBlackList(TRollbackSchemaBlackListReq req) {
   @Override
   public TSStatus invalidateMatchedSchemaCache(final TInvalidateMatchedSchemaCacheReq req) {
     final TreeDeviceSchemaCacheManager cache = TreeDeviceSchemaCacheManager.getInstance();
-    DataNodeSchemaLockManager.getInstance().takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+    DataNodeSchemaLockManager.getInstance().takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TREE);
     try {
       cache.takeWriteLock();
       try {
@@ -658,7 +667,8 @@ public TSStatus invalidateMatchedSchemaCache(final TInvalidateMatchedSchemaCache
         cache.releaseWriteLock();
       }
     } finally {
-      DataNodeSchemaLockManager.getInstance().releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+      DataNodeSchemaLockManager.getInstance()
+          .releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TREE);
     }
     return RpcUtils.SUCCESS_STATUS;
   }
@@ -1570,13 +1580,15 @@ public TSStatus updateTable(final TUpdateTableReq req) {
 
   @Override
   public TSStatus invalidateTableCache(final TInvalidateTableCacheReq req) {
-    DataNodeSchemaLockManager.getInstance().takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+    DataNodeSchemaLockManager.getInstance()
+        .takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     try {
       TableDeviceSchemaCache.getInstance()
           .invalidate(PathUtils.unQualifyDatabaseName(req.getDatabase()), req.getTableName());
       return StatusUtils.OK;
     } finally {
-      DataNodeSchemaLockManager.getInstance().releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+      DataNodeSchemaLockManager.getInstance()
+          .releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     }
   }
 
@@ -1652,7 +1664,8 @@ public TSStatus rollbackTableDeviceBlackList(final TTableDeviceDeletionWithPatte
 
   @Override
   public TSStatus invalidateMatchedTableDeviceCache(final TTableDeviceInvalidateCacheReq req) {
-    DataNodeSchemaLockManager.getInstance().takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+    DataNodeSchemaLockManager.getInstance()
+        .takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     try {
       TableDeviceSchemaCache.getInstance()
           .invalidate(
@@ -1662,7 +1675,8 @@ public TSStatus invalidateMatchedTableDeviceCache(final TTableDeviceInvalidateCa
                   req.getDatabase(), req.getTableName(), req.getPatternInfo()));
       return StatusUtils.OK;
     } finally {
-      DataNodeSchemaLockManager.getInstance().releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+      DataNodeSchemaLockManager.getInstance()
+          .releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     }
   }
 
@@ -1701,7 +1715,8 @@ public TSStatus deleteTableDeviceInBlackList(final TTableDeviceDeletionWithPatte
 
   @Override
   public TSStatus invalidateColumnCache(final TInvalidateColumnCacheReq req) {
-    DataNodeSchemaLockManager.getInstance().takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+    DataNodeSchemaLockManager.getInstance()
+        .takeWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     try {
       TableDeviceSchemaCache.getInstance()
           .invalidate(
@@ -1711,7 +1726,8 @@ public TSStatus invalidateColumnCache(final TInvalidateColumnCacheReq req) {
               req.isIsAttributeColumn());
       return StatusUtils.OK;
     } finally {
-      DataNodeSchemaLockManager.getInstance().releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION);
+      DataNodeSchemaLockManager.getInstance()
+          .releaseWriteLock(SchemaLockType.VALIDATE_VS_DELETION_TABLE);
     }
   }
 

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/lock/SchemaLockType.java

@@ -47,5 +47,17 @@ public enum SchemaLockType {
    *   <li>Release write lock after finishing invalidating schema cache.
    * </ol>
    */
-  VALIDATE_VS_DELETION,
+  VALIDATE_VS_DELETION_TREE,
+
+  /**
+   * This lock is used for guarantee no data without schema after table related deletion.
+   *
+   * <ol>
+   *   <li>Take read lock before validating schema during inserting data or loading TsFile.
+   *   <li>Release read lock after finishing inserting data or loading TsFile.
+   *   <li>Take write lock before invalidating table device cache during table related deletion.
+   *   <li>Release write lock after finishing invalidating table device cache.
+   * </ol>
+   */
+  VALIDATE_VS_DELETION_TABLE,
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetcher.java

@@ -193,7 +193,7 @@ public void fetchAndComputeSchemaWithAutoCreate(
     // The schema cache R/W and fetch operation must be locked together thus the cache clean
     // operation executed by delete timeseries will be effective.
     DataNodeSchemaLockManager.getInstance()
-        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION);
+        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION_TREE);
     try {
       schemaCache.takeReadLock();
       try {
@@ -237,7 +237,7 @@ public void fetchAndComputeSchemaWithAutoCreate(
     // The schema cache R/W and fetch operation must be locked together thus the cache clean
     // operation executed by delete timeSeries will be effective.
     DataNodeSchemaLockManager.getInstance()
-        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION);
+        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION_TREE);
     try {
       schemaCache.takeReadLock();
       try {
@@ -285,7 +285,7 @@ public ISchemaTree fetchSchemaListWithAutoCreate(
     // The schema cache R/W and fetch operation must be locked together thus the cache clean
     // operation executed by delete timeSeries will be effective.
     DataNodeSchemaLockManager.getInstance()
-        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION);
+        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION_TREE);
     try {
       schemaCache.takeReadLock();
       try {

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

@@ -101,7 +101,7 @@ public Optional<TableSchema> validateTableHeaderSchema(
     // The schema cache R/W and fetch operation must be locked together thus the cache clean
     // operation executed by delete timeSeries will be effective.
     DataNodeSchemaLockManager.getInstance()
-        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION);
+        .takeReadLock(context, SchemaLockType.VALIDATE_VS_DELETION_TABLE);
 
     try {
       final List<ColumnSchema> inputColumnList = tableSchema.getColumns();