adapt a bit for aug2024 and up

MonetDBSolutions · Jul 8, 2024 · 35136ee · 35136ee
1 parent 4a7e6bf
commit 35136ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/linux-dev.yml b/.github/workflows/linux-dev.yml
@@ -1,4 +1,4 @@
-name: Linux CI - Dev build (Docker default and Oct2020)
+name: Linux CI - Dev build (Docker default and Aug2024)
 on: [push, workflow_dispatch, pull_request]
 
 jobs:
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        container: ["monetdb/dev-builds:default", "monetdb/dev-builds:Oct2020"]
+        container: ["monetdb/dev-builds:default", "monetdb/dev-builds:Aug2024"]
     container:
       image: ${{ matrix.container }}
     steps:

diff --git a/native/jni/monetdbe-java-native.c b/native/jni/monetdbe-java-native.c
@@ -45,15 +45,11 @@ void set_options_remote(JNIEnv *env, monetdbe_options *opts, jstring j_host, jin
 
 monetdbe_options *set_options(JNIEnv *env, jint j_sessiontimeout, jint j_querytimeout, jint j_memorylimit, jint j_nr_threads)
 {
-    monetdbe_options *opts = malloc(sizeof(monetdbe_options));
+    monetdbe_options *opts = calloc(sizeof(monetdbe_options), 1);
     opts->memorylimit = (int)j_memorylimit;
     opts->querytimeout = (int)j_querytimeout;
     opts->sessiontimeout = (int)j_sessiontimeout;
     opts->nr_threads = (int)j_nr_threads;
-#ifdef MONETDBE_VERSION
-    opts->remote = NULL;
-    opts->mapi_server = NULL;
-#endif
     return opts;
 }
 
@@ -661,9 +657,10 @@ JNIEXPORT jstring JNICALL Java_org_monetdb_monetdbe_MonetNative_monetdbe_1prepar
 {
     monetdbe_database db = (*env)->GetDirectBufferAddress(env, j_db);
     monetdbe_statement **stmt = malloc(sizeof(monetdbe_statement *));
+    monetdbe_result *p_result = NULL;
     char *sql = (char *)(*env)->GetStringUTFChars(env, j_sql, NULL);
 
-    char *error_msg = monetdbe_prepare(db, sql, stmt);
+    char *error_msg = monetdbe_prepare(db, sql, stmt, &p_result);
     if (error_msg)
     {
         return (*env)->NewStringUTF(env, (const char *)error_msg);
@@ -677,6 +674,7 @@ JNIEXPORT jstring JNICALL Java_org_monetdb_monetdbe_MonetNative_monetdbe_1prepar
         (*env)->SetIntField(env, j_statement, paramsField, (jint)nParams);
 
         //Set parameter types
+	//TODO use p_result table!
         if (nParams > 0)
         {
             jintArray j_parameterTypes = (*env)->NewIntArray(env, nParams);
@@ -710,6 +708,7 @@ JNIEXPORT jstring JNICALL Java_org_monetdb_monetdbe_MonetNative_monetdbe_1prepar
 
         jfieldID statementNativeField = (*env)->GetFieldID(env, statementClass, "statementNative", "Ljava/nio/ByteBuffer;");
         (*env)->SetObjectField(env, j_statement, statementNativeField, (*env)->NewDirectByteBuffer(env, (*stmt), sizeof(monetdbe_statement)));
+    	monetdbe_cleanup_result(db, p_result);
         return NULL;
     }
 }
@@ -869,4 +868,4 @@ JNIEXPORT jstring JNICALL Java_org_monetdb_monetdbe_MonetNative_monetdbe_1cleanu
     monetdbe_statement *stmt = (*env)->GetDirectBufferAddress(env, j_stmt);
     char *error_msg = monetdbe_cleanup_statement(db, stmt);
     return (*env)->NewStringUTF(env, (const char *)error_msg);
-}
+}
diff --git a/run_dev.sh b/run_dev.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 if [ $# -eq 0 ]; then
     echo "No example to run was provided"