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 7d1f683eba fix
7d1f683eba is described below
commit 7d1f683eba261ded53a211b294bcfacab5816442
Author: yuqi <y...@datastrato.com>
AuthorDate: Tue Apr 8 20:39:43 2025 +0800
fix
---
.../org/apache/gravitino/catalog/EntityCombinedFileset.java | 4 ++--
.../org/apache/gravitino/catalog/EntityCombinedModel.java | 4 ++--
.../org/apache/gravitino/catalog/EntityCombinedSchema.java | 4 ++--
.../org/apache/gravitino/catalog/EntityCombinedTable.java | 2 +-
.../org/apache/gravitino/catalog/EntityCombinedTopic.java | 2 +-
.../org/apache/gravitino/catalog/OperationDispatcher.java | 10 +++++++---
.../apache/gravitino/catalog/SchemaOperationDispatcher.java | 11 ++---------
.../apache/gravitino/catalog/TableOperationDispatcher.java | 11 ++---------
8 files changed, 19 insertions(+), 29 deletions(-)
diff --git
a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java
b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java
index 14df3e2844..d9521ee0b6 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedFileset.java
@@ -40,11 +40,11 @@ public final class EntityCombinedFileset implements Fileset
{
this.filesetEntity = filesetEntity;
}
- public FilesetEntity getFilesetEntity() {
+ public FilesetEntity filesetEntity() {
return filesetEntity;
}
- public Fileset getFileset() {
+ public Fileset fileset() {
return fileset;
}
diff --git
a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedModel.java
b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedModel.java
index c51f67669a..ef4f9df3fa 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedModel.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedModel.java
@@ -40,11 +40,11 @@ public final class EntityCombinedModel implements Model {
this.modelEntity = modelEntity;
}
- public ModelEntity getModelEntity() {
+ public ModelEntity modelEntity() {
return modelEntity;
}
- public Model getModel() {
+ public Model model() {
return model;
}
diff --git
a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedSchema.java
b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedSchema.java
index ded4c33218..97f20b4cf6 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedSchema.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedSchema.java
@@ -53,11 +53,11 @@ public final class EntityCombinedSchema implements Schema {
this.imported = false;
}
- public SchemaEntity getSchemaEntity() {
+ public SchemaEntity schemaEntity() {
return schemaEntity;
}
- public Schema getSchema() {
+ public Schema schema() {
return schema;
}
diff --git
a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTable.java
b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTable.java
index c064758f51..921b14dcdf 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTable.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTable.java
@@ -59,7 +59,7 @@ public final class EntityCombinedTable implements Table {
this.imported = false;
}
- public TableEntity getTableEntity() {
+ public TableEntity tableEntity() {
return tableEntity;
}
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 a259a2fac7..8b283d05ab 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTopic.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/EntityCombinedTopic.java
@@ -52,7 +52,7 @@ public class EntityCombinedTopic implements Topic {
this.imported = false;
}
- public TopicEntity getTopicEntity() {
+ public TopicEntity topicEntity() {
return topicEntity;
}
diff --git
a/core/src/main/java/org/apache/gravitino/catalog/OperationDispatcher.java
b/core/src/main/java/org/apache/gravitino/catalog/OperationDispatcher.java
index 87daa584f8..401faad8e3 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/OperationDispatcher.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/OperationDispatcher.java
@@ -243,12 +243,16 @@ public abstract class OperationDispatcher {
}
protected <E extends Entity & HasIdentifier> E getEntity(
- NameIdentifier ident, Entity.EntityType type, Class<E> entityClass) {
+ NameIdentifier ident, Entity.EntityType type, Class<E> entityClass,
boolean throwException) {
try {
return store.get(ident, type, entityClass);
} catch (Exception e) {
- LOG.error(FormattedErrorMessages.STORE_OP_FAILURE, "get", ident, e);
- throw new RuntimeException("Fail to check if entity is existed", e);
+ if (throwException) {
+ LOG.error(FormattedErrorMessages.STORE_OP_FAILURE, "get", ident, e);
+ throw new RuntimeException("Fail to check if entity is existed", e);
+ }
+ LOG.warn(FormattedErrorMessages.STORE_OP_FAILURE, "get", ident,
e.getMessage(), e);
+ return null;
}
}
diff --git
a/core/src/main/java/org/apache/gravitino/catalog/SchemaOperationDispatcher.java
b/core/src/main/java/org/apache/gravitino/catalog/SchemaOperationDispatcher.java
index c4d0860cb9..2b66b588e6 100644
---
a/core/src/main/java/org/apache/gravitino/catalog/SchemaOperationDispatcher.java
+++
b/core/src/main/java/org/apache/gravitino/catalog/SchemaOperationDispatcher.java
@@ -22,7 +22,6 @@ import static org.apache.gravitino.Entity.EntityType.SCHEMA;
import static
org.apache.gravitino.catalog.PropertiesMetadataHelpers.validatePropertyForCreate;
import static
org.apache.gravitino.utils.NameIdentifierUtil.getCatalogIdentifier;
-import java.io.IOException;
import java.time.Instant;
import java.util.Map;
import org.apache.gravitino.EntityAlreadyExistsException;
@@ -255,7 +254,7 @@ public class SchemaOperationDispatcher extends
OperationDispatcher implements Sc
if (stringId != null) {
schemaId = stringId.id();
} else {
- schemaId = getEntity(ident, SCHEMA, SchemaEntity.class).id();
+ schemaId = getEntity(ident, SCHEMA, SchemaEntity.class, true).id();
}
SchemaEntity updatedSchemaEntity =
@@ -419,13 +418,7 @@ public class SchemaOperationDispatcher extends
OperationDispatcher implements Sc
// Case 1: The schema is not created by Gravitino or the external system
does not support
// storing string identifiers.
if (stringId == null) {
- SchemaEntity schemaEntity = null;
- try {
- schemaEntity = store.get(ident, SCHEMA, SchemaEntity.class);
- } catch (NoSuchEntityException | IOException e) {
- LOG.debug("Failed to load {} form storage", ident, e);
- }
-
+ SchemaEntity schemaEntity = getEntity(ident, SCHEMA, SchemaEntity.class,
false);
if (schemaEntity == null) {
return EntityCombinedSchema.of(schema)
.withHiddenProperties(
diff --git
a/core/src/main/java/org/apache/gravitino/catalog/TableOperationDispatcher.java
b/core/src/main/java/org/apache/gravitino/catalog/TableOperationDispatcher.java
index 41f8549feb..284d130689 100644
---
a/core/src/main/java/org/apache/gravitino/catalog/TableOperationDispatcher.java
+++
b/core/src/main/java/org/apache/gravitino/catalog/TableOperationDispatcher.java
@@ -26,7 +26,6 @@ import static
org.apache.gravitino.utils.NameIdentifierUtil.getCatalogIdentifier
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
-import java.io.IOException;
import java.time.Instant;
import java.util.Arrays;
import java.util.Collections;
@@ -236,7 +235,7 @@ public class TableOperationDispatcher extends
OperationDispatcher implements Tab
if (stringId != null) {
tableId = stringId.id();
} else {
- tableId = getEntity(ident, TABLE, TableEntity.class).id();
+ tableId = getEntity(ident, TABLE, TableEntity.class, true).id();
}
TableEntity updatedTableEntity =
@@ -465,13 +464,7 @@ public class TableOperationDispatcher extends
OperationDispatcher implements Tab
// Case 1: The table is not created by Gravitino or the external system
does not support storing
// string identifier.
if (stringId == null) {
- TableEntity tableEntity = null;
- try {
- tableEntity = store.get(ident, TABLE, TableEntity.class);
- } catch (NoSuchEntityException | IOException e) {
- LOG.debug("Failed to load {} form storage", ident, e);
- }
-
+ TableEntity tableEntity = getEntity(ident, TABLE, TableEntity.class,
false);
if (tableEntity == null) {
return EntityCombinedTable.of(table)
.withHiddenProperties(
