Changeset: 37f3ac2a3ed0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37f3ac2a3ed0
Modified Files:
configure.ag
java/embedded/Makefile.ag
java/embedded/pom.xml
java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
Branch: embedded-java
Log Message:
Further compilation and configuration fixes
diffs (188 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -214,11 +214,14 @@ AC_ARG_ENABLE(embedded-java,
[enable support for running MonetDB as a Java library
(default=no)]),
enable_embedded_java=$enableval,
enable_embedded_java=$dft_embedded_java)
-AM_CONDITIONAL(HAVE_EMBEDDED, test x$enable_embedded_java != xno)
-if test "x$enable_embedded" != xno; then
+if test "x$enable_embedded" = xno; then
enable_embedded_java=no
fi
+if test "x$enable_embedded_java" != xno; then
+ AC_DEFINE(HAVE_EMBEDDED_JAVA, 1, [Support for MonetDB as a Java
library])
+fi
+AM_CONDITIONAL(HAVE_EMBEDDED_JAVA, test x"$enable_embedded_java" != xno)
dft_microhttpd=no
AC_ARG_ENABLE(microhttpd,
@@ -2987,7 +2990,6 @@ AM_CONDITIONAL(HAVE_MONETDB5, test "x$en
AM_CONDITIONAL(HAVE_SQL, test "x$enable_sql" = xyes -o "x$enable_sql" = xauto)
AM_CONDITIONAL(HAVE_GEOM, test "x$enable_geom" = xyes -o "x$enable_geom" =
xauto)
AM_CONDITIONAL(HAVE_EMBEDDED, test "x$enable_embedded" = xyes)
-AM_CONDITIONAL(HAVE_EMBEDDED_JAVA, test "x$enable_embedded_java" = xyes)
AM_CONDITIONAL(HAVE_MEROVINGIAN, test "x$enable_merovingian" = xyes -o
"x$enable_merovingian" = xauto)
AM_CONDITIONAL(HAVE_MSERVER, test "x$enable_mserver" = xyes -o
"x$enable_mserver" = xauto)
AM_CONDITIONAL(HAVE_TESTING, test "x$enable_testing" = xyes -o
"x$enable_testing" = xauto)
@@ -3366,6 +3368,7 @@ for comp in \
'assert ' \
'optimize ' \
'embedded ' \
+ 'embedded-java' \
; do
eval "dft=\$dft_$comp"
eval "enable=\$enable_$comp"
diff --git a/java/embedded/Makefile.ag b/java/embedded/Makefile.ag
--- a/java/embedded/Makefile.ag
+++ b/java/embedded/Makefile.ag
@@ -38,11 +38,10 @@ INCLUDES = ../../tools/embedded \
-I"/Library/Frameworks/R.framework/Resources/include" \
$(pcre_CFLAGS)
-
lib_embedded_java = {
SOURCES = org_monetdb_embedded_MonetDBEmbedded.c
org_monetdb_embedded_MonetDBEmbedded.h \
org_monetdb_embedded_result_EmbeddedQueryResult.c
org_monetdb_embedded_result_EmbeddedQueryResult.h
- VERSION = 0.1
+ VERSION = 1
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
../../tools/embedded/libembedded \
diff --git a/java/embedded/pom.xml b/java/embedded/pom.xml
--- a/java/embedded/pom.xml
+++ b/java/embedded/pom.xml
@@ -4,11 +4,11 @@
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.monetdb</groupId>
+ <groupId>monetdb</groupId>
<artifactId>monetdb-embedded</artifactId>
<version>0.1-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
- <description>MonetDB Lite - an embedded version of MonetDB. Comes with
a native (JNI) Java interface.
+ <description>MonetDB Embedded - an embedded version of MonetDB. Comes
with a native (JNI) Java interface.
MonetDB is an analytical database designed to handle very large datasets. It
is currently the only free and open-source column store. As the name suggests,
the data is stored in columns, rather than rows. This gives it an advantage for
analytical, or read-optimized tasks, such as those required for data
processing, mining and visualisation. For optimal performance and limited
administration MonetDB is designed with CPU-tuned query execution architecture,
automatic and adaptive indices, run-time query optimization. MonetDB provides
an SQL:2003-compliant interface with full ACID properties and relational
semantics, if desired.</description>
<url>https://www.monetdb.org</url>
@@ -34,26 +34,14 @@ MonetDB is an analytical database design
</developer>
</developers>
- <distributionManagement>
- <snapshotRepository>
- <id>ossrh</id>
-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- <repository>
- <id>ossrh</id>
-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- </distributionManagement>
-
- <scm>
-
<connection>scm:hg:https://dev.monetdb.org/hg/MonetDB/</connection>
-
<developerConnection>scm:hg:ssh://[email protected]/MonetDB/</developerConnection>
- <url>https://dev.monetdb.org/hg/MonetDB/</url>
- </scm>
-
- <properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -109,4 +97,25 @@ MonetDB is an analytical database design
</plugins>
</build>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ <repository>
+ <id>ossrh</id>
+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ </repository>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:hg:https://dev.monetdb.org/hg/MonetDB/</connection>
+
<developerConnection>scm:hg:ssh://[email protected]/MonetDB/</developerConnection>
+ <url>https://dev.monetdb.org/hg/MonetDB/</url>
+ </scm>
+
+ <properties>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
</project>
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
@@ -8,6 +8,7 @@
package org.monetdb.embedded;
+import java.io.File;
import java.lang.reflect.Array;
import java.sql.SQLException;
@@ -20,7 +21,7 @@ import org.monetdb.embedded.result.Embed
*/
public class MonetDBEmbedded {
static {
- System.loadLibrary("monetdb");
+ System.loadLibrary("embedded_java");
}
/**
@@ -30,7 +31,7 @@ public class MonetDBEmbedded {
/**
* The working directory for MonetDB.
*/
- private String directory = "";
+ private File directory;
/**
* You can instantiate multiple object,
@@ -38,7 +39,7 @@ public class MonetDBEmbedded {
*
* @param directory Database directory
*/
- public MonetDBEmbedded(String directory) {
+ public MonetDBEmbedded(File directory) {
this.directory = directory;
}
@@ -60,7 +61,7 @@ public class MonetDBEmbedded {
*/
public boolean startup(boolean silent) {
if (!running) {
- if (startupWrapper(directory, silent) == 1) {
+ if (startupWrapper(directory.getAbsolutePath(), silent)
== 1) {
running = true;
}
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/EmbeddedQueryResult.java
@@ -90,7 +90,6 @@ public class EmbeddedQueryResult impleme
*/
private native Column<?> getColumnWrapper(long resultPointerWrapper,
int index);
-
@Override
public Iterator<Column<?>> iterator() {
return new Iterator<Column<?>>() {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
