feat: add PG OID support

.java-version

@@ -0,0 +1 @@
+17.0.9

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable",
+    "java.compile.nullAnalysis.mode": "automatic"
+}

README.md

@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-spanner'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-spanner:6.61.0'
+implementation 'com.google.cloud:google-cloud-spanner:6.62.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.61.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.62.0"
 ```
 <!-- {x-version-update-end} -->
 
@@ -650,7 +650,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.61.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.62.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

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

@@ -192,6 +192,63 @@
     <className>com/google/cloud/spanner/StructReader</className>
     <method>java.util.List getPgJsonbList(java.lang.String)</method>
   </difference>
+  <!-- PG OID -->
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/AbstractStructReader</className>
+    <method>long[] getPgOidArrayInternal(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/AbstractStructReader</className>
+    <method>long getPgOidInternal(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/AbstractStructReader</className>
+    <method>java.util.List getPgOidListInternal(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>long getPgOid(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>long getPgOid(java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>long[] getPgOidArray(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>long[] getPgOidArray(java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.List getPgOidList(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.List getPgOidList(java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/Value</className>
+    <method>long getPgOid()</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/Value</className>
+    <method>java.util.List getPgOidArray()</method>
+  </difference>
+
   <difference>
     <differenceType>7012</differenceType>
     <className>com/google/cloud/spanner/StructReader</className>

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

@@ -342,6 +342,31 @@ Double get(double[] array, int i) {
     }
   }
 
+  static class PgOidArray extends PrimitiveArray<Long, long[]> {
+    PgOidArray(ListValue protoList) {
+      super(protoList);
+    }
+
+    PgOidArray(long[] data, BitSet nulls) {
+      super(data, nulls, data.length);
+    }
+
+    @Override
+    long[] newArray(int size) {
+      return new long[size];
+    }
+
+    @Override
+    void setProto(long[] array, int i, com.google.protobuf.Value protoValue) {
+      array[i] = Long.parseLong(protoValue.getStringValue());
+    }
+
+    @Override
+    Long get(long[] array, int i) {
+      return array[i];
+    }
+  }
+
   protected abstract GrpcStruct currRow();
 
   @Override
@@ -400,6 +425,11 @@ protected String getPgJsonbInternal(int columnIndex) {
     return currRow().getPgJsonbInternal(columnIndex);
   }
 
+  @Override
+  protected long getPgOidInternal(int columnIndex) {
+    return currRow().getPgOidInternal(columnIndex);
+  }
+
   @Override
   protected ByteArray getBytesInternal(int columnIndex) {
     return currRow().getBytesInternal(columnIndex);
@@ -480,6 +510,16 @@ protected List<String> getPgJsonbListInternal(int columnIndex) {
     return currRow().getJsonListInternal(columnIndex);
   }
 
+  @Override
+  protected long[] getPgOidArrayInternal(int columnIndex) {
+    return currRow().getPgOidArrayInternal(columnIndex);
+  }
+
+  @Override
+  protected List<Long> getPgOidListInternal(int columnIndex) {
+    return currRow().getPgOidListInternal(columnIndex);
+  }
+
   @Override
   protected List<ByteArray> getBytesListInternal(int columnIndex) {
     return currRow().getBytesListInternal(columnIndex);

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

@@ -61,6 +61,8 @@ protected String getPgJsonbInternal(int columnIndex) {
     throw new UnsupportedOperationException("Not implemented");
   }
 
+  protected abstract long getPgOidInternal(int columnIndex);
+
   protected abstract ByteArray getBytesInternal(int columnIndex);
 
   protected abstract Timestamp getTimestampInternal(int columnIndex);
@@ -122,6 +124,10 @@ protected List<String> getPgJsonbListInternal(int columnIndex) {
     throw new UnsupportedOperationException("Not implemented");
   }
 
+  protected abstract long[] getPgOidArrayInternal(int columnIndex);
+
+  protected abstract List<Long> getPgOidListInternal(int columnIndex);
+
   protected abstract List<ByteArray> getBytesListInternal(int columnIndex);
 
   protected abstract List<Timestamp> getTimestampListInternal(int columnIndex);
@@ -259,6 +265,19 @@ public String getPgJsonb(String columnName) {
     return getPgJsonbInternal(columnIndex);
   }
 
+  @Override
+  public long getPgOid(int columnIndex) {
+    checkNonNullOfType(columnIndex, Type.pgOid(), columnIndex);
+    return getPgOidInternal(columnIndex);
+  }
+
+  @Override
+  public long getPgOid(String columnName) {
+    int columnIndex = getColumnIndex(columnName);
+    checkNonNullOfType(columnIndex, Type.pgOid(), columnName);
+    return getPgOidInternal(columnIndex);
+  }
+
   @Override
   public ByteArray getBytes(int columnIndex) {
     checkNonNullOfCodes(columnIndex, Arrays.asList(Code.PROTO, Code.BYTES), columnIndex);
@@ -505,6 +524,32 @@ public List<String> getPgJsonbList(String columnName) {
     return getPgJsonbListInternal(columnIndex);
   }
 
+  @Override
+  public long[] getPgOidArray(int columnIndex) {
+    checkNonNullOfType(columnIndex, Type.array(Type.pgOid()), columnIndex);
+    return getPgOidArrayInternal(columnIndex);
+  }
+
+  @Override
+  public long[] getPgOidArray(String columnName) {
+    int columnIndex = getColumnIndex(columnName);
+    checkNonNullOfType(columnIndex, Type.array(Type.pgOid()), columnName);
+    return getPgOidArrayInternal(columnIndex);
+  }
+
+  @Override
+  public List<Long> getPgOidList(int columnIndex) {
+    checkNonNullOfType(columnIndex, Type.array(Type.pgOid()), columnIndex);
+    return getPgOidListInternal(columnIndex);
+  }
+
+  @Override
+  public List<Long> getPgOidList(String columnName) {
+    int columnIndex = getColumnIndex(columnName);
+    checkNonNullOfType(columnIndex, Type.array(Type.pgOid()), columnName);
+    return getPgOidListInternal(columnIndex);
+  }
+
   @Override
   public List<ByteArray> getBytesList(int columnIndex) {
     checkNonNullOfCodes(columnIndex, Collections.singletonList(Code.ARRAY), columnIndex);

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

@@ -195,6 +195,18 @@ public String getPgJsonb(String columnName) {
     return delegate.get().getPgJsonb(columnName);
   }
 
+  @Override
+  public long getPgOid(int columnIndex) {
+    checkValidState();
+    return delegate.get().getPgOid(columnIndex);
+  }
+
+  @Override
+  public long getPgOid(String columnName) {
+    checkValidState();
+    return delegate.get().getPgOid(columnName);
+  }
+
   @Override
   public ByteArray getBytes(int columnIndex) {
     checkValidState();
@@ -373,6 +385,29 @@ public List<String> getPgJsonbList(String columnName) {
     return delegate.get().getPgJsonbList(columnName);
   }
 
+  public long[] getPgOidArray(int columnIndex) {
+    checkValidState();
+    return delegate.get().getPgOidArray(columnIndex);
+  }
+
+  @Override
+  public long[] getPgOidArray(String columnName) {
+    checkValidState();
+    return delegate.get().getPgOidArray(columnName);
+  }
+
+  @Override
+  public List<Long> getPgOidList(int columnIndex) {
+    checkValidState();
+    return delegate.get().getPgOidList(columnIndex);
+  }
+
+  @Override
+  public List<Long> getPgOidList(String columnName) {
+    checkValidState();
+    return delegate.get().getPgOidList(columnName);
+  }
+
   @Override
   public List<ByteArray> getBytesList(int columnIndex) {
     checkValidState();

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

@@ -29,6 +29,7 @@
 import com.google.cloud.spanner.AbstractResultSet.Float64Array;
 import com.google.cloud.spanner.AbstractResultSet.Int64Array;
 import com.google.cloud.spanner.AbstractResultSet.LazyByteArray;
+import com.google.cloud.spanner.AbstractResultSet.PgOidArray;
 import com.google.cloud.spanner.Type.Code;
 import com.google.cloud.spanner.Type.StructField;
 import com.google.common.base.Preconditions;
@@ -114,6 +115,9 @@ private Object writeReplace() {
         case PG_JSONB:
           builder.set(fieldName).to(Value.pgJsonb((String) value));
           break;
+        case PG_OID:
+          builder.set(fieldName).to(Value.pgOid((Long) value));
+          break;
         case BYTES:
           builder
               .set(fieldName)
@@ -158,6 +162,9 @@ private Object writeReplace() {
             case PG_JSONB:
               builder.set(fieldName).toPgJsonbArray((Iterable<String>) value);
               break;
+            case PG_OID:
+              builder.set(fieldName).toPgOidArray((Iterable<Long>) value);
+              break;
             case BYTES:
             case PROTO:
               builder
@@ -262,6 +269,7 @@ private static Object decodeValue(Type fieldType, com.google.protobuf.Value prot
         checkType(fieldType, proto, KindCase.BOOL_VALUE);
         return proto.getBoolValue();
       case INT64:
+      case PG_OID:
       case ENUM:
         checkType(fieldType, proto, KindCase.STRING_VALUE);
         return Long.parseLong(proto.getStringValue());
@@ -339,6 +347,8 @@ static Object decodeArrayValue(Type elementType, ListValue listValue) {
       case STRUCT:
       case PROTO:
         return Lists.transform(listValue.getValuesList(), input -> decodeValue(elementType, input));
+      case PG_OID:
+        return new PgOidArray(listValue);
       default:
         throw new AssertionError("Unhandled type code: " + elementType.getCode());
     }
@@ -460,6 +470,12 @@ protected String getPgJsonbInternal(int columnIndex) {
     return (String) rowData.get(columnIndex);
   }
 
+  @Override
+  protected long getPgOidInternal(int columnIndex) {
+    ensureDecoded(columnIndex);
+    return (Long) rowData.get(columnIndex);
+  }
+
   @Override
   protected ByteArray getBytesInternal(int columnIndex) {
     ensureDecoded(columnIndex);
@@ -563,6 +579,8 @@ protected Value getValueInternal(int columnIndex) {
         return Value.json(isNull ? null : getJsonInternal(columnIndex));
       case PG_JSONB:
         return Value.pgJsonb(isNull ? null : getPgJsonbInternal(columnIndex));
+      case PG_OID:
+        return Value.pgOid(isNull ? null : getPgOidInternal(columnIndex));
       case BYTES:
         return Value.internalBytes(isNull ? null : getLazyBytesInternal(columnIndex));
       case PROTO:
@@ -598,6 +616,8 @@ protected Value getValueInternal(int columnIndex) {
             return Value.jsonArray(isNull ? null : getJsonListInternal(columnIndex));
           case PG_JSONB:
             return Value.pgJsonbArray(isNull ? null : getPgJsonbListInternal(columnIndex));
+          case PG_OID:
+            return Value.pgOidArray(isNull ? null : getPgOidListInternal(columnIndex));
           case BYTES:
             return Value.bytesArray(isNull ? null : getBytesListInternal(columnIndex));
           case PROTO:
@@ -771,6 +791,18 @@ protected List<String> getPgJsonbListInternal(int columnIndex) {
     return Collections.unmodifiableList((List<String>) rowData.get(columnIndex));
   }
 
+  @Override
+  protected PgOidArray getPgOidListInternal(int columnIndex) {
+    ensureDecoded(columnIndex);
+    return (PgOidArray) rowData.get(columnIndex);
+  }
+
+  @Override
+  protected long[] getPgOidArrayInternal(int columnIndex) {
+    ensureDecoded(columnIndex);
+    return getPgOidListInternal(columnIndex).toPrimitiveArray(columnIndex);
+  }
+
   @Override
   @SuppressWarnings("unchecked") // We know ARRAY<BYTES> produces a List<LazyByteArray>.
   protected List<ByteArray> getBytesListInternal(int columnIndex) {