MonetDB: embedded-java - Add preparation for DB shutdown

[Dimitar Nedev]

Changeset: 154f2b9536f1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=154f2b9536f1
Modified Files:
        java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
        java/embedded/org_monetdb_embedded_MonetDBEmbedded.h
        java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
        java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
Branch: embedded-java
Log Message:

Add preparation for DB shutdown


diffs (85 lines):

diff --git a/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c 
b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
--- a/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
+++ b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
@@ -172,3 +172,9 @@ JNIEXPORT jobject JNICALL Java_org_monet
 
        return result;
 }
+
+JNIEXPORT void JNICALL 
Java_org_monetdb_embedded_MonetDBEmbedded_shutdownWrapper
+(JNIEnv *env, jobject object) {
+       (void)object;
+       monetdb_shutdown();
+}
diff --git a/java/embedded/org_monetdb_embedded_MonetDBEmbedded.h 
b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.h
--- a/java/embedded/org_monetdb_embedded_MonetDBEmbedded.h
+++ b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.h
@@ -9,20 +9,28 @@ extern "C" {
 #endif
 /*
  * Class:     org_monetdb_embedded_MonetDBEmbedded
- * Method:    startupNative
- * Signature: (Ljava/lang/String;Z)I
+ * Method:    startupWrapper
+ * Signature: (Ljava/lang/String;Z)Z
  */
 JNIEXPORT jboolean JNICALL 
Java_org_monetdb_embedded_MonetDBEmbedded_startupWrapper
   (JNIEnv *, jobject, jstring, jboolean);
 
 /*
  * Class:     org_monetdb_embedded_MonetDBEmbedded
- * Method:    query
+ * Method:    queryWrapper
  * Signature: 
(Ljava/lang/String;)Lorg/monetdb/embedded/result/EmbeddedQueryResult;
  */
 JNIEXPORT jobject JNICALL 
Java_org_monetdb_embedded_MonetDBEmbedded_queryWrapper
   (JNIEnv *, jobject, jstring);
 
+/*
+ * Class:     org_monetdb_embedded_MonetDBEmbedded
+ * Method:    shutdownWrapper
+ * Signature: (V)V;
+ */
+JNIEXPORT void JNICALL 
Java_org_monetdb_embedded_MonetDBEmbedded_shutdownWrapper
+  (JNIEnv *, jobject);
+
 #ifdef __cplusplus
 }
 #endif
diff --git 
a/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java 
b/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
--- a/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
+++ b/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
@@ -132,10 +132,15 @@ public class MonetDBEmbedded implements 
         * @throws SQLException
         */
        private native EmbeddedQueryResult queryWrapper(String query) throws 
SQLException;
+       
+       /**
+        * Shut down the embedded database.
+        */
+       private native void shutdownWrapper();
 
        @Override
        public void close() throws IOException {
-               // Do nothing for now
-               // TODO: stop the databse
+               // Avoid for now
+//             shutdownWrapper();
        }
 }
diff --git 
a/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java 
b/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
--- a/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
+++ b/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
@@ -304,10 +304,11 @@ public class EmbeddedTest {
        }
 
        @AfterClass
-       public static void cleanup() throws SQLException {
+       public static void cleanup() throws SQLException, IOException {
                db.query("DROP TABLE test");
                db.query("DROP TABLE numeric_types_test");
                db.query("DROP TABLE char_types_test");
                db.query("DROP TABLE boolean_types_test");
+               db.close();
        }
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list