Changeset: 1444d853470f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1444d853470f
Added Files:
debian/libmonetdb5-server-gsl.install
Modified Files:
MonetDB.spec
buildtools/ChangeLog.Jan2014
debian/control
debian/monetdb5-server.install
debian/monetdb5-sql.install
debian/rules
monetdb5/mal/Tests/dynamicload.stable.out
monetdb5/mal/Tests/tst120.stable.out
monetdb5/mal/mal_parser.c
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi04.stable.out
monetdb5/modules/mal/Tests/mapi05.stable.out
monetdb5/modules/mal/Tests/mapi06.stable.out
monetdb5/modules/mal/Tests/mapi07.stable.out
sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.out
sql/test/BugTracker-2010/Tests/crash_default_unlocked.Bug-2744.stable.out
sql/test/BugTracker-2010/Tests/foreign_key_type_mismatch.Bug-2745.stable.out
sql/test/BugTracker-2010/Tests/multiple-common-table-expressions.Bug-2664.stable.out
sql/test/BugTracker-2010/Tests/second_function_existing_signature.Bug-2611.stable.out
sql/test/BugTracker-2010/Tests/select_from_seq.Bug-2730.stable.out
sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.stable.out
sql/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
sql/test/BugTracker-2010/Tests/update_statement_in_function_ignored.Bug-2614.stable.out
sql/test/BugTracker-2010/Tests/values.Bug-2726.stable.out
sql/test/BugTracker-2010/Tests/wrong_error_message_dropping_view.Bug-2713.stable.out
sql/test/BugTracker-2011/Tests/multicolumn_constraints.Bug-2849.stable.out
sql/test/BugTracker-2013/Tests/Cannot_Find_Column_Type.Bug-3394.stable.out
sql/test/BugTracker-2013/Tests/nested_concat_query.Bug-3408.stable.out
sql/test/datacell/Tests/crashonundefined.stable.out
sql/test/datacell/Tests/select.stable.out
sql/test/datacell/Tests/topbasket.stable.out
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.out
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.stable.out
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/Tests/insert_quser.stable.out
sql/test/ssqq/Tests/ssqq.stable.out
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 586 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -37,6 +37,7 @@ BuildRequires: flex
# no geos library on RedHat Enterprise Linux and derivatives
BuildRequires: geos-devel >= 2.2.0
%endif
+BuildRequires: gsl-devel
BuildRequires: libcurl-devel
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
@@ -401,6 +402,27 @@ extensions for %{name}-SQL-server5.
%{_libdir}/monetdb5/lib_geom.so
%endif
+%package gsl-MonetDB5
+Summary: MonetDB5 SQL interface to the gsl library
+Group: Applications/Databases
+Requires: MonetDB5-server = %{version}-%{release}
+
+%description gsl-MonetDB5
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL frontend.
+
+This package contains the interface to the GNU Scientific Library for
+numerical analysis (gsl).
+
+%files gsl-MonetDB5
+%defattr(-,root,root)
+%{_libdir}/monetdb5/autoload/*_gsl.mal
+%{_libdir}/monetdb5/createdb/*_gsl.sql
+%{_libdir}/monetdb5/gsl.mal
+%{_libdir}/monetdb5/lib_gsl.so
+
%package jaql
Summary: MonetDB5 JAQL
Group: Applications/Databases
@@ -471,6 +493,7 @@ fi
%if %{?rhel:0}%{!?rhel:1}
%exclude %{_libdir}/monetdb5/geom.mal
%endif
+%exclude %{_libdir}/monetdb5/gsl.mal
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%exclude %{_libdir}/monetdb5/jaql*.mal
@@ -484,6 +507,7 @@ fi
%if %{?rhel:0}%{!?rhel:1}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
+%exclude %{_libdir}/monetdb5/lib_gsl.so
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
%exclude %{_libdir}/monetdb5/lib_jaql.so
@@ -578,6 +602,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%if %{?rhel:0}%{!?rhel:1}
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
%endif
+%exclude %{_libdir}/monetdb5/createdb/*_gsl.sql
# %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
%{_libdir}/monetdb5/createdb/*
%{_libdir}/monetdb5/sql*.mal
@@ -706,6 +731,7 @@ developer, but if you do want to test, t
--enable-fits=no \
--enable-gdk=yes \
--enable-geom=%{?rhel:no}%{!?rhel:yes} \
+ --enable-gsl=yes \
--enable-instrument=no \
--enable-jaql=yes \
--enable-jdbc=no \
diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014
--- a/buildtools/ChangeLog.Jan2014
+++ b/buildtools/ChangeLog.Jan2014
@@ -1,6 +1,10 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Dec 10 2013 Sjoerd Mullender <sjo...@acm.org>
+- Created packages for RPM based systems and Debian/Ubunty containing
+ the MonetDB interface to the GNU Scientific Library (gsl).
+
* Thu Jun 20 2013 Sjoerd Mullender <sjo...@acm.org>
- We no longer install the .la files in our Fedora/Debian/Ubuntu packages.
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Hg: http://dev.monetdb.org/hg/MonetD
# for Build-Depends and Depends syntax, see
# http://www.debian.org/doc/debian-policy/ch-relationships.html
Build-Depends: debhelper (>= 5), autotools-dev, bison, flex, libbz2-dev,
- libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev,
+ libcurl4-gnutls-dev, libgeos-dev, libgsl0-dev, libpcre3-dev,
libreadline-gplv2-dev|libreadline-dev, libssl-dev, libxml2-dev, perl,
python, ruby, rubygems, unixodbc-dev, uuid-dev, zlib1g-dev, python3
# Build-Depends: libraptor1-dev
@@ -203,6 +203,19 @@ Description: MonetDB5 SQL GIS support mo
This package contains the GIS (Geographic Information System)
extensions for MonetDB-SQL-server5.
+Package: libmonetdb5-server-gsl
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Description: MonetDB5 SQL GIS support module
+ MonetDB is a database management system that is developed from a
+ main-memory perspective with use of a fully decomposed storage model,
+ automatic index management, extensibility of data types and search
+ accelerators. It also has an SQL frontend.
+ .
+ This package contains the interface to the GNU Scientific Library for
+ numerical analysis (gsl).
+
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
diff --git a/debian/libmonetdb5-server-gsl.install
b/debian/libmonetdb5-server-gsl.install
new file mode 100644
--- /dev/null
+++ b/debian/libmonetdb5-server-gsl.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/monetdb5/autoload/*_gsl.mal usr/lib/monetdb5/autoload
+debian/tmp/usr/lib/monetdb5/createdb/*_gsl.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/gsl.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_gsl.so usr/lib/monetdb5
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -1,13 +1,13 @@
debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/libmonetdb5.so.* usr/lib
-# usr/lib/monetdb5/lib_*.so EXCEPT: lib_{geom,jaql,json,sql}.so
+# usr/lib/monetdb5/lib_*.so EXCEPT: lib_{geom,gsl,jaql,json,sql}.so
debian/tmp/usr/lib/monetdb5/lib_lsst.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_opt_sql_append.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
-# usr/lib/monetdb5/*.mal EXCEPT: geom.mal, jaql*.mal, json*.mal, sql*.mal
+# usr/lib/monetdb5/*.mal EXCEPT: geom.mal, gsl.mal, jaql*.mal, json*.mal,
sql*.mal
debian/tmp/usr/lib/monetdb5/a*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/b*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/c*.mal usr/lib/monetdb5
@@ -30,7 +30,7 @@ debian/tmp/usr/lib/monetdb5/v*.mal usr/l
debian/tmp/usr/lib/monetdb5/x*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/z*.mal usr/lib/monetdb5
-# usr/lib/monetdb5/autoload/*.mal EXCEPT: *_geom.mal, *_jaql.mal, *_sql.mal
+# usr/lib/monetdb5/autoload/*.mal EXCEPT: *_geom.mal, *_gsl.mal, *_jaql.mal,
*_sql.mal
debian/tmp/usr/lib/monetdb5/autoload/*_lsst.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/*_opt_sql_append.mal
usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/*_udf.mal usr/lib/monetdb5/autoload
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -6,7 +6,7 @@ debian/tmp/usr/lib/monetdb5/sql*.mal usr
debian/tmp/usr/lib/monetdb5/lib_sql.so usr/lib/monetdb5
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
-# usr/lib/monetdb5/createdb/*.sql EXCEPT: *_geom.sql
+# usr/lib/monetdb5/createdb/*.sql EXCEPT: *_geom.sql, *_gsl.sql
debian/tmp/usr/lib/monetdb5/createdb/09_like.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/10_math.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/11_times.sql usr/lib/monetdb5/createdb
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ override_dh_auto_configure:
--enable-fits=no \
--enable-gdk=yes \
--enable-geom=yes \
+ --enable-gsl=yes \
--enable-instrument=no \
--enable-jaql=yes \
--enable-jdbc=no \
diff --git a/monetdb5/mal/Tests/dynamicload.stable.out
b/monetdb5/mal/Tests/dynamicload.stable.out
--- a/monetdb5/mal/Tests/dynamicload.stable.out
+++ b/monetdb5/mal/Tests/dynamicload.stable.out
@@ -13,7 +13,6 @@ stdout of test 'dynamicload` in director
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/
command user.wrong():void address UNKOWNaddress;
-#WARNING: LoaderException:loadLibrary:File not found:UNKNOWlib
!TypeException:user.main[2]:object code for command user.wrong missing
!TypeException:user.main[2]:'user.wrong' undefined in: _2:void := user.wrong()
function user.main():void;
diff --git a/monetdb5/mal/Tests/tst120.stable.out
b/monetdb5/mal/Tests/tst120.stable.out
--- a/monetdb5/mal/Tests/tst120.stable.out
+++ b/monetdb5/mal/Tests/tst120.stable.out
@@ -15,9 +15,6 @@ stdout of test 'tst120` in directory 'mo
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37254/
# MonetDB/SQL module v2.39.0 loaded
# MonetDB/GIS module v0.19.0 loaded
-#WARNING: MALException:malInclude:could not open file: tst120a
-#WARNING: MALException:malInclude:could not open file: tst120b
-#WARNING: MALException:malInclude:could not open file: tst120a
!TypeException:user.main[4]:'bottom.second' undefined in: a:any :=
bottom.second(_5:str)
!TypeException:user.main[5]:'top.first' undefined in: b:any :=
top.first(_7:int)
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1083,18 +1083,20 @@ parseInclude(Client cntxt)
if (currChar(cntxt) != ';') {
parseError(cntxt, "';' expected\n");
skipToEnd(cntxt);
- return "";
+ return 0;
}
skipToEnd(cntxt);
s = loadLibrary(modnme, FALSE);
if (s) {
- mnstr_printf(cntxt->fdout, "#WARNING: %s\n", s);
+ parseError(cntxt, s);
GDKfree(s);
+ return 0;
}
if ((s = malInclude(cntxt, modnme, 0))) {
- mnstr_printf(cntxt->fdout, "#WARNING: %s\n", s);
+ parseError(cntxt, s);
GDKfree(s);
+ return 0;
}
return "";
}
diff --git a/monetdb5/modules/mal/Tests/mapi01.stable.out
b/monetdb5/modules/mal/Tests/mapi01.stable.out
--- a/monetdb5/modules/mal/Tests/mapi01.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi01.stable.out
@@ -11,7 +11,6 @@ stdout of test 'mapi01` in directory 'mo
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008- MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-#WARNING: LoaderException:loadLibrary:mal_octopus: file not found
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32356/
function user.main():void;
# First test of the remoteQueries optimizer
diff --git a/monetdb5/modules/mal/Tests/mapi04.stable.out
b/monetdb5/modules/mal/Tests/mapi04.stable.out
--- a/monetdb5/modules/mal/Tests/mapi04.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi04.stable.out
@@ -11,7 +11,6 @@ stdout of test 'mapi04` in directory 'mo
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008- MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-#WARNING: LoaderException:loadLibrary:mal_octopus: file not found
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32356/
function user.main():void;
# The easiest case, ship something and show result
diff --git a/monetdb5/modules/mal/Tests/mapi05.stable.out
b/monetdb5/modules/mal/Tests/mapi05.stable.out
--- a/monetdb5/modules/mal/Tests/mapi05.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi05.stable.out
@@ -11,7 +11,6 @@ stdout of test 'mapi05` in directory 'mo
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008- MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-#WARNING: LoaderException:loadLibrary:mal_octopus: file not found
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32356/
function user.main():void;
# Checking correctness of mapi library
diff --git a/monetdb5/modules/mal/Tests/mapi06.stable.out
b/monetdb5/modules/mal/Tests/mapi06.stable.out
--- a/monetdb5/modules/mal/Tests/mapi06.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi06.stable.out
@@ -11,7 +11,6 @@ stdout of test 'mapi06` in directory 'mo
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008- MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-#WARNING: LoaderException:loadLibrary:mal_octopus: file not found
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32356/
function user.main():void;
# Checking correctness of mapi library
diff --git a/monetdb5/modules/mal/Tests/mapi07.stable.out
b/monetdb5/modules/mal/Tests/mapi07.stable.out
--- a/monetdb5/modules/mal/Tests/mapi07.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi07.stable.out
@@ -11,7 +11,6 @@ stdout of test 'mapi07` in directory 'mo
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008- MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-#WARNING: LoaderException:loadLibrary:mal_octopus: file not found
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32356/
function user.main():void;
# First test of the remoteQueries optimizer
diff --git
a/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
b/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
---
a/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
+++
b/sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
@@ -13,7 +13,6 @@ stdout of test 'COPY_INTO_with_backslash
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-#WARNING: LoaderException:loadLibrary:Loading error 'libmseed.so.2: cannot
open shared object file: No such file or directory' from within file 'vault'
# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:34775/
# MonetDB/SQL module v2.40.0 loaded
diff --git
a/sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.out
b/sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.out
---
a/sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.out
+++
b/sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.out
@@ -13,7 +13,6 @@ stdout of test 'call_function_without_wa
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
