Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion duckdb_java.def
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1appender
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1db_1ref
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1destroy_1db_1ref
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1db_1address
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1extension_1type
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1disconnect
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1execute
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1execute_1capi
Expand Down
1 change: 0 additions & 1 deletion duckdb_java.exp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ _Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1appender
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1db_1ref
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1destroy_1db_1ref
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1db_1address
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1extension_1type
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1disconnect
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1execute
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1execute_1capi
Expand Down
1 change: 0 additions & 1 deletion duckdb_java.map
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ DUCKDB_JAVA {
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1db_1ref;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1destroy_1db_1ref;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1db_1address;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1extension_1type;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1disconnect;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1execute;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1execute_1capi;
Expand Down
19 changes: 0 additions & 19 deletions src/jni/duckdb_java.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1001,25 +1001,6 @@ void _duckdb_jdbc_arrow_register(JNIEnv *env, jclass, jobject conn_ref_buf, jlon
conn->TableFunction("arrow_scan_dumb", parameters)->CreateView(Identifier(name), true, true);
}

void _duckdb_jdbc_create_extension_type(JNIEnv *env, jclass, jobject conn_buf) {

auto connection = get_connection(env, conn_buf);
if (!connection) {
return;
}

auto &db_instance = DatabaseInstance::GetDatabase(*connection->context);
ExtensionLoader loader(db_instance, "jdbc");
child_list_t<LogicalType> children = {{"hello", LogicalType::VARCHAR}, {"world", LogicalType::VARCHAR}};
auto hello_world_type = LogicalType::STRUCT(children);
hello_world_type.SetAlias("test_type");
loader.RegisterType("test_type", hello_world_type);

LogicalType byte_test_type_type = LogicalTypeId::BLOB;
byte_test_type_type.SetAlias("byte_test_type");
loader.RegisterType("byte_test_type", byte_test_type_type);
}

static ProfilerPrintFormat GetProfilerPrintFormat(JNIEnv *env, jobject format) {
jobject jname = env->CallObjectMethod(format, J_ProfilerPrintFormat_getName);
check_java_exception_and_rethrow(env);
Expand Down
10 changes: 0 additions & 10 deletions src/jni/functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,16 +483,6 @@ JNIEXPORT void JNICALL Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1appender_1appe
}
}

JNIEXPORT void JNICALL Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1extension_1type(JNIEnv * env, jclass param0, jobject param1) {
try {
return _duckdb_jdbc_create_extension_type(env, param0, param1);
} catch (const std::exception &e) {
duckdb::ErrorData error(e);
ThrowJNI(env, error.Message().c_str());

}
}

JNIEXPORT jstring JNICALL Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1profiling_1information(JNIEnv * env, jclass param0, jobject param1, jobject param2) {
try {
return _duckdb_jdbc_get_profiling_information(env, param0, param1, param2);
Expand Down
4 changes: 0 additions & 4 deletions src/jni/functions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,6 @@ void _duckdb_jdbc_appender_append_null(JNIEnv * env, jclass param0, jobject para

JNIEXPORT void JNICALL Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1appender_1append_1null(JNIEnv * env, jclass param0, jobject param1);

void _duckdb_jdbc_create_extension_type(JNIEnv * env, jclass param0, jobject param1);

JNIEXPORT void JNICALL Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1create_1extension_1type(JNIEnv * env, jclass param0, jobject param1);

jstring _duckdb_jdbc_get_profiling_information(JNIEnv * env, jclass param0, jobject param1, jobject param2);

JNIEXPORT jstring JNICALL Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1profiling_1information(JNIEnv * env, jclass param0, jobject param1, jobject param2);
6 changes: 0 additions & 6 deletions src/main/java/org/duckdb/DuckDBNative.java
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,7 @@ static native void duckdb_jdbc_appender_append_decimal(ByteBuffer appender_ref,

static native void duckdb_jdbc_appender_append_null(ByteBuffer appender_ref) throws SQLException;

static native void duckdb_jdbc_create_extension_type(ByteBuffer conn_ref) throws SQLException;

protected static native String duckdb_jdbc_get_profiling_information(ByteBuffer conn_ref,
ProfilerPrintFormat format)
throws SQLException;

public static void duckdb_jdbc_create_extension_type(DuckDBConnection conn) throws SQLException {
duckdb_jdbc_create_extension_type(conn.connRef);
}
}
2 changes: 1 addition & 1 deletion src/test/java/org/duckdb/TestDuckDBJDBC.java
Original file line number Diff line number Diff line change
Expand Up @@ -2328,7 +2328,7 @@ public static void main(String[] args) throws Exception {
runTests(args, TestDuckDBJDBC.class, TestAppender.class, TestAppenderCollection.class,
TestAppenderCollection2D.class, TestAppenderComposite.class, TestSingleValueAppender.class,
TestBatch.class, TestBindings.class, TestChunkedResult.class, TestClosure.class,
TestExtensionTypes.class, TestJfrEvents.class, TestMetadata.class, /* TestNoLib.class ,*/
TestJfrEvents.class, TestMetadata.class, /* TestNoLib.class ,*/
TestSpatial.class, TestParameterMetadata.class, TestPrepare.class, TestResults.class,
TestScalarFunctions.class, TestSessionInit.class, TestTableFunctions.class,
TestTimestamp.class, TestVariant.class);
Expand Down
54 changes: 0 additions & 54 deletions src/test/java/org/duckdb/TestExtensionTypes.java

This file was deleted.

Loading