(gravitino) branch issue_6852 updated: fix

[yuqi4733]

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

yuqi4733 pushed a commit to branch issue_6852
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/issue_6852 by this push:
     new d1f03d5026 fix
d1f03d5026 is described below

commit d1f03d5026338b9336f9c077dcb700218609f903
Author: yuqi <y...@datastrato.com>
AuthorDate: Wed Apr 9 15:25:00 2025 +0800

    fix
---
 .../org/apache/gravitino/catalog/EntityCombinedTopic.java   |  4 ++++
 .../apache/gravitino/catalog/TopicOperationDispatcher.java  | 13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git 
a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTopic.java 
b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTopic.java
index 8b283d05ab..210763821c 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTopic.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTopic.java
@@ -56,6 +56,10 @@ public class EntityCombinedTopic implements Topic {
     return topicEntity;
   }
 
+  public Topic topic() {
+    return topic;
+  }
+
   public static EntityCombinedTopic of(Topic topic, TopicEntity topicEntity) {
     return new EntityCombinedTopic(topic, topicEntity);
   }
diff --git 
a/core/src/main/java/org/apache/gravitino/catalog/TopicOperationDispatcher.java 
b/core/src/main/java/org/apache/gravitino/catalog/TopicOperationDispatcher.java
index 7ecc1107ff..63711a393c 100644
--- 
a/core/src/main/java/org/apache/gravitino/catalog/TopicOperationDispatcher.java
+++ 
b/core/src/main/java/org/apache/gravitino/catalog/TopicOperationDispatcher.java
@@ -321,11 +321,20 @@ public class TopicOperationDispatcher extends 
OperationDispatcher implements Top
 
     StringIdentifier stringId = getStringIdFromProperties(topic.properties());
     if (stringId == null) {
-      return EntityCombinedTopic.of(topic)
+      TopicEntity topicEntity = getEntity(ident, TOPIC, TopicEntity.class);
+      if (topicEntity == null) {
+        return EntityCombinedTopic.of(topic)
+            .withHiddenProperties(
+                getHiddenPropertyNames(
+                    catalogIdent, 
HasPropertyMetadata::topicPropertiesMetadata, topic.properties()))
+            .withImported(false);
+      }
+
+      return EntityCombinedTopic.of(topic, topicEntity)
           .withHiddenProperties(
               getHiddenPropertyNames(
                   catalogIdent, HasPropertyMetadata::topicPropertiesMetadata, 
topic.properties()))
-          .withImported(isEntityExist(ident, TOPIC));
+          .withImported(true);
     }
 
     TopicEntity topicEntity =