Support spatial extension types

This change adds support for the following types from the spatial
extension:

 - `POINT_2D`: as `STRUCT{x: DOUBLE, y: DOUBLE}`
 - `POINT_3D`: as `STRUCT{x: DOUBLE, y: DOUBLE, z: DOUBLE}`
 - `POINT_4D`: as `STRUCT{x: DOUBLE, y: DOUBLE, z: DOUBLE, m: DOUBLE}`
 - `LINESTRING_2D`: as `LIST[STRUCT{x: DOUBLE, y: DOUBLE}]`
 - `POLYGON_2D`: as `LIST[LIST[STRUCT{x: DOUBLE, y: DOUBLE}]]`
 - `BOX_2D`: as `STRUCT{min_x: DOUBLE, max_x: DOUBLE, min_y: DOUBLE, max_y: DOUBLE}`
 - `BOX_2DF`: as `STRUCT{min_x: FLOAT, max_x: FLOAT, min_y: FLOAT, max_y: FLOAT}`
 - `GEOMETRY`: as `BLOB`
 - `WKB_BLOB`: as `BLOB`

 No new Java APIs are added for these types. Instead `java.sql.Array`,
 `java.sql.Struct` and `java.sql.Blob` need to be used to read them
 from a result set or to pass them as bind parameters.

Testing: new test added to cover all spatial types in bind parameters
and in result set.

Fixes: duckdb#37

Author: staticlibs

CMakeLists.txt

@@ -155,6 +155,7 @@ add_library(duckdb_java SHARED
   src/jni/duckdb_java.cpp
   src/jni/functions.cpp
   src/jni/refs.cpp
+  src/jni/types.cpp
   src/jni/util.cpp
   ${DUCKDB_SRC_FILES})
 target_compile_definitions(duckdb_java PRIVATE -DDUCKDB_STATIC_BUILD)

src/jni/duckdb_java.cpp

@@ -14,6 +14,7 @@
 #include "duckdb/parser/parsed_data/create_type_info.hpp"
 #include "functions.hpp"
 #include "refs.hpp"
+#include "types.hpp"
 #include "util.hpp"
 
 #include <cstdint>
@@ -515,6 +516,7 @@ jobjectArray _duckdb_jdbc_fetch(JNIEnv *env, jclass, jobject res_ref_buf, jobjec
 
 	return vec_array;
 }
