check schema

apache · Jun 5, 2024 · 219641e · 219641e
1 parent d5ca7e7
commit 219641e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/core/src/main/java/com/datastrato/gravitino/catalog/TableOperationDispatcher.java b/core/src/main/java/com/datastrato/gravitino/catalog/TableOperationDispatcher.java
@@ -10,6 +10,7 @@
 import static com.datastrato.gravitino.rel.expressions.transforms.Transforms.EMPTY_TRANSFORM;
 
 import com.datastrato.gravitino.EntityStore;
+import com.datastrato.gravitino.GravitinoEnv;
 import com.datastrato.gravitino.NameIdentifier;
 import com.datastrato.gravitino.Namespace;
 import com.datastrato.gravitino.StringIdentifier;
@@ -88,8 +89,12 @@ public Table loadTable(NameIdentifier ident) throws NoSuchTableException {
       return table;
     }
 
-    TreeLockUtils.doWithTreeLock(
-        NameIdentifier.of(ident.namespace().levels()), LockType.WRITE, () -> importTable(ident));
+    if (GravitinoEnv.getInstance()
+        .schemaDispatcher()
+        .schemaExists(NameIdentifier.of(ident.namespace().levels()))) {
+      TreeLockUtils.doWithTreeLock(
+          NameIdentifier.of(ident.namespace().levels()), LockType.WRITE, () -> importTable(ident));
+    }
 
     return table;
   }

diff --git a/core/src/main/java/com/datastrato/gravitino/catalog/TopicOperationDispatcher.java b/core/src/main/java/com/datastrato/gravitino/catalog/TopicOperationDispatcher.java
@@ -9,6 +9,7 @@
 import static com.datastrato.gravitino.catalog.PropertiesMetadataHelpers.validatePropertyForCreate;
 
 import com.datastrato.gravitino.EntityStore;
+import com.datastrato.gravitino.GravitinoEnv;
 import com.datastrato.gravitino.NameIdentifier;
 import com.datastrato.gravitino.Namespace;
 import com.datastrato.gravitino.StringIdentifier;
@@ -79,8 +80,12 @@ public Topic loadTopic(NameIdentifier ident) throws NoSuchTopicException {
       return topic;
     }
 
-    TreeLockUtils.doWithTreeLock(
-        NameIdentifier.of(ident.namespace().levels()), LockType.WRITE, () -> importTopic(ident));
+    if (GravitinoEnv.getInstance()
+        .schemaDispatcher()
+        .schemaExists(NameIdentifier.of(ident.namespace().levels()))) {
+      TreeLockUtils.doWithTreeLock(
+          NameIdentifier.of(ident.namespace().levels()), LockType.WRITE, () -> importTopic(ident));
+    }
     return topic;
   }