Skip to content

chore: support UUID in Cloud Client Executor #3841

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore: support UUID in Cloud Client Executor #3841

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
745912b
Add support for UUID in CloudClientExecutor
gagangupt16 Apr 28, 2025
65a2f08
chore: handle keyProtoToCloudKey in CloudClientExecutor
gagangupt16 Apr 29, 2025
be9bedb
style: as per plugin
gagangupt16 Apr 29, 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
47 changes: 47 additions & 0 deletions ...spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -2898,6 +2899,9 @@ private com.google.spanner.executor.v1.ValueList buildStruct(StructReader struct
case DATE:
value.setDateDaysValue(daysFromDate(struct.getDate(i)));
break;
case UUID:
value.setStringValue(struct.getUuid(i).toString());
break;
case NUMERIC:
String ascii = struct.getBigDecimal(i).toPlainString();
value.setStringValue(ascii);
Expand Down Expand Up @@ -3044,6 +3048,25 @@ private com.google.spanner.executor.v1.ValueList buildStruct(StructReader struct
com.google.spanner.v1.Type.newBuilder().setCode(TypeCode.DATE).build());
}
break;
case UUID:
{
com.google.spanner.executor.v1.ValueList.Builder builder =
com.google.spanner.executor.v1.ValueList.newBuilder();
List<UUID> values = struct.getUuidList(i);
for (UUID uuidValue : values) {
com.google.spanner.executor.v1.Value.Builder valueProto =
com.google.spanner.executor.v1.Value.newBuilder();
if (uuidValue == null) {
builder.addValue(valueProto.setIsNull(true).build());
} else {
builder.addValue(valueProto.setStringValue(uuidValue.toString()).build());
}
}
value.setArrayValue(builder.build());
value.setArrayType(
com.google.spanner.v1.Type.newBuilder().setCode(TypeCode.UUID).build());
}
break;
case TIMESTAMP:
{
com.google.spanner.executor.v1.ValueList.Builder builder =
Expand Down Expand Up @@ -3227,6 +3250,7 @@ private static com.google.cloud.spanner.Key keyProtoToCloudKey(
case BYTES:
case FLOAT64:
case DATE:
case UUID:
case TIMESTAMP:
case NUMERIC:
case JSON:
Expand Down Expand Up @@ -3260,6 +3284,8 @@ private static com.google.cloud.spanner.Key keyProtoToCloudKey(
if (type.getCode() == TypeCode.NUMERIC) {
String ascii = part.getStringValue();
cloudKey.append(new BigDecimal(ascii));
} else if (type.getCode() == TypeCode.UUID) {
cloudKey.append(UUID.fromString(part.getStringValue()));
} else {
cloudKey.append(part.getStringValue());
}
Expand Down Expand Up @@ -3314,6 +3340,9 @@ private static com.google.cloud.spanner.Value valueProtoToCloudValue(
case DATE:
return com.google.cloud.spanner.Value.date(
value.hasIsNull() ? null : dateFromDays(value.getDateDaysValue()));
case UUID:
return com.google.cloud.spanner.Value.uuid(
value.hasIsNull() ? null : UUID.fromString(value.getStringValue()));
case NUMERIC:
{
if (value.hasIsNull()) {
Expand Down Expand Up @@ -3438,6 +3467,20 @@ private static com.google.cloud.spanner.Value valueProtoToCloudValue(
.collect(Collectors.toList()),
CloudClientExecutor::dateFromDays));
}
case UUID:
if (value.hasIsNull()) {
return com.google.cloud.spanner.Value.uuidArray(null);
} else {
return com.google.cloud.spanner.Value.uuidArray(
unmarshallValueList(
value.getArrayValue().getValueList().stream()
.map(com.google.spanner.executor.v1.Value::getIsNull)
.collect(Collectors.toList()),
value.getArrayValue().getValueList().stream()
.map(com.google.spanner.executor.v1.Value::getStringValue)
.collect(Collectors.toList()),
UUID::fromString));
}
case NUMERIC:
{
if (value.hasIsNull()) {
Expand Down Expand Up @@ -3603,6 +3646,8 @@ private static com.google.cloud.spanner.Type typeProtoToCloudType(
return com.google.cloud.spanner.Type.float64();
case DATE:
return com.google.cloud.spanner.Type.date();
case UUID:
return com.google.cloud.spanner.Type.uuid();
case TIMESTAMP:
return com.google.cloud.spanner.Type.timestamp();
case NUMERIC:
Expand Down Expand Up @@ -3659,6 +3704,8 @@ private static com.google.spanner.v1.Type cloudTypeToTypeProto(@Nonnull Type clo
return com.google.spanner.v1.Type.newBuilder().setCode(TypeCode.TIMESTAMP).build();
case DATE:
return com.google.spanner.v1.Type.newBuilder().setCode(TypeCode.DATE).build();
case UUID:
return com.google.spanner.v1.Type.newBuilder().setCode(TypeCode.UUID).build();
case NUMERIC:
return com.google.spanner.v1.Type.newBuilder().setCode(TypeCode.NUMERIC).build();
case PG_NUMERIC:
Expand Down
Loading