Changeset: 37081640826c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37081640826c
Modified Files:
configure.ag
java/example/XMLDBtest.java
Branch: jacqueline
Log Message:
Merged from default
diffs (truncated from 2479 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -463,3 +463,9 @@ 0e42a9ccf4c65e301f76c721ea84e976de6ede84
95911663ea9e3823837168d3f64328360aaf061a Aug2011_SP3_release
600e707d12ac73973bfd4538c11bd340cf6094ae Dec2011_1
d9968eb987609db9990da16db1de57737107502f Dec2011_release
+14ff565c407c49df8512d7a4b29b583b76a505c6 Dec2011_3
+d9968eb987609db9990da16db1de57737107502f Dec2011_release
+6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release
+2373eb4ee98b690aa72b86bebf4b2b47c87aa77c Dec2011_5
+6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release
+32665cf67d03011ff1fcc2c8e118370c47e5fae6 Dec2011_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -229,6 +229,7 @@ Group: Applications/Databases
Requires: %{name}-client = %{version}-%{release}
Requires: perl
Requires: perl(DBI)
+Requires: perl(Digest::SHA)
%description client-perl
MonetDB is a database management system that is developed from a
@@ -625,6 +626,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Jan 20 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.5-20120120
+- Rebuilt.
+
+* Tue Jan 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.3-20120117
+- Rebuilt.
+
+* Mon Jan 16 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.3-20120117
+- monetdb5: A couple of memory leaks have been plugged.
+
* Wed Jan 11 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.1-20120111
- Rebuilt.
diff --git a/clients/odbc/driver/SQLFetch.c b/clients/odbc/driver/SQLFetch.c
--- a/clients/odbc/driver/SQLFetch.c
+++ b/clients/odbc/driver/SQLFetch.c
@@ -47,14 +47,15 @@
SQLRETURN
SQLFetch_(ODBCStmt *stmt)
{
- ODBCDesc *desc;
+ ODBCDesc *ard, *ird;
ODBCDescRec *rec;
int i;
SQLULEN row;
SQLINTEGER offset;
SQLUSMALLINT *statusp;
- desc = stmt->ApplRowDescr;
+ ard = stmt->ApplRowDescr;
+ ird = stmt->ImplRowDescr;
stmt->retrieved = 0;
stmt->currentCol = 0;
@@ -70,12 +71,12 @@ SQLFetch_(ODBCStmt *stmt)
stmt->State = FETCHED;
- statusp = desc->sql_desc_array_status_ptr;
+ statusp = ird->sql_desc_array_status_ptr;
if (stmt->retrieveData == SQL_RD_OFF) {
/* don't really retrieve the data, just do as if,
updating the SQL_DESC_ARRAY_STATUS_PTR */
- stmt->rowSetSize = desc->sql_desc_array_size;
+ stmt->rowSetSize = ard->sql_desc_array_size;
if (stmt->startRow + stmt->rowSetSize > (SQLLEN) stmt->rowcount)
stmt->rowSetSize = stmt->rowcount - stmt->startRow;
@@ -87,20 +88,20 @@ SQLFetch_(ODBCStmt *stmt)
if (statusp) {
for (row = 0; (SQLLEN) row < stmt->rowSetSize; row++)
*statusp++ = SQL_ROW_SUCCESS;
- for (; row < desc->sql_desc_array_size; row++)
+ for (; row < ard->sql_desc_array_size; row++)
*statusp++ = SQL_ROW_NOROW;
}
return SQL_SUCCESS;
}
- if (desc->sql_desc_bind_offset_ptr)
- offset = *desc->sql_desc_bind_offset_ptr;
+ if (ard->sql_desc_bind_offset_ptr)
+ offset = *ard->sql_desc_bind_offset_ptr;
else
offset = 0;
- for (row = 0; row < desc->sql_desc_array_size; row++) {
+ for (row = 0; row < ard->sql_desc_array_size; row++) {
if (mapi_fetch_row(stmt->hdl) == 0) {
- if (desc->sql_desc_rows_processed_ptr)
- *desc->sql_desc_rows_processed_ptr = row;
+ if (ird->sql_desc_rows_processed_ptr)
+ *ird->sql_desc_rows_processed_ptr = row;
switch (mapi_error(stmt->Dbc->mid)) {
case MOK:
if (row == 0)
@@ -126,8 +127,8 @@ SQLFetch_(ODBCStmt *stmt)
stmt->rowSetSize++;
- for (i = 1; i <= desc->sql_desc_count; i++) {
- rec = &desc->descRec[i];
+ for (i = 1; i <= ard->sql_desc_count; i++) {
+ rec = &ard->descRec[i];
if (rec->sql_desc_data_ptr == NULL)
continue;
stmt->retrieved = 0;
@@ -148,11 +149,11 @@ SQLFetch_(ODBCStmt *stmt)
if (statusp)
statusp++;
}
- if (desc->sql_desc_rows_processed_ptr)
- *desc->sql_desc_rows_processed_ptr = (SQLULEN) stmt->rowSetSize;
+ if (ird->sql_desc_rows_processed_ptr)
+ *ird->sql_desc_rows_processed_ptr = (SQLULEN) stmt->rowSetSize;
if (statusp)
- while (row++ < desc->sql_desc_array_size)
+ while (row++ < ard->sql_desc_array_size)
*statusp++ = SQL_ROW_NOROW;
if (stmt->rowSetSize > 1) {
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2217,13 +2217,12 @@ if test "x$have_mseed" != xno; then
LDFLAGS="$LDFLAGS $MSEED_LIBS"
AC_CHECK_HEADER(libmseed.h,
AC_CHECK_LIB(mseed, msr_init,
- AC_DEFINE(HAVE_MSEED, 1, [Define if you have the mseed
library])
- have_mseed=yes,
+ AC_DEFINE(HAVE_MSEED, 1, [Define if you have the mseed
library]),
[ if test "x$have_mseed" != xauto; then
AC_MSG_ERROR([-lmseed library not found]); fi; have_mseed=no ], "-lm"),
[ if test "x$have_mseed" != xauto; then
AC_MSG_ERROR([libmseed.h header not found]); fi; have_mseed=no ])
LDFLAGS="$save_LDFLAGS"
CPPFLAGS="$save_CPPFLAGS"
- if test "x$have_mseed" = "xyes"; then
+ if test "x$have_mseed" = "xyes" -o "x$have_mseed" = "xauto"; then
MSEED_CFLAGS=
MSEED_LIBS="-lmseed"
fi
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+monetdb (11.7.5-20120120) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 20 Jan 2012 15:00:25 +0100
+
+monetdb (11.7.3-20120117) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 17 Jan 2012 10:51:40 +0100
+
+monetdb (11.7.3-20120117) unstable; urgency=low
+
+ * monetdb5: A couple of memory leaks have been plugged.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 16 Jan 2012 10:51:39 +0100
+
monetdb (11.7.1-20120111) unstable; urgency=low
* Rebuilt.
diff --git a/java/build.xml b/java/build.xml
--- a/java/build.xml
+++ b/java/build.xml
@@ -48,6 +48,8 @@ All Rights Reserved.
value="${jardir}/monetdb-jdbc-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
<property name="jdbcclient-jar"
value="${jardir}/jdbcclient.jar" />
+ <property name="jmonetdb-jar"
+ value="${jardir}/jmonetdb.jar" />
<property name="mcl-jar"
value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.jar" />
@@ -70,7 +72,7 @@ All Rights Reserved.
<target name="default">
<antcall target="jar_jdbcclient" />
- <antcall target="jar_mero_control" />
+ <antcall target="jar_jmonetdb" />
</target>
<target name="distjdbc">
@@ -130,6 +132,25 @@ All Rights Reserved.
</jar>
</target>
+ <!-- a convenience jar of MeroControl plus the JMonetDB utility -->
+ <target name="jar_jmonetdb"
+ depends="compile_mcl,compile_util,compile_mero_control,compile_client"
+ unless="uptodate.jmonetdb-jar">
+ <echo message="Building MeroControl + JmonetDB convenience jar" />
+ <jar jarfile="${jmonetdb-jar}">
+ <fileset dir="${builddir}">
+ <include name="${mero-control-package}/**/*.class" />
+ <include name="${mcl-package}/**/*.class" />
+ <include name="${client-package}/**/JMonetDB.class" />
+ <include name="${util-package}/**/*.class" />
+ </fileset>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}" />
+ <attribute name="Main-Class" value="nl.cwi.monetdb.client.JMonetDB" />
+ </manifest>
+ </jar>
+ </target>
+
<target name="jar_mero_control"
depends="compile_mero_control">
<jar jarfile="${mero-control-jar}">
@@ -279,6 +300,13 @@ All Rights Reserved.
<include name="${mcl-package}/**/*.java" />
</srcfiles>
</uptodate>
+ <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
+ <srcfiles dir="${srcdir}">
+ <include name="${client-package}/**/*.java" />
+ <include name="${mero-control-package}/**/*.java" />
+ <include name="${mcl-package}/**/*.java" />
+ </srcfiles>
+ </uptodate>
<condition property="uptodate.drivers">
<and>
<uptodate
targetfile="${builddir}/src/${jdbc-package}/MonetDriver.java">
diff --git a/java/example/XMLDBtest.java b/java/example/XMLDBtest.java
deleted file mode 100644
--- a/java/example/XMLDBtest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2012 MonetDB B.V.
- * All Rights Reserved.
- */
-
-import org.xmldb.api.*;
-import org.xmldb.api.base.*;
-import org.xmldb.api.modules.*;
-
-/**
- * Quick example demonstrating the XML:DB driver.
- *
- * To compile and run this example, MonetDB_XMLDB.jar, MonetDB_JDBC.jar
- * and xmldb.jar (from the lib dir) should be in the classpath.
- *
- * @author Fabian Groffen <fabian.grof...@cwi.nl>
- */
-public class XMLDBtest {
- public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.xmldb.base.MonetDBDatabase");
- try {
- Collection col =
DatabaseManager.getCollection("xmldb:monetdb://localhost/demo", "monetdb",
"monetdb");
-
- XQueryService xqs =
(XQueryService)col.getService("XQueryService", "1");
- ResourceSet set = xqs.query("(<foo>1</foo>,<bar />)");
- ResourceIterator it = set.getIterator();
- while(it.hasMoreResources()) {
- Resource r = it.nextResource();
- System.out.println(r.getContent());
- }
-
- } catch (XMLDBException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/java/src/nl/cwi/monetdb/client/JMonetDB.java
b/java/src/nl/cwi/monetdb/client/JMonetDB.java
new file mode 100644
--- /dev/null
+++ b/java/src/nl/cwi/monetdb/client/JMonetDB.java
@@ -0,0 +1,153 @@
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.monetdb.org/Legal/MonetDBLicense
+ *
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
