Changeset: 636437d082ab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=636437d082ab
Added Files:
java/embedded/embedded.c
java/embedded/embedded.h
Modified Files:
java/embedded/Makefile.ag
java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
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:
Compilation and interface fixes
Also, pull in part of the non-R embedded C lib while testing to avoid pulling
in R dependencies
diffs (truncated from 347 to 300 lines):
diff --git a/java/embedded/Makefile.ag b/java/embedded/Makefile.ag
--- a/java/embedded/Makefile.ag
+++ b/java/embedded/Makefile.ag
@@ -17,8 +17,7 @@
MTSAFE
-INCLUDES = ../../tools/embedded \
- ../../monetdb5/mal \
+INCLUDES = ../../monetdb5/mal \
../../monetdb5/modules/atoms \
../../monetdb5/modules/mal \
../../monetdb5/extras/rapi \
@@ -35,16 +34,15 @@ INCLUDES = ../../tools/embedded \
../../sql/backends/monet5 \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/darwin \
- -I"/Library/Frameworks/R.framework/Resources/include" \
$(pcre_CFLAGS)
lib_embedded_java = {
- SOURCES = org_monetdb_embedded_MonetDBEmbedded.c
org_monetdb_embedded_MonetDBEmbedded.h \
+ SOURCES = embedded.c embedded.h \
+ org_monetdb_embedded_MonetDBEmbedded.c
org_monetdb_embedded_MonetDBEmbedded.h \
org_monetdb_embedded_result_EmbeddedQueryResult.c
org_monetdb_embedded_result_EmbeddedQueryResult.h
VERSION = 1
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
- ../../tools/embedded/libembedded \
$(pcre_LIBS) $(PSAPILIB) \
$(SOCKET_LIBS) $(MALLOC_LIBS) $(DL_LIBS) $(PTHREAD_LIBS)
}
diff --git a/java/embedded/embedded.c b/java/embedded/embedded.c
new file mode 100644
--- /dev/null
+++ b/java/embedded/embedded.c
@@ -0,0 +1,189 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 2008-2015 MonetDB B.V.
+ */
+
+/*
+ * H. Muehleisen, M. Raasveldt
+ * Inverse RAPI
+ */
+
+/*
+ * Taken from the embedded branch tools/embedded/embedded.h
+ * Stripped of the R-specific functions
+ */
+
+#include "embedded.h"
+
+#include "monetdb_config.h"
+#include "monet_options.h"
+#include "mal.h"
+#include "mal_client.h"
+#include "mal_linker.h"
+#include "msabaoth.h"
+#include "sql_scenario.h"
+#include "gdk_utils.h"
+
+typedef str (*SQLstatementIntern_ptr_tpe)(Client, str*, str, bit, bit,
res_table**);
+SQLstatementIntern_ptr_tpe SQLstatementIntern_ptr = NULL;
+typedef str (*SQLautocommit_ptr_tpe)(Client, mvc*);
+SQLautocommit_ptr_tpe SQLautocommit_ptr = NULL;
+typedef str (*SQLinitClient_ptr_tpe)(Client);
+SQLinitClient_ptr_tpe SQLinitClient_ptr = NULL;
+typedef str (*getSQLContext_ptr_tpe)(Client, MalBlkPtr, mvc**, backend**);
+getSQLContext_ptr_tpe getSQLContext_ptr = NULL;
+typedef void (*res_table_destroy_ptr_tpe)(res_table *t);
+res_table_destroy_ptr_tpe res_table_destroy_ptr = NULL;
+typedef str (*mvc_append_wrap_ptr_tpe)(Client, MalBlkPtr, MalStkPtr, InstrPtr);
+mvc_append_wrap_ptr_tpe mvc_append_wrap_ptr = NULL;
+typedef sql_schema* (*mvc_bind_schema_ptr_tpe)(mvc*, const char*);
+mvc_bind_schema_ptr_tpe mvc_bind_schema_ptr = NULL;
+typedef sql_table* (*mvc_bind_table_ptr_tpe)(mvc*, sql_schema*, const char*);
+mvc_bind_table_ptr_tpe mvc_bind_table_ptr = NULL;
+typedef int (*sqlcleanup_ptr_tpe)(mvc*, int);
+sqlcleanup_ptr_tpe sqlcleanup_ptr = NULL;
+typedef void (*mvc_trans_ptr_tpe)(mvc*);
+mvc_trans_ptr_tpe mvc_trans_ptr = NULL;
+
+static bit monetdb_embedded_initialized = 0;
+static MT_Lock monetdb_embedded_lock;
+
+static void* lookup_function(char* lib, char* func) {
+ void *dl, *fun;
+ dl = mdlopen(lib, RTLD_NOW | RTLD_GLOBAL);
+ if (dl == NULL) {
+ return NULL;
+ }
+ fun = dlsym(dl, func);
+ dlclose(dl);
+ return fun;
+}
+
+int monetdb_startup(char* dir, char silent) {
+ opt *set = NULL;
+ int setlen = 0;
+ int retval = -1;
+ void* res = NULL;
+ char mod_path[1000];
+
+ if(setjmp(GDKfataljump) != 0) {
+ // we will get here if GDKfatal was called.
+ if (GDKfatalmsg != NULL) {
+ fputs(GDKfatalmsg, stderr);
+ fputs("\n", stderr);
+ GDKfree(GDKfatalmsg);
+ }
+ retval = -2;
+ goto cleanup;
+ }
+
+ MT_lock_init(&monetdb_embedded_lock, "monetdb_embedded_lock");
+ MT_lock_set(&monetdb_embedded_lock, "monetdb.startup");
+ if (monetdb_embedded_initialized) goto cleanup;
+
+ setlen = mo_builtin_settings(&set);
+ setlen = mo_add_option(&set, setlen, opt_cmdline, "gdk_dbpath", dir);
+ if (GDKinit(set, setlen) == 0) {
+ retval = -3;
+ goto cleanup;
+ }
+
+ snprintf(mod_path, 1000, "%s/../lib/monetdb5", BINDIR);
+ GDKsetenv("monet_mod_path", mod_path);
+ GDKsetenv("mapi_disable", "true");
+ GDKsetenv("max_clients", "0");
+ GDKsetenv("sql_optimizer", "sequential_pipe"); // TODO: SELECT * FROM
table should not use mitosis in the first place.
+
+ if (silent) THRdata[0] = stream_blackhole_create();
+ msab_dbpathinit(GDKgetenv("gdk_dbpath"));
+ if (mal_init() != 0) {
+ retval = -4;
+ goto cleanup;
+ }
+ if (silent) mal_clients[0].fdout = THRdata[0];
+
+ // This dynamically looks up functions, because the library containing
them is loaded at runtime.
+ // argh
+ SQLstatementIntern_ptr = (SQLstatementIntern_ptr_tpe)
lookup_function("lib_sql", "SQLstatementIntern");
+ SQLautocommit_ptr = (SQLautocommit_ptr_tpe) lookup_function("lib_sql",
"SQLautocommit");
+ SQLinitClient_ptr = (SQLinitClient_ptr_tpe) lookup_function("lib_sql",
"SQLinitClient");
+ getSQLContext_ptr = (getSQLContext_ptr_tpe) lookup_function("lib_sql",
"getSQLContext");
+ res_table_destroy_ptr = (res_table_destroy_ptr_tpe)
lookup_function("libstore", "res_table_destroy");
+ mvc_append_wrap_ptr = (mvc_append_wrap_ptr_tpe)
lookup_function("lib_sql", "mvc_append_wrap");
+ mvc_bind_schema_ptr = (mvc_bind_schema_ptr_tpe)
lookup_function("lib_sql", "mvc_bind_schema");
+ mvc_bind_table_ptr = (mvc_bind_table_ptr_tpe)
lookup_function("lib_sql", "mvc_bind_table");
+ sqlcleanup_ptr = (sqlcleanup_ptr_tpe) lookup_function("lib_sql",
"sqlcleanup");
+ mvc_trans_ptr = (mvc_trans_ptr_tpe) lookup_function("lib_sql",
"mvc_trans");
+
+ if (SQLstatementIntern_ptr == NULL || SQLautocommit_ptr == NULL ||
+ SQLinitClient_ptr == NULL || getSQLContext_ptr == NULL
||
+ res_table_destroy_ptr == NULL || mvc_append_wrap_ptr ==
NULL ||
+ mvc_bind_schema_ptr == NULL || mvc_bind_table_ptr ==
NULL ||
+ sqlcleanup_ptr == NULL || mvc_trans_ptr == NULL) {
+ retval = -5;
+ goto cleanup;
+ }
+ // call this, otherwise c->sqlcontext is empty
+ (*SQLinitClient_ptr)(&mal_clients[0]);
+ ((backend *) mal_clients[0].sqlcontext)->mvc->session->auto_commit = 1;
+ monetdb_embedded_initialized = true;
+ // sanity check, run a SQL query
+ if (monetdb_query("SELECT * FROM tables;", res) != NULL) {
+ monetdb_embedded_initialized = false;
+ retval = -6;
+ goto cleanup;
+ }
+ retval = 0;
+cleanup:
+ mo_free_options(set, setlen);
+ MT_lock_unset(&monetdb_embedded_lock, "monetdb.startup");
+ return retval;
+}
+
+char* monetdb_query(char* query, void** result) {
+ str res = MAL_SUCCEED;
+ Client c = &mal_clients[0];
+ mvc* m = ((backend *) c->sqlcontext)->mvc;
+ if (!monetdb_embedded_initialized) {
+ fprintf(stderr, "Embedded MonetDB is not started.\n");
+ return NULL;
+ }
+
+ if(setjmp(GDKfataljump) != 0) {
+ // we will get here if GDKfatal was called.
+ if (GDKfatalmsg == NULL) {
+ return GDKstrdup("Fatal GDK error. This is bad. ");
+ }
+ return GDKfatalmsg;
+ }
+
+ while (*query == ' ' || *query == '\t') query++;
+ if (strncasecmp(query, "START", 5) == 0) { // START TRANSACTION
+ m->session->auto_commit = 0;
+ }
+ else if (strncasecmp(query, "ROLLBACK", 8) == 0) {
+ m->session->status = -1;
+ m->session->auto_commit = 1;
+ }
+ else if (strncasecmp(query, "COMMIT", 6) == 0) {
+ m->session->auto_commit = 1;
+ }
+ else if (strncasecmp(query, "SHIBBOLEET", 10) == 0) {
+ res =
GDKstrdup("\x46\x6f\x72\x20\x69\x6d\x6d\x65\x64\x69\x61\x74\x65\x20\x74\x65\x63\x68\x6e\x69\x63\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x63\x61\x6c\x6c\x20\x2b\x33\x31\x20\x32\x30\x20\x35\x39\x32\x20\x34\x30\x33\x39");
+ }
+ else if (m->session->status < 0 && m->session->auto_commit ==0){
+ res = GDKstrdup("Current transaction is aborted (please
ROLLBACK)");
+ } else {
+ res = (*SQLstatementIntern_ptr)(c, &query, "name", 1, 0,
(res_table **) result);
+ }
+
+ (*SQLautocommit_ptr)(c, m);
+ return res;
+}
+
+void monetdb_cleanup_result(void* output) {
+ (*res_table_destroy_ptr)((res_table*) output);
+}
diff --git a/java/embedded/embedded.h b/java/embedded/embedded.h
new file mode 100644
--- /dev/null
+++ b/java/embedded/embedded.h
@@ -0,0 +1,20 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 2008-2015 MonetDB B.V.
+ */
+
+/*
+ * H. Muehleisen, M. Raasveldt
+ * Inverse RAPI
+ */
+#ifndef _INVERSE_RAPI_LIB_
+#define _INVERSE_RAPI_LIB_
+
+int monetdb_startup(char* dir, char silent);
+char* monetdb_query(char* query, void** result);
+void monetdb_cleanup_result(void* output);
+
+#endif
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
@@ -13,7 +13,7 @@
#include "res_table.h"
#include "mal_type.h"
-jint JNICALL Java_org_monetdb_embedded_MonetDBEmbedded_startupWrapper
+JNIEXPORT jint JNICALL Java_org_monetdb_embedded_MonetDBEmbedded_startupWrapper
(JNIEnv *env, jobject object, jstring directory, jboolean silent) {
(void)object;
const char *directory_string_tmp = (*env)->GetStringUTFChars(env,
directory, 0);
@@ -29,7 +29,7 @@ jint JNICALL Java_org_monetdb_embedded_M
return monetdb_startup(directory_string, silent_char);
}
-jobject JNICALL Java_org_monetdb_embedded_MonetDBEmbedded_query
+JNIEXPORT jobject JNICALL Java_org_monetdb_embedded_MonetDBEmbedded_query
(JNIEnv *env, jobject object, jstring query) {
(void)object;
res_table *output = NULL;
@@ -120,7 +120,7 @@ jobject JNICALL Java_org_monetdb_embedde
return result;
}
-jstring JNICALL Java_org_monetdb_embedded_MonetDBEmbedded_append
+JNIEXPORT jstring JNICALL Java_org_monetdb_embedded_MonetDBEmbedded_append
(JNIEnv *env, jobject object, jstring table, jstring schema, jobject data) {
(void)object;
(void)table;
diff --git a/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
b/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
--- a/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
+++ b/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
@@ -12,7 +12,7 @@
#include "monetdb_config.h"
#include "res_table.h"
-jobject JNICALL
Java_org_monetdb_embedded_result_EmbeddedQueryResult_getColumnWrapper
+JNIEXPORT jobject JNICALL
Java_org_monetdb_embedded_result_EmbeddedQueryResult_getColumnWrapper
(JNIEnv *env, jobject object, jlong resultTablePointer, jint columnIndex) {
(void)object;
// The result table
@@ -62,7 +62,7 @@ jobject JNICALL Java_org_monetdb_embedde
return column;
}
-void JNICALL Java_org_monetdb_embedded_result_EmbeddedQueryResult_cleanupResult
+JNIEXPORT void JNICALL
Java_org_monetdb_embedded_result_EmbeddedQueryResult_cleanupResult
(JNIEnv *env, jobject object, jlong resultTablePointer) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
