chore: add support for UUID in CloudClientExecutor

google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java

@@ -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;
@@ -2897,6 +2898,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);
@@ -3043,6 +3047,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 =
@@ -3226,6 +3249,7 @@ private static com.google.cloud.spanner.Key keyProtoToCloudKey(
           case BYTES:
           case FLOAT64:
           case DATE:
+          case UUID:
           case TIMESTAMP:
           case NUMERIC:
           case JSON:
@@ -3313,6 +3337,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()) {
@@ -3437,6 +3464,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()) {
@@ -3602,6 +3643,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:
@@ -3658,6 +3701,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:

google-cloud-spanner/clirr-ignored-differences.xml

@@ -566,6 +566,48 @@
     <method>java.util.List getFloat32Array()</method>
   </difference>
 
+  <!-- UUID -->
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/AbstractStructReader</className>
+    <method>java.util.UUID getUuidInternal(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/AbstractStructReader</className>
+    <method>java.util.List getUuidListInternal(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.UUID getUuid(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.UUID getUuid(java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.List getUuidList(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.List getUuidList(java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/Value</className>
+    <method>java.util.UUID getUuid()</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/Value</className>
+    <method>java.util.List getUuidArray()</method>
+  </difference>
+
   <!-- (Internal change, use stream timeout) -->
   <difference>
     <differenceType>7012</differenceType>

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java

@@ -38,6 +38,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -434,6 +435,11 @@ protected Date getDateInternal(int columnIndex) {
     return currRow().getDateInternal(columnIndex);
   }
 
+  @Override
+  protected UUID getUuidInternal(int columnIndex) {
+    return currRow().getUuidInternal(columnIndex);
+  }
+
   @Override
   protected Value getValueInternal(int columnIndex) {
     return currRow().getValueInternal(columnIndex);
@@ -526,6 +532,11 @@ protected List<Date> getDateListInternal(int columnIndex) {
     return currRow().getDateListInternal(columnIndex);
   }
 
+  @Override
+  protected List<UUID> getUuidListInternal(int columnIndex) {
+    return currRow().getUuidListInternal(columnIndex);
+  }
+
   @Override
   protected List<Struct> getStructListInternal(int columnIndex) {
     return currRow().getStructListInternal(columnIndex);

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java

@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Function;
 
 /**
@@ -67,6 +68,8 @@ protected String getPgJsonbInternal(int columnIndex) {
 
   protected abstract Date getDateInternal(int columnIndex);
 
+  protected abstract UUID getUuidInternal(int columnIndex);
+
   protected <T extends AbstractMessage> T getProtoMessageInternal(int columnIndex, T message) {
     throw new UnsupportedOperationException("Not implemented");
   }
@@ -128,6 +131,8 @@ protected List<String> getPgJsonbListInternal(int columnIndex) {
 
   protected abstract List<Date> getDateListInternal(int columnIndex);
 
+  protected abstract List<UUID> getUuidListInternal(int columnIndex);
+
   protected abstract List<Struct> getStructListInternal(int columnIndex);
 
   @Override
@@ -299,6 +304,19 @@ public Date getDate(String columnName) {
     return getDateInternal(columnIndex);
   }
 
+  @Override
+  public UUID getUuid(int columnIndex) {
+    checkNonNullOfType(columnIndex, Type.uuid(), columnIndex);
+    return getUuidInternal(columnIndex);
+  }
+
+  @Override
+  public UUID getUuid(String columnName) {
+    final int columnIndex = getColumnIndex(columnName);
+    checkNonNullOfType(columnIndex, Type.uuid(), columnName);
+    return getUuid(columnIndex);
+  }
+
   @Override
   public <T extends ProtocolMessageEnum> T getProtoEnum(
       int columnIndex, Function<Integer, ProtocolMessageEnum> method) {
@@ -583,6 +601,19 @@ public List<Date> getDateList(String columnName) {
     return getDateListInternal(columnIndex);
   }
 
+  @Override
+  public List<UUID> getUuidList(int columnIndex) {
+    checkNonNullOfType(columnIndex, Type.array(Type.uuid()), columnIndex);
+    return getUuidListInternal(columnIndex);
+  }
+
+  @Override
+  public List<UUID> getUuidList(String columnName) {
+    final int columnIndex = getColumnIndex(columnName);
+    checkNonNullOfType(columnIndex, Type.array(Type.uuid()), columnName);
+    return getUuidList(columnIndex);
+  }
+
   @Override
   public List<Struct> getStructList(int columnIndex) {
     checkNonNullArrayOfStruct(columnIndex, columnIndex);

google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java

@@ -26,6 +26,7 @@
 import com.google.protobuf.ProtocolMessageEnum;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Function;
 
 /** Forwarding implements of StructReader */
@@ -225,12 +226,24 @@ public Date getDate(int columnIndex) {
     return delegate.get().getDate(columnIndex);
   }
 
+  @Override
+  public UUID getUuid(int columnIndex) {
+    checkValidState();
+    return delegate.get().getUuid(columnIndex);
+  }
+
   @Override
   public Date getDate(String columnName) {
     checkValidState();
     return delegate.get().getDate(columnName);
   }
 
+  @Override
+  public UUID getUuid(String columnName) {
+    checkValidState();
+    return delegate.get().getUuid(columnName);
+  }
+
   @Override
   public boolean[] getBooleanArray(int columnIndex) {
     checkValidState();
@@ -409,6 +422,18 @@ public List<Date> getDateList(String columnName) {
     return delegate.get().getDateList(columnName);
   }
 
+  @Override
+  public List<UUID> getUuidList(int columnIndex) {
+    checkValidState();
+    return delegate.get().getUuidList(columnIndex);
+  }
+
+  @Override
+  public List<UUID> getUuidList(String columnName) {
+    checkValidState();
+    return delegate.get().getUuidList(columnName);
+  }
+
   @Override
   public <T extends AbstractMessage> List<T> getProtoMessageList(int columnIndex, T message) {
     checkValidState();

google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java

@@ -49,6 +49,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -131,6 +132,9 @@ private Object writeReplace() {
         case DATE:
           builder.set(fieldName).to((Date) value);
           break;
+        case UUID:
+          builder.set(fieldName).to((UUID) value);
+          break;
         case ARRAY:
           final Type elementType = fieldType.getArrayElementType();
           switch (elementType.getCode()) {
@@ -184,6 +188,9 @@ private Object writeReplace() {
             case DATE:
               builder.set(fieldName).toDateArray((Iterable<Date>) value);
               break;
+            case UUID:
+              builder.set(fieldName).toUuidArray((Iterable<UUID>) value);
+              break;
             case STRUCT:
               builder.set(fieldName).toStructArray(elementType, (Iterable<Struct>) value);
               break;
@@ -298,6 +305,9 @@ private static Object decodeValue(Type fieldType, com.google.protobuf.Value prot
       case DATE:
         checkType(fieldType, proto, KindCase.STRING_VALUE);
         return Date.parseDate(proto.getStringValue());
+      case UUID:
+        checkType(fieldType, proto, KindCase.STRING_VALUE);
+        return UUID.fromString(proto.getStringValue());
       case ARRAY:
         checkType(fieldType, proto, KindCase.LIST_VALUE);
         ListValue listValue = proto.getListValue();
@@ -347,6 +357,7 @@ static Object decodeArrayValue(Type elementType, ListValue listValue) {
       case BYTES:
       case TIMESTAMP:
       case DATE:
+      case UUID:
       case STRUCT:
       case PROTO:
         return Lists.transform(listValue.getValuesList(), input -> decodeValue(elementType, input));
@@ -503,6 +514,12 @@ protected Date getDateInternal(int columnIndex) {
     return (Date) rowData.get(columnIndex);
   }
 
+  @Override
+  protected UUID getUuidInternal(int columnIndex) {
+    ensureDecoded(columnIndex);
+    return (UUID) rowData.get(columnIndex);
+  }
+
   private boolean isUnrecognizedType(int columnIndex) {
     return type.getStructFields().get(columnIndex).getType().getCode() == Code.UNRECOGNIZED;
   }
@@ -624,6 +641,8 @@ protected Value getValueInternal(int columnIndex) {
         return Value.timestamp(isNull ? null : getTimestampInternal(columnIndex));
       case DATE:
         return Value.date(isNull ? null : getDateInternal(columnIndex));
+      case UUID:
+        return Value.uuid(isNull ? null : getUuidInternal(columnIndex));
       case STRUCT:
         return Value.struct(isNull ? null : getStructInternal(columnIndex));
       case UNRECOGNIZED:
@@ -664,6 +683,8 @@ protected Value getValueInternal(int columnIndex) {
             return Value.timestampArray(isNull ? null : getTimestampListInternal(columnIndex));
           case DATE:
             return Value.dateArray(isNull ? null : getDateListInternal(columnIndex));
+          case UUID:
+            return Value.uuidArray(isNull ? null : getUuidListInternal(columnIndex));
           case STRUCT:
             return Value.structArray(
                 elementType, isNull ? null : getStructListInternal(columnIndex));
@@ -847,6 +868,12 @@ protected List<Date> getDateListInternal(int columnIndex) {
     return Collections.unmodifiableList((List<Date>) rowData.get(columnIndex));
   }
 
+  @Override
+  protected List<UUID> getUuidListInternal(int columnIndex) {
+    ensureDecoded(columnIndex);
+    return Collections.unmodifiableList((List<UUID>) rowData.get(columnIndex));
+  }
+
   @Override
   @SuppressWarnings("unchecked") // We know ARRAY<STRUCT<...>> produces a List<STRUCT>.
   protected List<Struct> getStructListInternal(int columnIndex) {