Skip to content

Mitigate test broken after Avro Upgrade due to AVRO-4110 #38405

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
Abacn merged 1 commit into from
May 7, 2026
Merged

Mitigate test broken after Avro Upgrade due to AVRO-4110 #38405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions ...org/apache/beam/sdk/io/fileschematransform/AvroReadSchemaTransformFormatProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.beam.sdk.io.fileschematransform;

import static org.apache.beam.sdk.io.common.SchemaAwareJavaBeans.ALL_PRIMITIVE_DATA_TYPES_SCHEMA;
import static org.apache.beam.sdk.io.common.SchemaAwareJavaBeans.ARRAY_PRIMITIVE_DATA_TYPES_SCHEMA;
import static org.apache.beam.sdk.io.fileschematransform.FileReadSchemaTransformProvider.FILEPATTERN_ROW_FIELD_NAME;
import static org.apache.beam.sdk.io.fileschematransform.FileWriteSchemaTransformFormatProviderTestData.DATA;
import static org.apache.beam.sdk.io.fs.ResolveOptions.StandardResolveOptions.RESOLVE_FILE;
Expand Down Expand Up @@ -215,6 +216,16 @@ public void testReadWithPCollectionOfFilepatterns() {
readPipeline.run();
}

// TODO(AVRO-4110): remove this override when Beam upgraded Avro past 1.12.0
@Override
public void testArrayPrimitiveDataTypes() {
Schema schema = ARRAY_PRIMITIVE_DATA_TYPES_SCHEMA;
List<Row> rows = DATA.arrayPrimitiveDataTypesRowsAvro1120;
String filePath = getFilePath();

runWriteAndReadTest(schema, rows, filePath, null);
}

