build fixes

Author: g31pranjal

fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/RelationalArrayFacade.java

@@ -42,6 +42,7 @@
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Types;
+import java.util.UUID;
 
 /**
  * Facade over grpc protobuf objects that offers a {@link RelationalArray} view.
@@ -238,6 +239,11 @@ public RelationalArrayBuilder addLong(@Nonnull long value) throws SQLException {
             throw new SQLFeatureNotSupportedException();
         }
 
+        @Override
+        public RelationalArrayBuilder addUuid(@Nonnull final UUID value) throws SQLException {
+            throw new SQLFeatureNotSupportedException();
+        }
+
         @Override
         public RelationalArrayBuilder addStruct(RelationalStruct struct) throws SQLException {
             final var structFacade = struct.unwrap(RelationalStructFacade.class);

fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/RelationalResultSetMetaDataFacade.java

@@ -24,6 +24,7 @@
 import com.apple.foundationdb.relational.api.StructMetaData;
 import com.apple.foundationdb.relational.api.RelationalResultSetMetaData;
 import com.apple.foundationdb.relational.api.exceptions.ErrorCode;
+import com.apple.foundationdb.relational.api.metadata.DataType;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.ResultSetMetadata;
 import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
 import com.apple.foundationdb.relational.util.PositionalIndex;
@@ -47,6 +48,11 @@ public ArrayMetaData getArrayMetaData(int oneBasedColumn) throws SQLException {
         throw new SQLException("Not implemented", ErrorCode.UNSUPPORTED_OPERATION.getErrorCode());
     }
 
+    @Override
+    public DataType.StructType getRelationalDataType() throws SQLException {
+        throw new SQLException("Not implemented", ErrorCode.UNSUPPORTED_OPERATION.getErrorCode());
+    }
+
     @Override
     public StructMetaData getStructMetaData(int oneBasedColumn) throws SQLException {
         return new RelationalStructFacade.RelationalStructFacadeMetaData(

fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/RelationalStructFacade.java

@@ -26,6 +26,7 @@
 import com.apple.foundationdb.relational.api.RelationalStruct;
 import com.apple.foundationdb.relational.api.RelationalStructBuilder;
 import com.apple.foundationdb.relational.api.exceptions.ErrorCode;
+import com.apple.foundationdb.relational.api.metadata.DataType;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.Column;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.ColumnMetadata;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.ListColumn;
@@ -420,11 +421,6 @@ public RelationalStructBuilder addBoolean(String fieldName, boolean b) throws SQ
             return this;
         }
 
-        @Override
-        public RelationalStructBuilder addShort(String fieldName, short b) throws SQLException {
-            throw new SQLException("Not implemented " + Thread.currentThread() .getStackTrace()[1] .getMethodName());
-        }
-
         @Override
         public RelationalStructBuilder addLong(String fieldName, long l) throws SQLException {
             int offset = addMetadata(ColumnMetadata.newBuilder()
@@ -465,7 +461,12 @@ public RelationalStructBuilder addString(String fieldName, @Nullable String s) t
         }
 
         @Override
-        public RelationalStructBuilder addObject(String fieldName, @Nullable Object obj, int targetSqlType) throws SQLException {
+        public RelationalStructBuilder addUuid(final String fieldName, @Nullable final UUID uuid) throws SQLException {
+            throw new SQLException("Not implemented " + Thread.currentThread() .getStackTrace()[1] .getMethodName());
+        }
+
+        @Override
+        public RelationalStructBuilder addObject(final String fieldName, @Nullable final Object obj) throws SQLException {
             throw new SQLException("Not implemented " + Thread.currentThread() .getStackTrace()[1] .getMethodName());
         }
 
@@ -589,6 +590,11 @@ public int getLeadingPhantomColumnCount() {
             return -1000;
         }
 
+        @Override
+        public DataType.StructType getRelationalDataType() throws SQLException {
+            throw new SQLException("Not implemented", ErrorCode.UNSUPPORTED_OPERATION.getErrorCode());
+        }
+
         @Override
         public <T> T unwrap(Class<T> iface) throws SQLException {
             throw new SQLException("Not implemented", ErrorCode.UNSUPPORTED_OPERATION.getErrorCode());

fdb-relational-grpc/src/main/java/com/apple/foundationdb/relational/jdbc/TypeConversion.java

@@ -21,23 +21,22 @@
 package com.apple.foundationdb.relational.jdbc;
 
 import com.apple.foundationdb.annotation.API;
-
 import com.apple.foundationdb.relational.api.ArrayMetaData;
 import com.apple.foundationdb.relational.api.Continuation;
-import com.apple.foundationdb.relational.api.SqlTypeNamesSupport;
-import com.apple.foundationdb.relational.api.StructMetaData;
 import com.apple.foundationdb.relational.api.RelationalArray;
 import com.apple.foundationdb.relational.api.RelationalResultSet;
 import com.apple.foundationdb.relational.api.RelationalResultSetMetaData;
 import com.apple.foundationdb.relational.api.RelationalStruct;
 import com.apple.foundationdb.relational.api.RelationalStructMetaData;
+import com.apple.foundationdb.relational.api.StructMetaData;
 import com.apple.foundationdb.relational.api.exceptions.ErrorCode;
+import com.apple.foundationdb.relational.api.metadata.DataType;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.KeySet;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.KeySetValue;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.ResultSet;
-import com.apple.foundationdb.relational.jdbc.grpc.v1.RpcContinuationReason;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.ResultSetMetadata;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.RpcContinuation;
+import com.apple.foundationdb.relational.jdbc.grpc.v1.RpcContinuationReason;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.Array;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.Column;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.ColumnMetadata;
@@ -335,7 +334,7 @@ public static Array toArray(@Nonnull java.sql.Array array) throws SQLException {
      * @throws SQLException in case of error
      */
     public static Column toColumn(int columnType, @Nonnull Object obj) throws SQLException {
-        if (columnType != SqlTypeNamesSupport.getSqlTypeCodeFromObject(obj)) {
+        if (columnType != DataType.getDataTypeFromObject(obj).getJdbcSqlCode()) {
             throw new SQLException("Column element type does not match object type: " + columnType + " / " + obj.getClass().getSimpleName(),
                     ErrorCode.WRONG_OBJECT_TYPE.getErrorCode());
         }

fdb-relational-grpc/src/test/java/com/apple/foundationdb/relational/jdbc/MockResultSetMetadata.java

@@ -24,6 +24,7 @@
 import com.apple.foundationdb.relational.api.StructMetaData;
 import com.apple.foundationdb.relational.api.RelationalResultSetMetaData;
 import com.apple.foundationdb.relational.api.exceptions.ErrorCode;
+import com.apple.foundationdb.relational.api.metadata.DataType;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -55,6 +56,11 @@ public ArrayMetaData getArrayMetaData(int oneBasedColumn) throws SQLException {
         throw new SQLException("Unsupported operation", ErrorCode.UNSUPPORTED_OPERATION.getErrorCode());
     }
 
+    @Override
+    public DataType.StructType getRelationalDataType() throws SQLException {
+        throw new SQLException("Unsupported operation", ErrorCode.UNSUPPORTED_OPERATION.getErrorCode());
+    }
+
     @Override
     public int getColumnCount() throws SQLException {
         return columnTypes.size();

fdb-relational-jdbc/src/main/java/com/apple/foundationdb/relational/jdbc/ParameterHelper.java

@@ -20,8 +20,8 @@
 
 package com.apple.foundationdb.relational.jdbc;
 
-import com.apple.foundationdb.relational.api.SqlTypeNamesSupport;
 import com.apple.foundationdb.relational.api.exceptions.ErrorCode;
+import com.apple.foundationdb.relational.api.metadata.DataType;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.Parameter;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.Column;
 import com.apple.foundationdb.relational.jdbc.grpc.v1.column.Uuid;
@@ -136,7 +136,7 @@ public static Parameter ofArray(final Array a) throws SQLException {
     }
 
     public static Parameter ofObject(Object x) throws SQLException {
-        final int typeCodeFromObject = SqlTypeNamesSupport.getSqlTypeCodeFromObject(x);
+        final int typeCodeFromObject = DataType.getDataTypeFromObject(x).getJdbcSqlCode();
         switch (typeCodeFromObject) {
             case Types.BIGINT:
                 return ofLong((Long)x);