Fix for #22951 #22953
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -24,6 +24,8 @@ | |||||
| import java.util.ArrayList; | ||||||
| import java.util.Iterator; | ||||||
| import java.util.List; | ||||||
| import java.util.Set; | ||||||
| import java.util.stream.Collectors; | ||||||
| import org.apache.beam.sdk.coders.IterableCoder; | ||||||
| import org.apache.beam.sdk.coders.KvCoder; | ||||||
| import org.apache.beam.sdk.coders.StringUtf8Coder; | ||||||
|
|
@@ -51,8 +53,13 @@ | |||||
| import org.apache.beam.sdk.values.KV; | ||||||
| import org.apache.beam.sdk.values.PCollection; | ||||||
| import org.apache.beam.sdk.values.TimestampedValue; | ||||||
| import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; | ||||||
| import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; | ||||||
| import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; | ||||||
| import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; | ||||||
| import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Streams; | ||||||
| import org.hamcrest.MatcherAssert; | ||||||
| import org.hamcrest.Matchers; | ||||||
| import org.joda.time.Duration; | ||||||
| import org.joda.time.Instant; | ||||||
| import org.junit.Rule; | ||||||
|
|
@@ -116,16 +123,6 @@ public void testInGlobalWindowBatchSizeCount() { | |||||
| PAssert.that("Incorrect batch size in one or more elements", collection) | ||||||
| .satisfies( | ||||||
| new SerializableFunction<Iterable<KV<String, Iterable<String>>>, Void>() { | ||||||
|
There was a problem hiding this comment. I did notice that it's There was a problem hiding this comment. I would say that this previous test was too strict and your update makes sense. GroupIntoBatches ensures that the batches aren't bigger than BATCH_SIZE elements. Unfortunately I think the GroupIntoBatches specification is too loose since it uses words like There was a problem hiding this comment. Actually I think I did solved that. I mean apart from the inaccuracy of the weigher. |
||||||
| @Override | ||||||
| public Void apply(Iterable<KV<String, Iterable<String>>> input) { | ||||||
| assertTrue(checkBatchSizes(input)); | ||||||
|
|
@@ -155,28 +152,9 @@ public void testInGlobalWindowBatchSizeByteSize() { | |||||
| PAssert.that("Incorrect batch size in one or more elements", collection) | ||||||
| .satisfies( | ||||||
| new SerializableFunction<Iterable<KV<String, Iterable<String>>>, Void>() { | ||||||
| @Override | ||||||
| public Void apply(Iterable<KV<String, Iterable<String>>> input) { | ||||||
| assertTrue(checkBatchByteSizes(input)); | ||||||
| return null; | ||||||
| } | ||||||
| }); | ||||||
|
|
@@ -194,46 +172,27 @@ public Void apply(Iterable<KV<String, Iterable<String>>> input) { | |||||
| UsesOnWindowExpiration.class | ||||||
| }) | ||||||
| public void testInGlobalWindowBatchSizeByteSizeFn() { | ||||||
| SerializableFunction<String, Long> getElementByteSizeFn = | ||||||
| s -> { | ||||||
| try { | ||||||
| return 2 * StringUtf8Coder.of().getEncodedElementByteSize(s); | ||||||
| } catch (Exception e) { | ||||||
| throw new RuntimeException(e); | ||||||
| } | ||||||
| }; | ||||||
|
|
||||||
| PCollection<KV<String, Iterable<String>>> collection = | ||||||
| pipeline | ||||||
| .apply("Input data", Create.of(data)) | ||||||
| .apply(GroupIntoBatches.ofByteSize(BATCH_SIZE_BYTES, getElementByteSizeFn)) | ||||||
| // set output coder | ||||||
| .setCoder(KvCoder.of(StringUtf8Coder.of(), IterableCoder.of(StringUtf8Coder.of()))); | ||||||
| PAssert.that("Incorrect batch size in one or more elements", collection) | ||||||
| .satisfies( | ||||||
| new SerializableFunction<Iterable<KV<String, Iterable<String>>>, Void>() { | ||||||
| @Override | ||||||
| public Void apply(Iterable<KV<String, Iterable<String>>> input) { | ||||||
| assertTrue(checkBatchByteSizes(input, getElementByteSizeFn)); | ||||||
| return null; | ||||||
| } | ||||||
| }); | ||||||
|
|
@@ -267,20 +226,9 @@ public void testWithShardedKeyInGlobalWindow() { | |||||
| PAssert.that("Incorrect batch size in one or more elements", collection) | ||||||
|
There was a problem hiding this comment. We should move the comment just above into There was a problem hiding this comment. Erhm, isn't this comment only valid for |
||||||
| .satisfies( | ||||||
| new SerializableFunction<Iterable<KV<ShardedKey<String>, Iterable<String>>>, Void>() { | ||||||
| @Override | ||||||
| public Void apply(Iterable<KV<ShardedKey<String>, Iterable<String>>> input) { | ||||||
| assertTrue(checkBatchSizes(input, batchSize)); | ||||||
| return null; | ||||||
| } | ||||||
| }); | ||||||
|
|
@@ -353,17 +301,6 @@ public void testWithUnevenBatches() { | |||||
| PAssert.that("Incorrect batch size in one or more elements", collection) | ||||||
| .satisfies( | ||||||
| new SerializableFunction<Iterable<KV<String, Iterable<String>>>, Void>() { | ||||||
| @Override | ||||||
| public Void apply(Iterable<KV<String, Iterable<String>>> input) { | ||||||
| assertTrue(checkBatchSizes(input)); | ||||||
|
|
@@ -709,4 +646,118 @@ public void processElement(ProcessContext c, BoundedWindow window) { | |||||
|
|
||||||
| pipeline.run().waitUntilFinish(); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| @Category({ | ||||||
| ValidatesRunner.class, | ||||||
| NeedsRunner.class, | ||||||
| UsesTimersInParDo.class, | ||||||
| UsesStatefulParDo.class, | ||||||
| UsesOnWindowExpiration.class | ||||||
| }) | ||||||
| public void testMultipleLimitsAtOnceInGlobalWindowBatchSizeCountAndBatchSizeByteSize() { | ||||||
| // with using only one of the limits the result would be only 2 batches, | ||||||
| // if we have 3 both limit works | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. done in |
||||||
| List<KV<String, String>> dataToUse = | ||||||
| Lists.newArrayList( | ||||||
| "a-1", | ||||||
| "a-2", | ||||||
| "a-3" + Strings.repeat("-", 100), | ||||||
| // byte size limit reached (BATCH_SIZE_BYTES = 25) | ||||||
| "b-4", | ||||||
| "b-5", | ||||||
| "b-6", | ||||||
| "b-7", | ||||||
| "b-8", | ||||||
| // count limit reached (BATCH_SIZE = 5) | ||||||
| "c-9") | ||||||
| .stream() | ||||||
| .map(s -> KV.of("key", s)) | ||||||
| .collect(Collectors.toList()); | ||||||
| PCollection<KV<String, Iterable<String>>> collection = | ||||||
| pipeline | ||||||
| .apply("Input data", Create.of(dataToUse)) | ||||||
| .apply( | ||||||
| GroupIntoBatches.<String, String>ofSize(BATCH_SIZE).withByteSize(BATCH_SIZE_BYTES)) | ||||||
| // set output coder | ||||||
| .setCoder(KvCoder.of(StringUtf8Coder.of(), IterableCoder.of(StringUtf8Coder.of()))); | ||||||
| PAssert.that("Incorrect batch size in one or more elements", collection) | ||||||
| .satisfies( | ||||||
| new SerializableFunction<Iterable<KV<String, Iterable<String>>>, Void>() { | ||||||
|
|
||||||
| private void assertExpectedBatchPrefix( | ||||||
| Iterable<KV<String, Iterable<String>>> listToCheck) { | ||||||
| for (KV<String, Iterable<String>> element : listToCheck) { | ||||||
| Set<String> batchPrefixes = | ||||||
| Streams.stream(element.getValue()) | ||||||
| .map(s -> s.split("-")[0]) | ||||||
| .collect(Collectors.toSet()); | ||||||
| assertEquals("Found invalid batching: " + batchPrefixes, 1, batchPrefixes.size()); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public Void apply(Iterable<KV<String, Iterable<String>>> input) { | ||||||
| assertTrue(checkBatchSizes(input)); | ||||||
| assertTrue(checkBatchByteSizes(input)); | ||||||
| assertExpectedBatchPrefix(input); | ||||||
| return null; | ||||||
| } | ||||||
| }); | ||||||
|
|
||||||
| PAssert.thatSingleton("Incorrect batching", collection.apply("Count", Count.globally())) | ||||||
| .satisfies( | ||||||
| numberOfBatches -> { | ||||||
| MatcherAssert.assertThat(numberOfBatches, Matchers.equalTo(3L)); | ||||||
| return null; | ||||||
| }); | ||||||
| pipeline.run(); | ||||||
| } | ||||||
|
|
||||||
| private static <K> boolean checkBatchSizes(Iterable<KV<K, Iterable<String>>> listToCheck) { | ||||||
| return checkBatchSizes(listToCheck, BATCH_SIZE); | ||||||
| } | ||||||
|
|
||||||
| private static <K> boolean checkBatchSizes( | ||||||
| Iterable<KV<K, Iterable<String>>> listToCheck, int batchSize) { | ||||||
| for (KV<?, Iterable<String>> element : listToCheck) { | ||||||
| // number of elements should be less than or equal to the batch size | ||||||
| if (Iterables.size(element.getValue()) > batchSize) { | ||||||
| return false; | ||||||
| } | ||||||
| } | ||||||
| return true; | ||||||
| } | ||||||
|
|
||||||
| private static <K> boolean checkBatchByteSizes(Iterable<KV<K, Iterable<String>>> listToCheck) { | ||||||
| return checkBatchByteSizes( | ||||||
| listToCheck, | ||||||
| s -> { | ||||||
| try { | ||||||
| return StringUtf8Coder.of().getEncodedElementByteSize(s); | ||||||
| } catch (Exception e) { | ||||||
| throw new RuntimeException(e); | ||||||
| } | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| private static <K> boolean checkBatchByteSizes( | ||||||
| Iterable<KV<K, Iterable<String>>> listToCheck, | ||||||
| SerializableFunction<String, Long> getElementByteSizeFn) { | ||||||
| for (KV<?, Iterable<String>> element : listToCheck) { | ||||||
| long byteSize = 0; | ||||||
| for (String str : element.getValue()) { | ||||||
| if (byteSize >= BATCH_SIZE_BYTES) { | ||||||
| // We already reached the batch size, so extra elements are not expected. | ||||||
| return false; | ||||||
| } | ||||||
| try { | ||||||
| byteSize += getElementByteSizeFn.apply(str); | ||||||
| } catch (Exception e) { | ||||||
| throw new RuntimeException(e); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| return true; | ||||||
| } | ||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like your adding support for GroupIntoBatches to limit on count and byte size at the same time.
Can you add tests that cover this new scenario to:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see
040b744(#22953) andb1b732c(#22953)