tejasiyer-dev commented on code in PR #40543:
URL: https://github.com/apache/beam/pull/40543#discussion_r4606715407


##########
runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java:
##########
@@ -2683,6 +2685,11 @@ static class StreamingShardedWriteFactory<UserT, 
DestinationT, OutputT>
           replacement = replacement.withWindowedWrites();
         }
 
+        Long directWriteThreshold = getDirectWriteThreshold(transform);
+        if (directWriteThreshold != null) {
+          replacement = 
replacement.withDirectWriteByteThreshold(directWriteThreshold);

Review Comment:
   The override builds a new WriteFiles.to(sink) and only copies side inputs, 
windowed writes and autosharding, so without this line the threshold would be 
null on Dataflow streaming and direct write would never run there.
   
   You're right that batchSize and the others aren't copied, so they're 
silently ignored on this path today. Should I copy all of them in this PR, or 
do it as a follow-up?



##########
sdks/java/core/src/main/java/org/apache/beam/sdk/util/BundleLifter.java:
##########
@@ -57,89 +85,312 @@ public class BundleLifter<T> extends 
PTransform<PCollection<T>, PCollectionTuple
 
   final TupleTag<T> smallBatchTag;
   final TupleTag<T> largeBatchTag;
-  final int threshold;
+  final long threshold;
+  final long maxBufferedBytes;
   final SerializableFunction<T, Integer> elementSizer;
+  final @Nullable SerializableFunction<T, ? extends @Nullable Object> keyFn;
+
+  /** The default memory cap: twice the threshold. */
+  static long defaultMaxBufferedBytes(long threshold) {
+    return threshold > Long.MAX_VALUE / 2 ? Long.MAX_VALUE : 2 * threshold;
+  }
 
   /**
-   * A DoFn that buffers elements within a bundle and outputs them to 
different tags in
-   * finish_bundle based on the total bundle size.
+   * A DoFn that buffers elements per key within a bundle and outputs them to 
the large tag once a
+   * key reaches the threshold, or to the small tag otherwise.
    *
    * @param <T> The type of elements being processed.
    */
   static class BundleLiftDoFn<T> extends DoFn<T, Void> {
     private static final Logger LOG = 
LoggerFactory.getLogger(BundleLiftDoFn.class);
 
+    /** The key shared by all elements without a key, or whose key function 
returns null. */
+    private static final Object UNKEYED = new Object();
+
     final TupleTag<T> smallBatchTag;
     final TupleTag<T> largeBatchTag;
-    final int threshold;
+    final long threshold;
+    final long maxBufferedBytes;
     final SerializableFunction<T, Integer> elementSizer;
+    final @Nullable SerializableFunction<T, ? extends @Nullable Object> keyFn;
 
-    private transient @MonotonicNonNull List<T> buffer;
-    private transient long bundleSizeBytes;
-    private transient @Nullable MultiOutputReceiver receiver;
+    // Per-bundle state, allocated once in setup and cleared at the start of 
each bundle.
+    private transient @MonotonicNonNull Map<Object, KeyBuffer<T>> buffers;
+    private transient @MonotonicNonNull Set<Object> liftedKeys;
+    // Reset in startBundle; not transient so SpotBugs doesn't flag them as 
unrestored state.
+    private long bufferedBytes;
+    // Set once the memory cap has been exceeded in this bundle: keys that are 
neither buffered nor
+    // lifted are no longer tracked and go to the small output immediately.
+    private boolean keysFinalized;
 
     BundleLiftDoFn(
         TupleTag<T> smallBatchTag,
         TupleTag<T> largeBatchTag,
-        int threshold,
+        long threshold,
         SerializableFunction<T, Integer> elementSizer) {
+      this(smallBatchTag, largeBatchTag, threshold, elementSizer, null);
+    }
+
+    BundleLiftDoFn(
+        TupleTag<T> smallBatchTag,
+        TupleTag<T> largeBatchTag,
+        long threshold,
+        SerializableFunction<T, Integer> elementSizer,
+        @Nullable SerializableFunction<T, ? extends @Nullable Object> keyFn) {
+      this(
+          smallBatchTag,
+          largeBatchTag,
+          threshold,
+          defaultMaxBufferedBytes(threshold),
+          elementSizer,
+          keyFn);
+    }
+
+    BundleLiftDoFn(
+        TupleTag<T> smallBatchTag,
+        TupleTag<T> largeBatchTag,
+        long threshold,
+        long maxBufferedBytes,
+        SerializableFunction<T, Integer> elementSizer,
+        @Nullable SerializableFunction<T, ? extends @Nullable Object> keyFn) {
       this.smallBatchTag = smallBatchTag;
       this.largeBatchTag = largeBatchTag;
       this.threshold = threshold;
+      this.maxBufferedBytes = maxBufferedBytes;
       this.elementSizer = elementSizer;
+      this.keyFn = keyFn;
+    }
+
+    @Setup
+    public void setup() {
+      buffers = new LinkedHashMap<>();
+      liftedKeys = new HashSet<>();
     }
 
     @StartBundle
     public void startBundle() {
-      buffer = new ArrayList<>();
-      receiver = null;
-      bundleSizeBytes = 0L;
+      checkStateNotNull(buffers, "Buffers should be set by setup.").clear();
+      checkStateNotNull(liftedKeys, "Lifted keys should be set by 
setup.").clear();
+      bufferedBytes = 0L;
+      keysFinalized = false;
     }
 
     @ProcessElement
-    public void processElement(@Element T element, MultiOutputReceiver mor) {
-      if (receiver == null) {
-        receiver = mor;
+    public void processElement(
+        @Element T element,
+        @Timestamp Instant timestamp,
+        BoundedWindow window,
+        PaneInfo pane,
+        MultiOutputReceiver receiver) {
+      Map<Object, KeyBuffer<T>> buffers =
+          checkStateNotNull(this.buffers, "Buffers should be set by setup.");
+      Set<Object> liftedKeys =
+          checkStateNotNull(this.liftedKeys, "Lifted keys should be set by 
setup.");
+
+      Object key;
+      if (keyFn == null) {
+        key = UNKEYED;
+      } else {
+        @Nullable Object userKey = keyFn.apply(element);
+        key = new WindowedKey(window, pane, userKey == null ? UNKEYED : 
userKey);
+      }
+
+      if (liftedKeys.contains(key)) {
+        // This key already reached the threshold in this bundle; stream it 
through.
+        receiver.get(largeBatchTag).output(element);
+        return;
+      }
+
+      KeyBuffer<T> buffer = buffers.get(key);
+      if (buffer == null) {
+        if (keysFinalized) {
+          // The memory cap was exceeded earlier in this bundle; don't track 
new keys.
+          receiver.get(smallBatchTag).output(element);
+          return;
+        }
+        buffer = new KeyBuffer<>();
+        buffers.put(key, buffer);
+      }
+      long elementBytes = elementSizer.apply(element);
+      buffer.add(new BufferedElement<>(element, timestamp, window, pane), 
elementBytes);
+      bufferedBytes += elementBytes;
+
+      if (buffer.sizeBytes >= threshold) {
+        buffers.remove(key);
+        bufferedBytes -= buffer.sizeBytes;
+        liftedKeys.add(key);
+        LOG.debug(
+            "Key reached {} estimated bytes; emitting {} buffered elements to 
tag: '{}'",
+            buffer.sizeBytes,
+            buffer.elements.size(),
+            largeBatchTag.getId());
+        emit(buffer, receiver.get(largeBatchTag));
+        return;
+      }
+
+      // Anything that isn't in lifted keys or buffers is sent to small keys 
immediately.
+      if (bufferedBytes > maxBufferedBytes) {
+        keysFinalized = true;
+        evictSmallestKeys(buffers, receiver.get(smallBatchTag));
       }
-      checkArgumentNotNull(buffer, "Buffer should be set by startBundle.");
-      buffer.add(element);
-      bundleSizeBytes += elementSizer.apply(element);
     }
 
     @FinishBundle
-    public void finishBundle() {
-      checkArgumentNotNull(buffer, "Buffer should be set by startBundle.");
-      if (buffer.isEmpty()) {
-        return;
+    public void finishBundle(FinishBundleContext context) {
+      Map<Object, KeyBuffer<T>> buffers =
+          checkStateNotNull(this.buffers, "Buffers should be set by setup.");
+      for (KeyBuffer<T> buffer : buffers.values()) {
+        LOG.debug(
+            "Emitting {} elements of {} estimated bytes to tag: '{}'",
+            buffer.elements.size(),
+            buffer.sizeBytes,
+            smallBatchTag.getId());
+        for (BufferedElement<T> e : buffer.elements) {
+          context.output(smallBatchTag, e.value, e.timestamp, e.window);
+        }
       }
+      buffers.clear();
+      checkStateNotNull(this.liftedKeys).clear();
+      bufferedBytes = 0L;
+      keysFinalized = false;
+    }
 
-      // Select the target tag based on the bundle size
-      TupleTag<T> targetTag;
-      targetTag = (bundleSizeBytes < threshold) ? smallBatchTag : 
largeBatchTag;
-      LOG.debug(
-          "Emitting {} elements of {} estimated bytes to tag: '{}'",
-          buffer.size(),
-          bundleSizeBytes,
-          targetTag.getId());
+    /**
+     * Buffered elements are re-emitted from {@link ProcessElement} with their 
own timestamps, which
+     * may be earlier than the current element's. This is safe because they 
belong to the same
+     * bundle, so the input watermark is still held at or before them.
+     */
+    @Override
+    public Duration getAllowedTimestampSkew() {
+      return Duration.millis(Long.MAX_VALUE);
+    }
 
-      checkArgumentNotNull(receiver, "Receiver should be set by startBundle.");
-      OutputReceiver<T> taggedOutput = receiver.get(targetTag);
+    /**
+     * Emits the smallest keys to the small output until at most half of 
{@code maxBufferedBytes}
+     * remains buffered, so each call frees a large chunk and the sort's cost 
stays amortized.
+     */
+    private void evictSmallestKeys(Map<Object, KeyBuffer<T>> buffers, 
OutputReceiver<T> small) {
+      long target = maxBufferedBytes / 2;
+      List<Map.Entry<Object, KeyBuffer<T>>> bySize = new 
ArrayList<>(buffers.entrySet());
+      bySize.sort(Comparator.comparingLong(entry -> 
entry.getValue().sizeBytes));
+      for (Map.Entry<Object, KeyBuffer<T>> entry : bySize) {
+        if (bufferedBytes <= target) {
+          break;
+        }
+        KeyBuffer<T> buffer = entry.getValue();
+        buffers.remove(entry.getKey());
+        bufferedBytes -= buffer.sizeBytes;
+        emit(buffer, small);
+      }
+    }
 
-      for (T element : buffer) {
-        taggedOutput.output(element);
+    private static <T> void emit(KeyBuffer<T> buffer, OutputReceiver<T> 
receiver) {
+      for (BufferedElement<T> e : buffer.elements) {
+        receiver.outputWindowedValue(
+            e.value, e.timestamp, Collections.singletonList(e.window), e.pane);
       }
     }
   }
 
-  private BundleLifter(TupleTag<T> smallBatchTag, TupleTag<T> largeBatchTag, 
int threshold) {
-    this(smallBatchTag, largeBatchTag, threshold, x -> 1);
+  /** The buffered elements of one key, in arrival order. */
+  private static class KeyBuffer<T> {
+    private final List<BufferedElement<T>> elements = new ArrayList<>();
+    private long sizeBytes;
+
+    void add(BufferedElement<T> element, long elementBytes) {
+      elements.add(element);
+      sizeBytes += elementBytes;
+    }
+  }
+
+  /** A buffered element with the metadata needed to re-emit it. */
+  private static class BufferedElement<T> {
+    private final T value;
+    private final Instant timestamp;
+    private final BoundedWindow window;
+    private final PaneInfo pane;
+
+    BufferedElement(T value, Instant timestamp, BoundedWindow window, PaneInfo 
pane) {
+      this.value = value;
+      this.timestamp = timestamp;
+      this.window = window;
+      this.pane = pane;
+    }
+  }
+
+  /** A user key scoped to a window and pane. */
+  private static class WindowedKey {
+    private final BoundedWindow window;
+    private final PaneInfo pane;
+    private final Object key;
+
+    WindowedKey(BoundedWindow window, PaneInfo pane, Object key) {
+      this.window = window;
+      this.pane = pane;
+      this.key = key;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (!(o instanceof WindowedKey)) {
+        return false;
+      }
+      WindowedKey other = (WindowedKey) o;
+      return window.equals(other.window) && pane.equals(other.pane) && 
key.equals(other.key);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(window, pane, key);
+    }
+  }
+
+  /** Sizes elements by their encoded size under the given coder. */
+  private static class CoderSizer<T> implements SerializableFunction<T, 
Integer> {
+    private final Coder<T> coder;
+
+    CoderSizer(Coder<T> coder) {
+      this.coder = coder;
+    }
+
+    @Override
+    public Integer apply(T element) {
+      try {
+        long bytes;
+        if (coder.isRegisterByteSizeObserverCheap(element)) {
+          SizeObserver observer = new SizeObserver();
+          coder.registerByteSizeObserver(element, observer);
+          observer.advance();
+          bytes = observer.bytes;
+        } else {
+          bytes = CoderUtils.encodeToByteArray(coder, element).length;

Review Comment:
   Done. CoderSizer now uses registerByteSizeObserver.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to