Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close pending statements on connection close #170

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Close pending statements on connection close #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ set(DUCKDB_SRC_FILES
src/duckdb/extension/json/json_serializer.cpp
src/duckdb/ub_extension_json_json_functions.cpp)

set(JEMACLLOC_SRC_FILES
set(JEMALLOC_SRC_FILES
src/duckdb/extension/jemalloc/jemalloc_extension.cpp
src/duckdb/extension/jemalloc/jemalloc/src/jemalloc.c
src/duckdb/extension/jemalloc/jemalloc/src/arena.c
Expand Down Expand Up @@ -552,14 +552,16 @@ add_jar(duckdb_jdbc_tests ${JAVA_TEST_FILES} INCLUDE_JARS duckdb_jdbc)
if(MSVC)
list(APPEND DUCKDB_SRC_FILES duckdb_java.def)
else()
list(APPEND DUCKDB_SRC_FILES ${JEMACLLOC_SRC_FILES})
list(APPEND DUCKDB_SRC_FILES ${JEMALLOC_SRC_FILES})
endif()

add_library(duckdb_java SHARED
src/jni/config.cpp
src/jni/duckdb_java.cpp
src/jni/functions.cpp
src/jni/holders.cpp
src/jni/refs.cpp
src/jni/types.cpp
src/jni/util.cpp
${DUCKDB_SRC_FILES})

Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ set(DUCKDB_DEFINITIONS
set(DUCKDB_SRC_FILES
${SOURCES})

set(JEMACLLOC_SRC_FILES
set(JEMALLOC_SRC_FILES
${JEMALLOC_SOURCES})


Expand Down Expand Up @@ -95,14 +95,16 @@ add_jar(duckdb_jdbc_tests ${JAVA_TEST_FILES} INCLUDE_JARS duckdb_jdbc)
if(MSVC)
list(APPEND DUCKDB_SRC_FILES duckdb_java.def)
else()
list(APPEND DUCKDB_SRC_FILES ${JEMACLLOC_SRC_FILES})
list(APPEND DUCKDB_SRC_FILES ${JEMALLOC_SRC_FILES})
endif()

add_library(duckdb_java SHARED
src/jni/config.cpp
src/jni/duckdb_java.cpp
src/jni/functions.cpp
src/jni/holders.cpp
src/jni/refs.cpp
src/jni/types.cpp
src/jni/util.cpp
${DUCKDB_SRC_FILES})

Expand Down
1 change: 1 addition & 0 deletions duckdb_java.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1auto_1commit
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1catalog
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1schema
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1interrupt
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1is_1result_1open
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1prepare
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1prepared_1statement_1meta
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1query_1result_1meta
Expand Down
1 change: 1 addition & 0 deletions duckdb_java.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ _Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1auto_1commit
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1catalog
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1schema
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1interrupt
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1is_1result_1open
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1prepare
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1prepared_1statement_1meta
_Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1query_1result_1meta
Expand Down
1 change: 1 addition & 0 deletions duckdb_java.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ DUCKDB_JAVA {
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1catalog;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1get_1schema;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1interrupt;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1is_1result_1open;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1prepare;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1prepared_1statement_1meta;
Java_org_duckdb_DuckDBNative_duckdb_1jdbc_1query_1result_1meta;
Expand Down
Loading
Loading