Merge pull request #72 from bmvkrd/57-ice-catalog-hangs-on-metadata-delete

Fixing corrupted metadata issue (#57)

Author: shyiko

ice/src/main/java/com/altinity/ice/cli/internal/cmd/Describe.java

@@ -29,6 +29,7 @@
 import org.apache.iceberg.TableScan;
 import org.apache.iceberg.catalog.Namespace;
 import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.ServiceFailureException;
 import org.apache.iceberg.io.CloseableIterable;
 import org.apache.iceberg.rest.RESTCatalog;
 import org.apache.iceberg.types.Conversions;
@@ -74,42 +75,17 @@ public static void run(RESTCatalog catalog, String target, boolean json, Option.
         if (targetTable != null && !targetTable.equals(tableId.name())) {
           continue;
         }
-        org.apache.iceberg.Table table = catalog.loadTable(tableId);
-        Snapshot snapshot = table.currentSnapshot();
-        Table.Snapshot snapshotInfo = null;
-        if (snapshot != null) {
-          snapshotInfo =
-              new Table.Snapshot(
-                  snapshot.sequenceNumber(),
-                  snapshot.snapshotId(),
-                  snapshot.parentId(),
-                  snapshot.timestampMillis(),
-                  Instant.ofEpochMilli(snapshot.timestampMillis()).toString(),
-                  Instant.ofEpochMilli(snapshot.timestampMillis())
-                      .atZone(ZoneId.systemDefault())
-                      .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME),
-                  snapshot.operation(),
-                  snapshot.summary(),
-                  snapshot.manifestListLocation());
-        }
 
-        List<Table.Metrics> metrics = null;
-        if (optionsSet.contains(Option.INCLUDE_METRICS)) {
-          metrics = gatherTableMetrics(table);
+        Describe.Table.Data tableData = null;
+        Table.Metadata tableMetadata;
+        try {
+          tableData = gatherTableData(catalog, tableId, optionsSet);
+          tableMetadata = new Table.Metadata(tableId.toString());
+        } catch (ServiceFailureException e) {
+          tableMetadata = new Table.Metadata(tableId.toString(), e.getMessage());
         }
 
-        boolean includeSchema = optionsSet.contains(Option.INCLUDE_SCHEMA);
-        Table.Data tableData =
-            new Table.Data(
-                includeSchema ? table.schema().toString() : null,
-                includeSchema ? table.spec().toString() : null,
-                includeSchema ? table.sortOrder().toString() : null,
-                optionsSet.contains(Option.INCLUDE_PROPERTIES) ? table.properties() : null,
-                table.location(),
-                snapshotInfo,
-                metrics);
-
-        tablesMetadata.add(new Table("Table", new Table.Metadata(tableId.toString()), tableData));
+        tablesMetadata.add(new Table("Table", tableMetadata, tableData));
       }
     }
 
@@ -125,6 +101,45 @@ public static void run(RESTCatalog catalog, String target, boolean json, Option.
     }
   }
 
+  private static Table.Data gatherTableData(
+      RESTCatalog catalog, TableIdentifier tableId, Set<Describe.Option> optionsSet)
+      throws IOException {
+
+    org.apache.iceberg.Table table = catalog.loadTable(tableId);
+    Snapshot snapshot = table.currentSnapshot();
+    Table.Snapshot snapshotInfo = null;
+    if (snapshot != null) {
+      snapshotInfo =
+          new Table.Snapshot(
+              snapshot.sequenceNumber(),
+              snapshot.snapshotId(),
+              snapshot.parentId(),
+              snapshot.timestampMillis(),
+              Instant.ofEpochMilli(snapshot.timestampMillis()).toString(),
+              Instant.ofEpochMilli(snapshot.timestampMillis())
+                  .atZone(ZoneId.systemDefault())
+                  .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME),
+              snapshot.operation(),
+              snapshot.summary(),
+              snapshot.manifestListLocation());
+    }
+
+    List<Table.Metrics> metrics = null;
+    if (optionsSet.contains(Option.INCLUDE_METRICS)) {
+      metrics = gatherTableMetrics(table);
+    }
+
+    boolean includeSchema = optionsSet.contains(Option.INCLUDE_SCHEMA);
+    return new Table.Data(
+        includeSchema ? table.schema().toString() : null,
+        includeSchema ? table.spec().toString() : null,
+        includeSchema ? table.sortOrder().toString() : null,
+        optionsSet.contains(Option.INCLUDE_PROPERTIES) ? table.properties() : null,
+        table.location(),
+        snapshotInfo,
+        metrics);
+  }
+
   private static List<Table.Metrics> gatherTableMetrics(org.apache.iceberg.Table table)
       throws IOException {
     List<Table.Metrics> metricsList = new ArrayList<>();
@@ -218,7 +233,13 @@ record Table(String kind, Table.Metadata metadata, Table.Data data) {
       }
     }
 
-    record Metadata(String id) {}
+    record Metadata(String id, String status) {
+      static final String STATUS_OK = "OK";
+
+      Metadata(String id) {
+        this(id, STATUS_OK);
+      }
+    }
 
     record Data(
         String schemaRaw,