Fix agg.py imports.

deephaven · Nov 7, 2024 · da008ce · da008ce
1 parent a4e320a
commit da008ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/...le/src/main/java/io/deephaven/engine/table/impl/by/FormulaMultiColumnChunkedOperator.java b/...le/src/main/java/io/deephaven/engine/table/impl/by/FormulaMultiColumnChunkedOperator.java
@@ -309,14 +309,10 @@ public void propagateUpdates(@NotNull final TableUpdate downstream,
             if (removesToProcess && !resultColumn.getType().isPrimitive()) {
                 dataCopyContext.clearObjectColumnData(downstream.removed());
             }
-            if (modifiesToProcess && addsToProcess) {
-                // Union the rowsets and do a single pass for efficiency.
-                try (final RowSequence combinedRowSequence = downstream.modified().union(downstream.added())) {
-                    dataCopyContext.copyData(combinedRowSequence);
-                }
-            } else if (modifiesToProcess) {
+            if (modifiesToProcess) {
                 dataCopyContext.copyData(downstream.modified());
-            } else {
+            }
+            if (addsToProcess) {
                 dataCopyContext.copyData(downstream.added());
             }
         }

diff --git a/py/client/pydeephaven/agg.py b/py/client/pydeephaven/agg.py
@@ -5,7 +5,7 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import List, Union, Any
+from typing import List, Union, Any, Optional
 
 import numpy as np
 

diff --git a/py/server/deephaven/agg.py b/py/server/deephaven/agg.py
@@ -3,7 +3,7 @@
 #
 """This module implement various aggregations that can be used in deephaven table's aggregation operations."""
 
-from typing import List, Union, Any
+from typing import List, Union, Any, Optional
 
 import jpy