Removed ColumnLocationState

deephaven · Jan 29, 2025 · 4527273 · 4527273
1 parent 70788ab
commit 4527273
Showing 1 changed file with 9 additions and 33 deletions.
diff --git a/...ain/java/io/deephaven/engine/table/impl/sources/regioned/RegionedColumnSourceManager.java b/...ain/java/io/deephaven/engine/table/impl/sources/regioned/RegionedColumnSourceManager.java
@@ -603,7 +603,9 @@ private class IncludedTableLocationEntry implements Comparable<IncludedTableLoca
         // New regions indices are assigned in order of insertion, starting from 0 with no re-use of removed indices.
         // If this logic changes, the `getTableAttributes()` logic needs to be updated.
         private final int regionIndex = nextRegionIndex++;
-        private final List<ColumnLocationState<?>> columnLocationStates = new ArrayList<>();
+
+        // Collection of column sources for which we have added a region, useful for invalidating together
+        private final Collection<RegionedColumnSource<?>> regionedColumnSources = new ArrayList<>();
 
         /**
          * RowSet in the region's space, not the table's space.
@@ -631,13 +633,11 @@ private void processInitial(final RowSetBuilderSequential addedRowSetBuilder, fi
                     .appendRange(regionFirstKey + subRegionFirstKey, regionFirstKey + subRegionLastKey));
 
             for (final ColumnDefinition<?> columnDefinition : columnDefinitions) {
-                // noinspection unchecked,rawtypes
-                final ColumnLocationState<?> state = new ColumnLocationState(
-                        columnDefinition,
-                        columnSources.get(columnDefinition.getName()),
-                        location.getColumnLocation(columnDefinition.getName()));
-                columnLocationStates.add(state);
-                state.regionAllocated(regionIndex);
+                final RegionedColumnSource<?> regionedColumnSource = columnSources.get(columnDefinition.getName());
+                final ColumnLocation columnLocation = location.getColumnLocation(columnDefinition.getName());
+                Assert.eq(regionIndex, "regionIndex", regionedColumnSource.addRegion(columnDefinition, columnLocation),
+                        "regionedColumnSource.addRegion((definition, location)");
+                regionedColumnSources.add(regionedColumnSource);
             }
 
             rowSetAtLastUpdate = initialRowSet;
@@ -710,7 +710,7 @@ private boolean pollUpdates(final RowSetBuilderSequential addedRowSetBuilder) {
         }
 
         private void invalidate() {
-            columnLocationStates.forEach(cls -> cls.source.invalidateRegion(regionIndex));
+            regionedColumnSources.forEach(source -> source.invalidateRegion(regionIndex));
         }
 
         @Override
@@ -734,30 +734,6 @@ public ImmutableTableLocationKey getKey(
                 }
             };
 
-    /**
-     * Batches up a definition, source, and location for ease of use. Implements grouping maintenance.
-     */
-    private static class ColumnLocationState<T> {
-
-        protected final ColumnDefinition<T> definition;
-        protected final RegionedColumnSource<T> source;
-        protected final ColumnLocation location;
-
-        private ColumnLocationState(
-                ColumnDefinition<T> definition,
-                RegionedColumnSource<T> source,
-                ColumnLocation location) {
-            this.definition = definition;
-            this.source = source;
-            this.location = location;
-        }
-
-        private void regionAllocated(final int regionIndex) {
-            Assert.eq(regionIndex, "regionIndex", source.addRegion(definition, location),
-                    "source.addRegion((definition, location)");
-        }
-    }
-
     public Map<String, Object> getTableAttributes(
             @NotNull TableUpdateMode tableUpdateMode,
             @NotNull TableUpdateMode tableLocationUpdateMode) {