Properly downcast unsigned OID to Integer.

We now downcast unsigned OIDs to integer to avoid exceptions during reading OIDs.

[resolves #470]

Signed-off-by: Mark Paluch <[email protected]>

Author: mp911de

src/main/java/io/r2dbc/postgresql/codec/BuiltinDynamicCodecs.java

@@ -77,7 +77,7 @@ public Publisher<Void> register(PostgresqlConnection connection, ByteBufAllocato
         return statement.execute()
             .flatMap(it -> it.map((row, rowMetadata) -> {
 
-                    Integer oid = row.get("oid", Integer.class);
+                    int oid = PostgresqlObjectId.toInt(row.get("oid", Long.class));
                     String typname = row.get("typname", String.class);
 
                     BuiltinCodec lookup = BuiltinCodec.lookup(typname);

src/main/java/io/r2dbc/postgresql/codec/PostgresTypes.java

@@ -74,7 +74,11 @@ public Mono<PostgresType> lookupType(String typeName) {
 
         return this.connection.createStatement(String.format(SELECT_PG_TYPE, "=", "'" + typeName + "'", "LIMIT 1")).execute()
             .flatMap(it -> it.map((row, rowMetadata) -> {
-                return new PostgresType(row.get("oid", Integer.class), row.get("typarray", Integer.class), row.get("typname", String.class), row.get("typcategory", String.class));
+
+                Long oid = row.get("oid", Long.class);
+                Long typarrayOid = row.get("typarray", Long.class);
+                return new PostgresType(PostgresqlObjectId.toInt(oid), oid.longValue(), PostgresqlObjectId.toInt(typarrayOid), typarrayOid, row.get("typname", String.class), row.get("typcategory",
+                    String.class));
             })).singleOrEmpty();
     }
 
@@ -93,26 +97,36 @@ public Flux<PostgresType> lookupTypes(Iterable<String> typeNames) {
 
         return this.connection.createStatement(String.format(SELECT_PG_TYPE, "IN", joiner, "")).execute()
             .flatMap(it -> it.map((row, rowMetadata) -> {
-                return new PostgresType(row.get("oid", Integer.class), row.get("typarray", Integer.class), row.get("typname", String.class), row.get("typcategory", String.class));
+
+                Long oid = row.get("oid", Long.class);
+                Long typarrayOid = row.get("typarray", Long.class);
+                return new PostgresType(PostgresqlObjectId.toInt(oid), oid.longValue(), PostgresqlObjectId.toInt(typarrayOid), typarrayOid, row.get("typname", String.class), row.get("typcategory",
+                    String.class));
             }));
     }
 
     public static class PostgresType implements Type, PostgresTypeIdentifier {
 
         private final int oid;
 
+        private final long unsignedOid;
+
         private final int typarray;
 
+        private final long unsignedTyparray;
+
         private final String name;
 
         private final String category;
 
         @Nullable
         private final PostgresqlObjectId objectId;
 
-        public PostgresType(int oid, int typarray, String name, String category) {
+        public PostgresType(int oid, long unsignedOid, int typarray, long unsignedTyparray, String name, String category) {
             this.oid = oid;
+            this.unsignedOid = unsignedOid;
             this.typarray = typarray;
+            this.unsignedTyparray = unsignedTyparray;
             this.name = name;
             this.category = category;
             this.objectId = PostgresqlObjectId.isValid(oid) ? PostgresqlObjectId.valueOf(oid) : null;
@@ -123,10 +137,6 @@ public int getObjectId() {
             return getOid();
         }
 
-        public int getArrayObjectId() {
-            return this.typarray;
-        }
-
         /**
          * Return the type as array type.
          *
@@ -140,7 +150,7 @@ public PostgresType asArrayType() {
 
             if (this.typarray > 0) {
 
-                return new PostgresType(this.typarray, this.typarray, this.name, this.category);
+                return new PostgresType(this.typarray, this.unsignedTyparray, this.typarray, this.unsignedTyparray, this.name, this.category);
             }
 
             throw new IllegalStateException("No array type available for " + this);
@@ -155,7 +165,18 @@ public Class<?> getJavaType() {
             return this.objectId != null ? this.objectId.getJavaType() : Object.class;
         }
 
-        @Override
+        public int getArrayObjectId() {
+            return this.typarray;
+        }
+
+        public long getUnsignedObjectId() {
+            return this.unsignedOid;
+        }
+
+        public long getUnsignedArrayObjectId() {
+            return this.unsignedTyparray;
+        }
+
         public String getName() {
             return this.name;
         }
@@ -268,19 +289,25 @@ public boolean equals(Object o) {
             }
             PostgresType that = (PostgresType) o;
             return this.oid == that.oid &&
+                this.unsignedOid == that.unsignedOid &&
+                this.typarray == that.typarray &&
+                this.unsignedTyparray == that.unsignedTyparray &&
                 Objects.equals(this.name, that.name) &&
                 Objects.equals(this.category, that.category);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(this.oid, this.name, this.category);
+            return Objects.hash(this.oid, this.unsignedOid, this.typarray, this.unsignedTyparray, this.name, this.category);
         }
 
         @Override
         public String toString() {
             return "PostgresType{" +
                 "oid=" + this.oid +
+                "unsignedOid=" + this.unsignedOid +
+                "typarray=" + this.typarray +
+                "unsignedTyparray=" + this.unsignedTyparray +
                 ", name='" + this.name + '\'' +
                 ", category='" + this.category + '\'' +
                 '}';

src/main/java/io/r2dbc/postgresql/codec/PostgresqlObjectId.java

@@ -31,6 +31,9 @@
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
 
+import io.r2dbc.postgresql.util.Assert;
+import reactor.util.annotation.Nullable;
+
 /**
  * Object IDs for well know PostgreSQL data types.
  * <p>Extension Object IDs that are provided by Postgres extensions such as PostGIS are not constants of this enumeration and must be looked up from {@code pg_type}.
@@ -573,4 +576,22 @@ public int getObjectId() {
         return this.objectId;
     }
 
+    public static int toInt(@Nullable Long oid) {
+        Assert.requireNonNull(oid, "OID must not be null");
+
+        return toInt(oid.longValue());
+    }
+
+    public static int toInt(long oid) {
+        if ((oid & 0xFFFFFFFF00000000L) != 0) {
+            throw new IllegalArgumentException("Value is not an OID:" + oid);
+        }
+
+        return (int) oid;
+    }
+
+    public static long toLong(int oid) {
+        return Integer.toUnsignedLong(oid);
+    }
+
 }

src/test/java/io/r2dbc/postgresql/codec/EnumCodecUnitTests.java

@@ -97,8 +97,8 @@ void shouldRegisterCodecAsFirst() {
         MockPostgresqlStatement mockPostgresqlStatement = MockPostgresqlStatement.builder()
             .result(MockPostgresqlResult.builder()
                 .row(MockRow.builder()
-                    .identified("oid", Integer.class, 42)
-                    .identified("typarray", Integer.class, 0)
+                    .identified("oid", Long.class, 42L)
+                    .identified("typarray", Long.class, 0L)
                     .identified("typname", String.class, "foo")
                     .identified("typcategory", String.class, "E")
                     .build())
@@ -128,14 +128,14 @@ void shouldRegisterCodecAsLast() {
         MockPostgresqlStatement mockPostgresqlStatement = MockPostgresqlStatement.builder()
             .result(MockPostgresqlResult.builder()
                 .row(MockRow.builder()
-                    .identified("oid", Integer.class, 42)
-                    .identified("typarray", Integer.class, 0)
+                    .identified("oid", Long.class, 42L)
+                    .identified("typarray", Long.class, 0L)
                     .identified("typname", String.class, "foo")
                     .identified("typcategory", String.class, "E")
                     .build())
                 .row(MockRow.builder()
-                    .identified("oid", Integer.class, 43)
-                    .identified("typarray", Integer.class, 0)
+                    .identified("oid", Long.class, 43L)
+                    .identified("typarray", Long.class, 0L)
                     .identified("typname", String.class, "bar")
                     .identified("typcategory", String.class, "E")
                     .build())