Skip to content

Handle null keys in gbek #36505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damccorm merged 4 commits into from
Oct 15, 2025
Merged

Handle null keys in gbek #36505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e691131
Handle null keys in gbek
damccorm Oct 14, 2025
19bd68d
Allow null values with hashmap
damccorm Oct 14, 2025
79e3217
add a test
damccorm Oct 14, 2025
d968b35
Test + remove check entirely
damccorm Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupByEncryptedKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,9 @@ public void setup() {
}

@ProcessElement
@SuppressWarnings("nullness")
public void processElement(ProcessContext c) throws Exception {
java.util.Map<K, java.util.List<V>> decryptedKvs = new java.util.HashMap<>();
java.util.HashMap<K, java.util.List<V>> decryptedKvs = new java.util.HashMap<>();
for (KV<byte[], byte[]> encryptedKv : c.element().getValue()) {
byte[] iv = Arrays.copyOfRange(encryptedKv.getKey(), 0, 12);
GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, iv);
Expand All @@ -251,24 +252,19 @@ public void processElement(ProcessContext c) throws Exception {
byte[] decryptedKeyBytes = this.cipher.doFinal(encryptedKey);
K key = decode(this.keyCoder, decryptedKeyBytes);

if (key != null) {
if (!decryptedKvs.containsKey(key)) {
decryptedKvs.put(key, new java.util.ArrayList<>());
}
if (!decryptedKvs.containsKey(key)) {
decryptedKvs.put(key, new java.util.ArrayList<>());
}

iv = Arrays.copyOfRange(encryptedKv.getValue(), 0, 12);
gcmParameterSpec = new GCMParameterSpec(128, iv);
this.cipher.init(Cipher.DECRYPT_MODE, this.secretKeySpec, gcmParameterSpec);
iv = Arrays.copyOfRange(encryptedKv.getValue(), 0, 12);
gcmParameterSpec = new GCMParameterSpec(128, iv);
this.cipher.init(Cipher.DECRYPT_MODE, this.secretKeySpec, gcmParameterSpec);

byte[] encryptedValue =
Arrays.copyOfRange(encryptedKv.getValue(), 12, encryptedKv.getValue().length);
byte[] decryptedValueBytes = this.cipher.doFinal(encryptedValue);
V value = decode(this.valueCoder, decryptedValueBytes);
decryptedKvs.get(key).add(value);
} else {
throw new RuntimeException(
"Found null key when decoding " + Arrays.toString(decryptedKeyBytes));
}
byte[] encryptedValue =
Arrays.copyOfRange(encryptedKv.getValue(), 12, encryptedKv.getValue().length);
byte[] decryptedValueBytes = this.cipher.doFinal(encryptedValue);
V value = decode(this.valueCoder, decryptedValueBytes);
decryptedKvs.get(key).add(value);
}

for (java.util.Map.Entry<K, java.util.List<V>> entry : decryptedKvs.entrySet()) {
Expand Down
9 changes: 7 additions & 2 deletions sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByEncryptedKeyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.NullableCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.coders.VarIntCoder;
import org.apache.beam.sdk.testing.NeedsRunner;
Expand All @@ -42,6 +43,7 @@
import org.apache.beam.sdk.util.Secret;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
Expand Down Expand Up @@ -141,27 +143,30 @@ public static void tearDown() throws IOException {
@Test
@Category(NeedsRunner.class)
public void testGroupByKeyGcpSecret() {
List<KV<String, Integer>> ungroupedPairs =
List<KV<@Nullable String, Integer>> ungroupedPairs =
Arrays.asList(
KV.of(null, 3),
KV.of("k1", 3),
KV.of("k5", Integer.MAX_VALUE),
KV.of("k5", Integer.MIN_VALUE),
KV.of("k2", 66),
KV.of("k1", 4),
KV.of(null, 5),
KV.of("k2", -33),
KV.of("k3", 0));

PCollection<KV<String, Integer>> input =
p.apply(
Create.of(ungroupedPairs)
.withCoder(KvCoder.of(StringUtf8Coder.of(), VarIntCoder.of())));
.withCoder(KvCoder.of(NullableCoder.of(StringUtf8Coder.of()), VarIntCoder.of())));

PCollection<KV<String, Iterable<Integer>>> output =
input.apply(GroupByEncryptedKey.<String, Integer>create(gcpSecret));

PAssert.that(output.apply("Sort", MapElements.via(new SortValues())))
.containsInAnyOrder(
KV.of("k1", Arrays.asList(3, 4)),
KV.of(null, Arrays.asList(3, 5)),
KV.of("k5", Arrays.asList(Integer.MIN_VALUE, Integer.MAX_VALUE)),
KV.of("k2", Arrays.asList(-33, 66)),
KV.of("k3", Arrays.asList(0)));
Expand Down
Loading