Address comments

apache · Sep 21, 2023 · c050c00 · c050c00
1 parent c37aca9
commit c050c00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/java/com/datastrato/graviton/catalog/CatalogOperationDispatcher.java b/core/src/main/java/com/datastrato/graviton/catalog/CatalogOperationDispatcher.java
@@ -518,21 +518,19 @@ private <R extends HasIdentifier> R operateOnEntity(
       String opName,
       long id,
       boolean shouldFail) {
-    R ret;
+    R ret = null;
     try {
       ret = fn.apply(ident);
     } catch (NoSuchEntityException e) {
       // Case 2: The table is created by Graviton, but has no corresponding entity in Graviton.
       LOG.error(FormattedErrorMessages.ENTITY_NOT_FOUND, ident);
-      ret = null;
     } catch (Exception e) {
       // Case 3: The table is created by Graviton, but failed to operate the corresponding entity
       // in Graviton.
       if (shouldFail) {
         throw new RuntimeException(e);
       } else {
         LOG.error(FormattedErrorMessages.STORE_OP_FAILURE, opName, ident, e);
-        ret = null;
       }
     }
 

diff --git a/core/src/main/java/com/datastrato/graviton/meta/SchemaEntity.java b/core/src/main/java/com/datastrato/graviton/meta/SchemaEntity.java
@@ -97,7 +97,7 @@ public EntityType type() {
     return EntityType.SCHEMA;
   }
 
-  // Ignore field namespace and comment
+  // Ignore field namespace
   @Override
   public boolean equals(Object o) {
     if (this == o) {

diff --git a/core/src/main/java/com/datastrato/graviton/meta/TableEntity.java b/core/src/main/java/com/datastrato/graviton/meta/TableEntity.java
@@ -105,6 +105,7 @@ public boolean equals(Object o) {
       return false;
     }
 
+    // Ignore field namespace
     TableEntity baseTable = (TableEntity) o;
     return Objects.equal(id, baseTable.id)
         && Objects.equal(name, baseTable.name)