Skip to content

perf(bigquery): [T1-17] eliminate unconditional HashMap allocations and dead STRUCT pass in QueryParameterValue #21

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-17] eliminate unconditional HashMap allocations and dead STRUCT pass in QueryParameterValue #21

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
102 changes: 64 additions & 38 deletions ...ry/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,10 @@ public Builder setArrayValues(List<QueryParameterValue> arrayValues) {

/** Sets struct values. The type must set to STRUCT. */
public Builder setStructValues(Map<String, QueryParameterValue> structValues) {
setStructTypes(ImmutableMap.copyOf(structValues));
return setStructValuesInner(ImmutableMap.copyOf(structValues));
ImmutableMap<String, QueryParameterValue> copiedStructValues =
ImmutableMap.copyOf(structValues);
setStructTypes(copiedStructValues);
return setStructValuesInner(copiedStructValues);
}

abstract Builder setStructValuesInner(Map<String, QueryParameterValue> structValues);
Expand Down Expand Up @@ -398,7 +400,7 @@ public static <T> QueryParameterValue array(T[] array, Class<T> clazz) {
* Creates a {@code QueryParameterValue} object with a type of ARRAY the given array element type.
*/
public static <T> QueryParameterValue array(T[] array, StandardSQLTypeName type) {
List<QueryParameterValue> listValues = new ArrayList<>();
List<QueryParameterValue> listValues = new ArrayList<>(array.length);
for (T obj : array) {
if (type == StandardSQLTypeName.STRUCT) {
listValues.add((QueryParameterValue) obj);
Expand Down Expand Up @@ -551,31 +553,48 @@ private static <T> String valueToStringOrNull(T value, StandardSQLTypeName type)
*/
@VisibleForTesting
static void validateTimestamp(String timestamp) {
// Check if the string has greater than nanosecond precision (>9 digits in fractional second)
Matcher matcher = ISO8601_TIMESTAMP_HIGH_PRECISION_PATTERN.matcher(timestamp);
if (matcher.find()) {
// Group 1 is the fractional second part of the ISO8601 string
String fraction = matcher.group(1);
// Pos 10-12 of the fractional second are guaranteed to be digits. The regex only
// matches the fraction section as long as they are digits.
if (fraction.length() > 12) {
throw new IllegalArgumentException(
"Fractional second portion of ISO8601 only supports up to picosecond (12 digits) in BigQuery");
}
// Check if the string has greater than nanosecond precision (>9 digits in fractional second).
// Guard the regex Matcher allocation with a fast check for at least 10 digits after the dot.
if (hasHighPrecisionFraction(timestamp)) {
Matcher matcher = ISO8601_TIMESTAMP_HIGH_PRECISION_PATTERN.matcher(timestamp);
if (matcher.find()) {
// Group 1 is the fractional second part of the ISO8601 string
String fraction = matcher.group(1);
// Pos 10-12 of the fractional second are guaranteed to be digits. The regex only
// matches the fraction section as long as they are digits.
if (fraction.length() > 12) {
throw new IllegalArgumentException(
"Fractional second portion of ISO8601 only supports up to picosecond (12 digits) in BigQuery");
}

// Replace the entire fractional second portion with just the nanosecond portion.
// The new timestamp will be validated against the JDK's DateTimeFormatter
String truncatedFraction = fraction.substring(0, 9);
timestamp =
new StringBuilder(timestamp)
.replace(matcher.start(1), matcher.end(1), truncatedFraction)
.toString();
// Replace the entire fractional second portion with just the nanosecond portion.
// The new timestamp will be validated against the JDK's DateTimeFormatter
String truncatedFraction = fraction.substring(0, 9);
timestamp =
new StringBuilder(timestamp)
.replace(matcher.start(1), matcher.end(1), truncatedFraction)
.toString();
}
}

// It is valid as long as DateTimeFormatter doesn't throw an exception
checkFormat(timestamp, TIMESTAMP_VALIDATOR);
}

private static boolean hasHighPrecisionFraction(String timestamp) {
int dotIndex = timestamp.indexOf('.');
if (dotIndex < 0 || timestamp.length() - dotIndex <= 10) {
return false;
}
for (int i = dotIndex + 1; i <= dotIndex + 10; i++) {
char c = timestamp.charAt(i);
if (c < '0' || c > '9') {
return false;
}
}
return true;
}

private static void checkFormat(Object value, DateTimeFormatter formatter) {
try {
formatter.parse((String) value);
Expand Down Expand Up @@ -610,16 +629,18 @@ com.google.api.services.bigquery.model.QueryParameterValue toValuePb() {
}
if (getType() == StandardSQLTypeName.RANGE) {
RangeValue rangeValue = new RangeValue();
if (!getRangeValues().getStart().isNull()) {
String start = getRangeValues().getStartInner();
if (start != null) {
com.google.api.services.bigquery.model.QueryParameterValue startValue =
new com.google.api.services.bigquery.model.QueryParameterValue();
startValue.setValue(getRangeValues().getStart().getStringValue());
startValue.setValue(start);
rangeValue.setStart(startValue);
}
if (!getRangeValues().getEnd().isNull()) {
String end = getRangeValues().getEndInner();
if (end != null) {
com.google.api.services.bigquery.model.QueryParameterValue endValue =
new com.google.api.services.bigquery.model.QueryParameterValue();
endValue.setValue(getRangeValues().getEnd().getStringValue());
endValue.setValue(end);
rangeValue.setEnd(endValue);
}
valuePb.setRangeValue(rangeValue);
Expand All @@ -642,7 +663,8 @@ QueryParameterType toTypePb() {
}
}
if (getStructTypes() != null) {
List<QueryParameterType.StructTypes> structTypes = new ArrayList<>();
List<QueryParameterType.StructTypes> structTypes =
new ArrayList<>(getStructTypes().size());
for (Map.Entry<String, QueryParameterValue> entry : getStructTypes().entrySet()) {
QueryParameterType.StructTypes structType = new QueryParameterType.StructTypes();
structType.setName(entry.getKey());
Expand All @@ -665,38 +687,42 @@ static QueryParameterValue fromPb(
com.google.api.services.bigquery.model.QueryParameterValue valuePb,
QueryParameterType typePb) {
Builder valueBuilder = newBuilder();
Map<String, QueryParameterType> parameterTypes = new HashMap<>();
StandardSQLTypeName type = StandardSQLTypeName.valueOf(typePb.getType());
valueBuilder.setType(type);
if (type == StandardSQLTypeName.ARRAY) {
valueBuilder.setArrayType(StandardSQLTypeName.valueOf(typePb.getArrayType().getType()));
if (valuePb == null || valuePb.getArrayValues() == null) {
valueBuilder.setArrayValues(ImmutableList.<QueryParameterValue>of());
} else {
ImmutableList.Builder<QueryParameterValue> arrayValues = ImmutableList.builder();
ImmutableList.Builder<QueryParameterValue> arrayValues =
ImmutableList.builderWithExpectedSize(valuePb.getArrayValues().size());
for (com.google.api.services.bigquery.model.QueryParameterValue elementValuePb :
valuePb.getArrayValues()) {
arrayValues.add(fromPb(elementValuePb, typePb.getArrayType()));
}
valueBuilder.setArrayValues(arrayValues.build());
}
} else if (type == StandardSQLTypeName.STRUCT) {
Map<String, QueryParameterValue> structTypes = new HashMap<>();
for (QueryParameterType.StructTypes types : typePb.getStructTypes()) {
structTypes.put(
types.getName(),
QueryParameterValue.newBuilder()
.setType(StandardSQLTypeName.valueOf(types.getType().getType()))
.build());
}
valueBuilder.setStructTypes(structTypes);
if (valuePb == null || valuePb.getStructValues() == null) {
Map<String, QueryParameterValue> structTypes =
new HashMap<>(typePb.getStructTypes().size());
for (QueryParameterType.StructTypes types : typePb.getStructTypes()) {
structTypes.put(
types.getName(),
QueryParameterValue.newBuilder()
.setType(StandardSQLTypeName.valueOf(types.getType().getType()))
.build());
}
valueBuilder.setStructTypes(structTypes);
valueBuilder.setStructValues(ImmutableMap.<String, QueryParameterValue>of());
} else {
Map<String, QueryParameterValue> structValues = new HashMap<>();
Map<String, QueryParameterType> parameterTypes =
new HashMap<>(typePb.getStructTypes().size());
for (QueryParameterType.StructTypes structType : typePb.getStructTypes()) {
parameterTypes.put(structType.getName(), structType.getType());
}
Map<String, QueryParameterValue> structValues =
new HashMap<>(valuePb.getStructValues().size());
for (Map.Entry<String, com.google.api.services.bigquery.model.QueryParameterValue>
structValue : valuePb.getStructValues().entrySet()) {
structValues.put(
Expand Down
10 changes: 6 additions & 4 deletions java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Range.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,13 @@ public FieldValue getEnd() {
/** Returns the start and end values of this range. */
public ImmutableMap<String, String> getValues() {
ImmutableMap.Builder<String, String> result = ImmutableMap.builder();
if (!getStart().isNull()) {
result.put("start", getStart().getStringValue());
String start = getStartInner();
if (start != null) {
result.put("start", start);
}
if (!getEnd().isNull()) {
result.put("end", getEnd().getStringValue());
String end = getEndInner();
if (end != null) {
result.put("end", end);
}
return result.build();
}
Expand Down
7 changes: 7 additions & 0 deletions ...oogle-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,13 @@ public void testStruct() {
assertThat(recordField.getType()).isEqualTo(StandardSQLTypeName.STRUCT);
assertThat(recordField.getStructTypes()).isNotNull();
assertThat(recordField.getStructValues()).isNotNull();
assertThat(recordField.getStructTypes()).isSameInstanceAs(recordField.getStructValues());
assertThat(queryParameterValue.getStructTypes())
.isSameInstanceAs(queryParameterValue.getStructValues());

QueryParameterValue nullStructValue = QueryParameterValue.fromPb(null, parameterType);
assertThat(nullStructValue.getType()).isEqualTo(StandardSQLTypeName.STRUCT);
assertThat(nullStructValue.getStructValues()).isEmpty();
}

@Test
Expand Down
Loading