+
 jobject ProcessVector(JNIEnv *env, Connection *conn_ref, Vector &vec, idx_t row_count) {
 	auto type_str = env->NewStringUTF(type_to_jduckdb_type(vec.GetType()).c_str());
 	// construct nullmask
@@ -532,7 +534,7 @@ jobject ProcessVector(JNIEnv *env, Connection *conn_ref, Vector &vec, idx_t row_
 
 	// this allows us to treat aliased (usually extension) types as strings
 	auto type = vec.GetType();
-	auto type_id = type.HasAlias() ? LogicalTypeId::UNKNOWN : type.id();
+	auto type_id = type_id_from_type(type);
 
 	switch (type_id) {
 	case LogicalTypeId::BOOLEAN:

src/jni/types.cpp

@@ -0,0 +1,33 @@
+
+#include "types.hpp"
+
+#include "util.hpp"
+
+#include <string>
+#include <vector>
+
+static const std::vector<std::string> SPATIAL_STRUCT_TYPES = {"POINT_2D", "POINT_3D", "POINT_4D", "BOX_2D", "BOX_2DF"};
+static const std::vector<std::string> SPATIAL_LIST_TYPES = {"LINESTRING_2D", "POLYGON_2D"};
+static const std::vector<std::string> SPATIAL_BLOB_TYPES = {"GEOMETRY", "WKB_BLOB"};
+
+duckdb::LogicalTypeId type_id_from_type(const duckdb::LogicalType &type) {
+	if (!type.HasAlias()) {
+		return type.id();
+	}
+
+	std::string alias = type.GetAlias();
+
+	if (vector_contains(SPATIAL_STRUCT_TYPES, alias)) {
+		return duckdb::LogicalTypeId::STRUCT;
+	}
+
+	if (vector_contains(SPATIAL_LIST_TYPES, alias)) {
+		return duckdb::LogicalTypeId::LIST;
+	}
+
+	if (vector_contains(SPATIAL_BLOB_TYPES, alias)) {
+		return duckdb::LogicalTypeId::BLOB;
+	}
+
+	return duckdb::LogicalTypeId::UNKNOWN;
+}

src/jni/types.hpp

@@ -0,0 +1,6 @@
+
+#pragma once
+
+#include "duckdb.hpp"
+
+duckdb::LogicalTypeId type_id_from_type(const duckdb::LogicalType &type);

src/jni/util.hpp

@@ -2,8 +2,10 @@
 
 #include "duckdb.hpp"
 
+#include <algorithm>
 #include <jni.h>
 #include <string>
+#include <vector>
 
 void check_java_exception_and_rethrow(JNIEnv *env);
 
@@ -14,3 +16,9 @@ std::string jstring_to_string(JNIEnv *env, jstring string_j);
 jobject decode_charbuffer_to_jstring(JNIEnv *env, const char *d_str, idx_t d_str_len);
 
 duckdb::Value create_value_from_bigdecimal(JNIEnv *env, jobject decimal);
+
+template <typename T>
+bool vector_contains(const std::vector<T> &vec, const T &value) {
+	auto found = std::find(vec.begin(), vec.end(), value);
+	return found != vec.end();
+}

src/main/java/org/duckdb/DuckDBColumnType.java

@@ -35,5 +35,16 @@ public enum DuckDBColumnType {
     MAP,
     ARRAY,
     UNKNOWN,
-    UNION;
+    UNION,
+
+    // spatial extension types
+    POINT_2D,
+    POINT_3D,
+    POINT_4D,
+    LINESTRING_2D,
+    POLYGON_2D,
+    BOX_2D,
+    BOX_2DF,
+    GEOMETRY,
+    WKB_BLOB;
 }

src/main/java/org/duckdb/DuckDBVector.java

@@ -109,15 +109,24 @@ Object getObject(int idx) throws SQLException {
         case JSON:
             return getJsonObject(idx);
         case BLOB:
+        case GEOMETRY:
+        case WKB_BLOB:
             return getBlob(idx);
         case UUID:
             return getUuid(idx);
         case MAP:
             return getMap(idx);
         case LIST:
         case ARRAY:
+        case LINESTRING_2D:
+        case POLYGON_2D:
             return getArray(idx);
         case STRUCT:
+        case POINT_2D:
+        case POINT_3D:
+        case POINT_4D:
+        case BOX_2D:
+        case BOX_2DF:
             return getStruct(idx);
         case UNION:
             return getUnion(idx);
@@ -249,7 +258,11 @@ Array getArray(int idx) throws SQLException {
         if (check_and_null(idx)) {
             return null;
         }
-        if (isType(DuckDBColumnType.LIST) || isType(DuckDBColumnType.ARRAY)) {
+        switch (duckdb_type) {
+        case LIST:
+        case ARRAY:
+        case LINESTRING_2D:
+        case POLYGON_2D:
             return (Array) varlen_data[idx];
         }
         throw new SQLFeatureNotSupportedException("getArray");
@@ -278,10 +291,12 @@ Blob getBlob(int idx) throws SQLException {
         if (check_and_null(idx)) {
             return null;
         }
-        if (isType(DuckDBColumnType.BLOB)) {
+        switch (duckdb_type) {
+        case BLOB:
+        case GEOMETRY:
+        case WKB_BLOB:
             return new DuckDBResultSet.DuckDBBlobResult(ByteBuffer.wrap((byte[]) varlen_data[idx]));
         }
-
         throw new SQLFeatureNotSupportedException("getBlob");
     }