Extracted based logic of result set to BaseYdbResultSet

Author: alex268

jdbc/src/main/java/tech/ydb/jdbc/YdbResultSet.java

@@ -2,22 +2,10 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Optional;
 
-import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.values.Value;
 
 public interface YdbResultSet extends ResultSet {
-
-    /**
-     * Return YDB result set reader for direct processing
-     *
-     * @return YDB original result set reader
-     */
-    ResultSetReader getYdbResultSetReader();
-
-    //
-
     /**
      * Returns native YDB value, extracted from optional value.
      * Please note that this method will create value object for each method call.
@@ -26,7 +14,7 @@ public interface YdbResultSet extends ResultSet {
      * @return value if available; return empty if value is optional and no value provided
      * @throws SQLException if column cannot be read
      */
-    Optional<Value<?>> getNativeColumn(int columnIndex) throws SQLException;
+    Value<?> getNativeColumn(int columnIndex) throws SQLException;
 
     /**
      * Return native YDB value.
@@ -36,7 +24,7 @@ public interface YdbResultSet extends ResultSet {
      * @return value if available
      * @throws SQLException if column cannot be read
      */
-    Optional<Value<?>> getNativeColumn(String columnLabel) throws SQLException;
+    Value<?> getNativeColumn(String columnLabel) throws SQLException;
 
     //
 

jdbc/src/main/java/tech/ydb/jdbc/YdbResultSetMetaData.java

@@ -2,9 +2,6 @@
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 
 import tech.ydb.table.values.Type;
 
@@ -15,31 +12,7 @@ public interface YdbResultSetMetaData extends ResultSetMetaData {
      *
      * @param column column, 1..N
      * @return YDB type
+     * @throws java.sql.SQLException
      */
     Type getYdbType(int column) throws SQLException;
-
-    /**
-     * Returns column index by it's name, could be useful sometimes; basically because in YDB you should always
-     * work with names (columns or parameters), indexes are just internal details
-     *
-     * @param columnName column name to find
-     * @return column (1..N)
-     * @throws SQLException if column is unknown
-     */
-    int getColumnIndex(String columnName) throws SQLException;
-
-    /**
-     * Returns all column names
-     *
-     * @return column names
-     * @throws SQLException in case something bad happens
-     */
-    default Collection<String> getColumnNames() throws SQLException {
-        int count = getColumnCount();
-        List<String> columns = new ArrayList<>(count);
-        for (int i = 0; i < count; i++) {
-            columns.add(getColumnName(i + 1));
-        }
-        return columns;
-    }
 }

jdbc/src/main/java/tech/ydb/jdbc/common/ColumnInfo.java

@@ -0,0 +1,69 @@
+package tech.ydb.jdbc.common;
+
+import tech.ydb.table.values.PrimitiveType;
+import tech.ydb.table.values.Type;
+
+/**
+ *
+ * @author Aleksandr Gorshenin
+ */
+public class ColumnInfo {
+    private final String name;
+    private final Type ydbType;
+    private final MappingGetters.SqlType sqlType;
+    private final MappingGetters.Getters getters;
+
+    private final boolean isOptional;
+    private final boolean isTimestamp;
+    private final boolean isNumber;
+    private final boolean isNull;
+
+    public ColumnInfo(String name, Type type) {
+        this.name = name;
+
+        TypeDescription desc = TypeDescription.of(type);
+        this.sqlType = desc.sqlType();
+        this.getters = desc.getters();
+        this.isOptional = desc.isOptional();
+        this.ydbType = desc.ydbType();
+
+        this.isTimestamp = type == PrimitiveType.Timestamp;
+        this.isNumber = type == PrimitiveType.Int8 || type == PrimitiveType.Uint8
+                || type == PrimitiveType.Int16 || type == PrimitiveType.Uint16
+                || type == PrimitiveType.Int32 || type == PrimitiveType.Uint32
+                || type == PrimitiveType.Int64 || type == PrimitiveType.Uint64;
+        this.isNull = type.getKind() == Type.Kind.NULL || type.getKind() == Type.Kind.VOID;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public Type getYdbType() {
+        return this.ydbType;
+    }
+
+    public boolean isNull() {
+        return isNull;
+    }
+
+    public boolean isTimestamp() {
+        return isTimestamp;
+    }
+
+    public boolean isNumber() {
+        return isNumber;
+    }
+
+    public boolean isOptional() {
+        return isOptional;
+    }
+
+    public MappingGetters.SqlType getSqlType() {
+        return this.sqlType;
+    }
+
+    public MappingGetters.Getters getGetters() {
+        return this.getters;
+    }
+}