Skip to content
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

Jump to bottom

Allow large timestamp skew for at-least-once streaming #29858

Merged
merged 5 commits into from
Dec 27, 2023
Merged

Allow large timestamp skew for at-least-once streaming #29858

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57516c1
large skew
ahmedabu98 Dec 21, 2023
419b6be
Merge branch 'master' of https://github.com/ahmedabu98/beam into skew…
ahmedabu98 Dec 26, 2023
d9d42fc
test
ahmedabu98 Dec 26, 2023
22e97d1
consistent skew; use AppendSerializationError (bq client fixed the typo)
ahmedabu98 Dec 26, 2023
d3a70c0
use AppendSerializationError everywhere
ahmedabu98 Dec 27, 2023
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
5 changes: 5 additions & 0 deletions ...rm/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWriteUnshardedRecords.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,5 +1164,10 @@ public void teardown() {
throw new RuntimeException(e);
}
}

@Override
public Duration getAllowedTimestampSkew() {
return Duration.millis(Long.MAX_VALUE);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

StorageApiWritesShardedRecords has

    @Override
    public Duration getAllowedTimestampSkew() {
      return Duration.millis(BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis());
    }

I think the semantics are the same, just to confirm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup that value is equal to Long.MAX_VALUE

Copy link
Collaborator

Choose a reason for hiding this comment

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

can we keep the consistency?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

}
}
109 changes: 109 additions & 0 deletions ...cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;

import com.google.api.core.ApiFuture;
import com.google.api.core.SettableApiFuture;
import com.google.api.services.bigquery.model.Clustering;
import com.google.api.services.bigquery.model.ErrorProto;
import com.google.api.services.bigquery.model.Job;
Expand All @@ -48,7 +50,12 @@
import com.google.api.services.bigquery.model.TableSchema;
import com.google.api.services.bigquery.model.TimePartitioning;
import com.google.auto.value.AutoValue;
import com.google.cloud.bigquery.storage.v1.AppendRowsRequest;
import com.google.cloud.bigquery.storage.v1.AppendRowsResponse;
import com.google.cloud.bigquery.storage.v1.Exceptions;
import com.google.cloud.bigquery.storage.v1.ProtoRows;
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -124,14 +131,18 @@
import org.apache.beam.sdk.transforms.MapElements;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.transforms.PeriodicImpulse;
import org.apache.beam.sdk.transforms.SerializableFunction;
import org.apache.beam.sdk.transforms.SerializableFunctions;
import org.apache.beam.sdk.transforms.SimpleFunction;
import org.apache.beam.sdk.transforms.Sum;
import org.apache.beam.sdk.transforms.View;
import org.apache.beam.sdk.transforms.WithKeys;
import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.transforms.windowing.AfterWatermark;
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.apache.beam.sdk.transforms.windowing.GlobalWindow;
import org.apache.beam.sdk.transforms.windowing.GlobalWindows;
import org.apache.beam.sdk.transforms.windowing.IncompatibleWindowException;
import org.apache.beam.sdk.transforms.windowing.NonMergingWindowFn;
import org.apache.beam.sdk.transforms.windowing.Window;
Expand Down Expand Up @@ -3104,6 +3115,104 @@ public void testStorageWriteWithMultipleAppendsPerStream() throws Exception {
containsInAnyOrder(Iterables.toArray(rows, TableRow.class)));
}

public static class ThrowingFakeDatasetServices extends FakeDatasetService {
@Override
public BigQueryServices.StreamAppendClient getStreamAppendClient(
String streamName,
DescriptorProtos.DescriptorProto descriptor,
boolean useConnectionPool,
AppendRowsRequest.MissingValueInterpretation missingValueInterpretation) {
return new BigQueryServices.StreamAppendClient() {
@Override
public ApiFuture<AppendRowsResponse> appendRows(long offset, ProtoRows rows) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the call made to send rows to BQ. It returns an ApiFuture that may contain an exception. Here we force it to always return the exception and expect the connector to handle this properly

Map<Integer, String> errorMap = new HashMap<>();
for (int i = 0; i < rows.getSerializedRowsCount(); i++) {
errorMap.put(i, "some serialization error");
}
SettableApiFuture<AppendRowsResponse> appendResult = SettableApiFuture.create();
appendResult.setException(
new Exceptions.AppendSerializationError(
404, "some description", "some stream", errorMap));
return appendResult;
}

@Override
public com.google.cloud.bigquery.storage.v1.@Nullable TableSchema getUpdatedSchema() {
return null;
}

@Override
public void pin() {}

@Override
public void unpin() {}

@Override
public void close() {}
};
}
}

@Test
public void testStorageWriteReturnsAppendSerializationError() throws Exception {
assumeTrue(useStorageApi);
assumeTrue(useStreaming);
p.getOptions().as(BigQueryOptions.class).setStorageApiAppendThresholdRecordCount(5);

TableSchema schema =
new TableSchema()
.setFields(Arrays.asList(new TableFieldSchema().setType("INTEGER").setName("long")));
Table fakeTable = new Table();
TableReference ref =
new TableReference()
.setProjectId("project-id")
.setDatasetId("dataset-id")
.setTableId("table-id");
fakeTable.setSchema(schema);
fakeTable.setTableReference(ref);

ThrowingFakeDatasetServices throwingService = new ThrowingFakeDatasetServices();
throwingService.createTable(fakeTable);

int numRows = 100;

WriteResult res =
p.apply(
PeriodicImpulse.create()
.startAt(Instant.ofEpochMilli(0))
.stopAfter(Duration.millis(numRows - 1))
.withInterval(Duration.millis(1)))
.apply(
"Convert to longs",
MapElements.into(TypeDescriptor.of(TableRow.class))
.via(instant -> new TableRow().set("long", instant.getMillis())))
.apply(
BigQueryIO.writeTableRows()
.to(ref)
.withSchema(schema)
.withTestServices(
new FakeBigQueryServices()
.withDatasetService(throwingService)
.withJobService(fakeJobService)));

PCollection<Integer> numErrors =
res.getFailedStorageApiInserts()
.apply(
"Count errors",
MapElements.into(TypeDescriptors.integers())
.via(err -> err.getErrorMessage().equals("some serialization error") ? 1 : 0))
.apply(
Window.<Integer>into(new GlobalWindows())
.triggering(AfterWatermark.pastEndOfWindow())
.discardingFiredPanes()
.withAllowedLateness(Duration.ZERO))
.apply(Sum.integersGlobally());

PAssert.that(numErrors).containsInAnyOrder(numRows);

p.run().waitUntilFinish();
}

@Test
public void testWriteProtos() throws Exception {
BigQueryIO.Write.Method method =
Expand Down
Loading