private static class TestDynamicDestinations
extends DynamicAvroDestinations<GenericRecord, String, GenericRecord> {
final ResourceId baseDir;
Expand Down
61 changes: 61 additions & 0 deletions ...pache/beam/sdk/io/fileschematransform/FileWriteSchemaTransformFormatProviderTestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import static org.apache.beam.sdk.io.common.SchemaAwareJavaBeans.timeContainingToRowFn;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand All @@ -50,6 +51,7 @@
import org.apache.beam.sdk.io.common.SchemaAwareJavaBeans.SinglyNestedDataTypes;
import org.apache.beam.sdk.io.common.SchemaAwareJavaBeans.TimeContaining;
import org.apache.beam.sdk.values.Row;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Lists;
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This import is no longer needed if the ListPatcher class is refactored to use the standard ArrayList constructor instead of the vendored Guava utility.

import org.joda.time.Instant;

/** Shared {@link SchemaAwareJavaBeans} data to be used across various tests. */
Expand All @@ -60,6 +62,23 @@ class FileWriteSchemaTransformFormatProviderTestData {
/* Prevent instantiation outside this class. */
private FileWriteSchemaTransformFormatProviderTestData() {}

private static class ListPatcher<T> {
private ArrayList<T> list;

ListPatcher(List<T> list) {
this.list = Lists.newArrayList(list);
}

ArrayList<T> get() {
return list;
}

ListPatcher<T> patch(int index, T value) {
list.set(index, value);
return this;
}
}
Comment on lines +65 to +80
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The ListPatcher utility class can be improved by following Java best practices: using the List interface for the internal field and return types, and marking the field as final. Additionally, using the standard ArrayList constructor is preferred over the vendored Guava utility Lists.newArrayList() to avoid unnecessary dependencies in test code.

  private static class ListPatcher<T> {\n    private final List<T> list;\n\n    ListPatcher(List<T> list) {\n      this.list = new ArrayList<>(list);\n    }\n\n    List<T> get() {\n      return list;\n    }\n\n    ListPatcher<T> patch(int index, T value) {\n      list.set(index, value);\n      return this;\n    }\n  }


final List<AllPrimitiveDataTypes> allPrimitiveDataTypesList =
Arrays.asList(
allPrimitiveDataTypes(false, BigDecimal.valueOf(1L), 1.2345, 1.2345f, 1, 1L, "a"),
Expand Down Expand Up @@ -188,11 +207,53 @@ private FileWriteSchemaTransformFormatProviderTestData() {}
Collections.emptyList(),
Collections.emptyList()));

// TODO(AVRO-4110): remove this workaround when Beam upgraded Avro past 1.12.0
final List<ArrayPrimitiveDataTypes> arrayPrimitiveDataTypesListAvro1120 =
new ListPatcher<>(arrayPrimitiveDataTypesList)
.patch(
1,
arrayPrimitiveDataTypes(
Collections.emptyList(),
Collections.singletonList((double) Float.MAX_VALUE),
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList()))
.patch(
6,
arrayPrimitiveDataTypes(
Arrays.asList(false, true, false),
Arrays.asList((double) Float.MIN_VALUE, 0.0, (double) Float.MAX_VALUE),
Arrays.asList(Float.MIN_VALUE, 0.0f, Float.MAX_VALUE),
Arrays.asList(Integer.MIN_VALUE, 0, Integer.MAX_VALUE),
Arrays.asList(Long.MIN_VALUE, 0L, Long.MAX_VALUE),
Arrays.asList(
Stream.generate(() -> "🐤").limit(10).collect(Collectors.joining("")),
Stream.generate(() -> "🐥").limit(10).collect(Collectors.joining("")),
Stream.generate(() -> "🐣").limit(10).collect(Collectors.joining("")))))
.patch(
7,
arrayPrimitiveDataTypes(
Stream.generate(() -> true).limit(10).collect(Collectors.toList()),
Stream.generate(() -> (double) Float.MIN_VALUE)
.limit(10)
.collect(Collectors.toList()),
Stream.generate(() -> Float.MIN_VALUE).limit(10).collect(Collectors.toList()),
Stream.generate(() -> Integer.MIN_VALUE).limit(10).collect(Collectors.toList()),
Stream.generate(() -> Long.MIN_VALUE).limit(10).collect(Collectors.toList()),
Stream.generate(() -> "🐿").limit(10).collect(Collectors.toList())))
.get();

final List<Row> arrayPrimitiveDataTypesRows =
arrayPrimitiveDataTypesList.stream()
.map(arrayPrimitiveDataTypesToRowFn()::apply)
.collect(Collectors.toList());

final List<Row> arrayPrimitiveDataTypesRowsAvro1120 =
arrayPrimitiveDataTypesListAvro1120.stream()
.map(arrayPrimitiveDataTypesToRowFn()::apply)
.collect(Collectors.toList());

final List<SinglyNestedDataTypes> singlyNestedDataTypesNoRepeat =
allPrimitiveDataTypesList.stream()
.map(SchemaAwareJavaBeans::singlyNestedDataTypes)
Expand Down
11 changes: 11 additions & 0 deletions .../apache/beam/sdk/io/fileschematransform/ParquetReadSchemaTransformFormatProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.beam.sdk.io.fileschematransform;

import static org.apache.beam.sdk.io.common.SchemaAwareJavaBeans.ALL_PRIMITIVE_DATA_TYPES_SCHEMA;
import static org.apache.beam.sdk.io.common.SchemaAwareJavaBeans.ARRAY_PRIMITIVE_DATA_TYPES_SCHEMA;
import static org.apache.beam.sdk.io.fileschematransform.FileReadSchemaTransformProvider.FILEPATTERN_ROW_FIELD_NAME;
import static org.apache.beam.sdk.io.fileschematransform.FileWriteSchemaTransformFormatProviderTestData.DATA;
import static org.apache.beam.sdk.transforms.Contextful.fn;
Expand Down Expand Up @@ -218,4 +219,14 @@ public void testReadWithPCollectionOfFilepatterns() {
PAssert.that(output.get(FileReadSchemaTransformProvider.OUTPUT_TAG)).containsInAnyOrder(rows);
readPipeline.run();
}

// TODO(AVRO-4110): remove this override when Beam upgraded Avro past 1.12.0
@Override
public void testArrayPrimitiveDataTypes() {
Schema schema = ARRAY_PRIMITIVE_DATA_TYPES_SCHEMA;
List<Row> rows = DATA.arrayPrimitiveDataTypesRowsAvro1120;
String filePath = getFilePath();

runWriteAndReadTest(schema, rows, filePath, null);
}
}
Loading