Skip to content

perf(bigquery): [T1-10] eliminate LinkedList staging and un-sized transforms in InsertAllRequest, insertAll, and InsertAllResponse #8

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

Open
lqiu96 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf(bigquery): [T1-10] eliminate LinkedList staging and un-sized transforms in InsertAllRequest, insertAll, and InsertAllResponse #8

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
48 changes: 20 additions & 28 deletions ...-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import com.google.common.base.Function;
import com.google.common.base.Strings;
import com.google.common.base.Supplier;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
Expand Down Expand Up @@ -2053,23 +2052,13 @@ public InsertAllResponse insertAll(InsertAllRequest request) {
requestPb.setIgnoreUnknownValues(request.ignoreUnknownValues());
requestPb.setSkipInvalidRows(request.skipInvalidRows());
requestPb.setTemplateSuffix(request.getTemplateSuffix());
// Using an array of size 1 here to have a mutable boolean variable, which can
// be modified in
// an anonymous inner class.
final boolean[] allInsertIdsSet = {true};
List<Rows> rowsPb =
FluentIterable.from(request.getRows())
.transform(
new Function<RowToInsert, Rows>() {
@Override
public Rows apply(RowToInsert rowToInsert) {
allInsertIdsSet[0] &= rowToInsert.getId() != null;
return new Rows()
.setInsertId(rowToInsert.getId())
.setJson(rowToInsert.getContent());
}
})
.toList();
List<RowToInsert> rows = request.getRows();
List<Rows> rowsPb = new ArrayList<>(rows.size());
boolean allInsertIdsSet = true;
for (RowToInsert rowToInsert : rows) {
allInsertIdsSet &= rowToInsert.getId() != null;
rowsPb.add(new Rows().setInsertId(rowToInsert.getId()).setJson(rowToInsert.getContent()));
}
requestPb.setRows(rowsPb);

TableDataInsertAllResponse responsePb;
Expand All @@ -2084,7 +2073,7 @@ && getOptions().getOpenTelemetryTracer() != null) {
.startSpan();
}
try (Scope insertAllScope = insertAll != null ? insertAll.makeCurrent() : null) {
if (allInsertIdsSet[0]) {
if (allInsertIdsSet) {
// allowing retries only if all row insertIds are set (used for deduplication)
try {
responsePb =
Expand Down Expand Up @@ -2447,11 +2436,9 @@ public com.google.api.services.bigquery.model.QueryResponse call()
}

if (results.getErrors() != null) {
List<BigQueryError> bigQueryErrors =
Lists.transform(results.getErrors(), BigQueryError.FROM_PB_FUNCTION);
// Throwing BigQueryException since there may be no JobId and we want to stay consistent
// with the case where there is an HTTP error
throw new BigQueryException(bigQueryErrors);
throw new BigQueryException(fromErrorPbList(results.getErrors()));
}

long numRows;
Expand Down Expand Up @@ -2533,6 +2520,15 @@ private static TableResult.Builder newTableResultBuilder(
.setCacheHit(results.getCacheHit());
}

private static ImmutableList<BigQueryError> fromErrorPbList(List<ErrorProto> errorsPb) {
ImmutableList.Builder<BigQueryError> builder =
ImmutableList.builderWithExpectedSize(errorsPb.size());
for (ErrorProto errorProto : errorsPb) {
builder.add(errorProto != null ? BigQueryError.fromPb(errorProto) : null);
}
return builder.build();
}

private static long getNumRows(com.google.api.services.bigquery.model.QueryResponse results) {
if (results.getNumDmlAffectedRows() == null && results.getTotalRows() == null) {
return 0L;
Expand Down Expand Up @@ -2591,9 +2587,7 @@ && getOptions().getOpenTelemetryTracer() != null) {
}

if (results.getErrors() != null) {
List<BigQueryError> bigQueryErrors =
Lists.transform(results.getErrors(), BigQueryError.FROM_PB_FUNCTION);
throw new BigQueryException(bigQueryErrors);
throw new BigQueryException(fromErrorPbList(results.getErrors()));
}

// If the query is incomplete (took longer than the fast-path timeout), transition
Expand Down Expand Up @@ -2862,9 +2856,7 @@ && getOptions().getOpenTelemetryTracer() != null) {
}

if (results.getErrors() != null && !results.getErrors().isEmpty()) {
List<BigQueryError> bigQueryErrors =
Lists.transform(results.getErrors(), BigQueryError.FROM_PB_FUNCTION);
throw new BigQueryException(bigQueryErrors);
throw new BigQueryException(fromErrorPbList(results.getErrors()));
}

JobId actualJobId =
Expand Down
2 changes: 1 addition & 1 deletion ...query/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public Builder setTable(TableId table) {

/** Sets the rows to insert as a list of {@link RowToInsert} objects. */
public Builder setRows(Iterable<RowToInsert> rows) {
this.rows = Lists.newLinkedList(checkNotNull(rows));
this.rows = Lists.newArrayList(checkNotNull(rows));
return this;
}

Expand Down
51 changes: 28 additions & 23 deletions ...uery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,11 @@
import com.google.api.services.bigquery.model.ErrorProto;
import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
import com.google.api.services.bigquery.model.TableDataInsertAllResponse.InsertErrors;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -93,19 +90,17 @@ public String toString() {
TableDataInsertAllResponse toPb() {
TableDataInsertAllResponse responsePb = new TableDataInsertAllResponse();
if (!insertErrors.isEmpty()) {
responsePb.setInsertErrors(
ImmutableList.copyOf(
Iterables.transform(
insertErrors.entrySet(),
new Function<Map.Entry<Long, List<BigQueryError>>, InsertErrors>() {
@Override
public InsertErrors apply(Map.Entry<Long, List<BigQueryError>> entry) {
return new InsertErrors()
.setIndex(entry.getKey())
.setErrors(
Lists.transform(entry.getValue(), BigQueryError.TO_PB_FUNCTION));
}
})));
ImmutableList.Builder<InsertErrors> errorsBuilder =
ImmutableList.builderWithExpectedSize(insertErrors.size());
for (Map.Entry<Long, List<BigQueryError>> entry : insertErrors.entrySet()) {
List<BigQueryError> rowErrors = entry.getValue();
List<ErrorProto> errorsPb = new ArrayList<>(rowErrors.size());
for (BigQueryError error : rowErrors) {
errorsPb.add(error != null ? error.toPb() : null);
}
errorsBuilder.add(new InsertErrors().setIndex(entry.getKey()).setErrors(errorsPb));
}
responsePb.setInsertErrors(errorsBuilder.build());
}
return responsePb;
}
Expand All @@ -114,14 +109,24 @@ static InsertAllResponse fromPb(TableDataInsertAllResponse responsePb) {
Map<Long, List<BigQueryError>> insertErrors = null;
if (responsePb.getInsertErrors() != null) {
List<InsertErrors> errorsPb = responsePb.getInsertErrors();
insertErrors = Maps.newHashMapWithExpectedSize(errorsPb.size());
ImmutableMap.Builder<Long, List<BigQueryError>> mapBuilder =
ImmutableMap.builderWithExpectedSize(errorsPb.size());
for (InsertErrors errorPb : errorsPb) {
insertErrors.put(
errorPb.getIndex(),
Lists.transform(
errorPb.getErrors() != null ? errorPb.getErrors() : ImmutableList.<ErrorProto>of(),
BigQueryError.FROM_PB_FUNCTION));
List<ErrorProto> rowErrorsPb = errorPb.getErrors();
ImmutableList<BigQueryError> rowErrors;
if (rowErrorsPb != null && !rowErrorsPb.isEmpty()) {
ImmutableList.Builder<BigQueryError> rowErrorsBuilder =
ImmutableList.builderWithExpectedSize(rowErrorsPb.size());
for (ErrorProto errorProto : rowErrorsPb) {
rowErrorsBuilder.add(errorProto != null ? BigQueryError.fromPb(errorProto) : null);
}
rowErrors = rowErrorsBuilder.build();
} else {
rowErrors = ImmutableList.of();
}
mapBuilder.put(errorPb.getIndex(), rowErrors);
}
insertErrors = mapBuilder.buildKeepingLast();
}
return new InsertAllResponse(insertErrors);
}
Expand Down
6 changes: 4 additions & 2 deletions .../google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;

import com.google.common.collect.ImmutableList;
Expand Down Expand Up @@ -63,8 +64,9 @@ public void testHasErrors() {

@Test
public void testToPbAndFromPb() {
compareInsertAllResponse(
INSERT_ALL_RESPONSE, InsertAllResponse.fromPb(INSERT_ALL_RESPONSE.toPb()));
InsertAllResponse fromPb = InsertAllResponse.fromPb(INSERT_ALL_RESPONSE.toPb());
compareInsertAllResponse(INSERT_ALL_RESPONSE, fromPb);
assertSame(fromPb.getErrorsFor(0L).get(0), fromPb.getErrorsFor(0L).get(0));
compareInsertAllResponse(
EMPTY_INSERT_ALL_RESPONSE, InsertAllResponse.fromPb(EMPTY_INSERT_ALL_RESPONSE.toPb()));
}
Expand Down
Loading