Change IcebergInstructions refreshing indicator to enum instead of bo…

…olean
deephaven · Jul 2, 2024 · 264fdb1 · 264fdb1
1 parent a8d957a
commit 264fdb1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java
@@ -508,7 +508,23 @@ private Table readTableInternal(
                     userInstructions);
         }
 
-        if (instructions.isRefreshing()) {
+        if (instructions.refreshing() == IcebergInstructions.IcebergRefreshing.STATIC) {
+            description = "Read static iceberg table with " + keyFinder;
+            updateSourceRegistrar = null;
+
+            final AbstractTableLocationProvider locationProvider = new PollingTableLocationProvider<>(
+                    StandaloneTableKey.getInstance(),
+                    keyFinder,
+                    new IcebergTableLocationFactory(),
+                    null);
+
+            return new PartitionAwareSourceTable(
+                    tableDef,
+                    description,
+                    RegionedTableComponentFactoryImpl.INSTANCE,
+                    locationProvider,
+                    updateSourceRegistrar);
+        } else if (instructions.refreshing() == IcebergInstructions.IcebergRefreshing.MANUAL_REFRESHING) {
             description = "Read refreshing iceberg table with " + keyFinder;
             updateSourceRegistrar = ExecutionContext.getContext().getUpdateGraph();
 
@@ -528,22 +544,9 @@ private Table readTableInternal(
                     locationProvider,
                     updateSourceRegistrar);
         } else {
-            description = "Read static iceberg table with " + keyFinder;
-            updateSourceRegistrar = null;
-
-            final AbstractTableLocationProvider locationProvider = new PollingTableLocationProvider<>(
-                    StandaloneTableKey.getInstance(),
-                    keyFinder,
-                    new IcebergTableLocationFactory(),
-                    null);
-
-            return new PartitionAwareSourceTable(
-                    tableDef,
-                    description,
-                    RegionedTableComponentFactoryImpl.INSTANCE,
-                    locationProvider,
-                    updateSourceRegistrar);
+            throw new UnsupportedOperationException("Unsupported refreshing mode: " + instructions.refreshing());
         }
+
     }
 
     private static KnownLocationKeyFinder<IcebergTableLocationKey> toKnownKeys(

diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergInstructions.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergInstructions.java
@@ -25,6 +25,12 @@ public abstract class IcebergInstructions {
     @SuppressWarnings("unused")
     public static final IcebergInstructions DEFAULT = builder().build();
 
+    public enum IcebergRefreshing {
+        STATIC,
+        AUTO_REFRESHING,
+        MANUAL_REFRESHING
+    }
+
     public static Builder builder() {
         return ImmutableIcebergInstructions.builder();
     }
@@ -47,8 +53,8 @@ public static Builder builder() {
     public abstract Map<String, String> columnRenames();
 
     @Value.Default
-    public Boolean isRefreshing() {
-        return false;
+    public IcebergRefreshing refreshing() {
+        return IcebergRefreshing.STATIC;
     }
 
     public interface Builder {
@@ -65,7 +71,7 @@ public interface Builder {
         Builder putAllColumnRenames(Map<String, ? extends String> entries);
 
         @SuppressWarnings("unused")
-        Builder isRefreshing(Boolean isRefreshing);
+        Builder refreshing(IcebergRefreshing refreshing);
 
         IcebergInstructions build();
     }