Changeset: 4fbd04e88ff7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4fbd04e88ff7
Added Files:
debian/monetdb5-jaql.install
Modified Files:
MonetDB.spec
buildtools/ChangeLog.Jul2012
common/stream/stream.c
debian/control
debian/monetdb5-server.install
sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jul2012 branch.
diffs (173 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -359,6 +359,28 @@ extensions for MonetDB-SQL-server5.
%{_libdir}/monetdb5/lib_geom.so
%endif
+%package jaql
+Summary: MonetDB5 JAQL
+Group: Applications/Databases
+Requires: MonetDB5-server = %{version}-%{release}
+
+%description jaql
+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 JAQL extension for MonetDB5. JAQL is a
+querly language for JavaScript Object Notation (JSON).
+
+%files jaql
+%defattr(-,root,root)
+%{_libdir}/monetdb5/autoload/*_jaql.mal
+%{_libdir}/monetdb5/jaql*.mal
+%{_libdir}/monetdb5/json*.mal
+%{_libdir}/monetdb5/lib_jaql.so
+%{_libdir}/monetdb5/lib_json.so
+
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -411,9 +433,10 @@ fi
%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
+%exclude %{_libdir}/monetdb5/jaql*.mal
+%exclude %{_libdir}/monetdb5/json*.mal
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
-%{_libdir}/monetdb5/autoload/*_jaql.mal
%{_libdir}/monetdb5/autoload/*_lsst.mal
%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
%{_libdir}/monetdb5/autoload/*_udf.mal
@@ -423,6 +446,8 @@ fi
%endif
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
+%exclude %{_libdir}/monetdb5/lib_jaql.so
+%exclude %{_libdir}/monetdb5/lib_json.so
%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man1/mserver5.1.gz
diff --git a/buildtools/ChangeLog.Jul2012 b/buildtools/ChangeLog.Jul2012
--- a/buildtools/ChangeLog.Jul2012
+++ b/buildtools/ChangeLog.Jul2012
@@ -1,6 +1,9 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Mon Jul 2 2012 Sjoerd Mullender <sjo...@acm.org>
+- Created seperate RPM and DEB packages for MonetDB/JAQL.
+
* Tue Jun 5 2012 Sjoerd Mullender <sjo...@acm.org>
- Removed --enable-bits option from configure.
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1335,9 +1335,18 @@ open_urlstream(const char *url)
}
#else
-stream *open_urlstream(const char *url) {
- if (url != NULL && strncmp(url, "file://", sizeof("file://") - 1) == 0)
- return open_rastream(url + sizeof("file://") - 1);
+stream *
+open_urlstream(const char *url)
+{
+ if (url != NULL && strncmp(url, "file://", sizeof("file://") - 1) == 0)
{
+ url += sizeof("file://") - 1;
+#ifdef _MSC_VER
+ /* file:///C:/... -- remove third / as well */
+ if (url[0] == '/' && url[2] == ':')
+ url++;
+#endif
+ return open_rastream(url);
+ }
return NULL;
}
#endif /* HAVE_CURL */
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -185,6 +185,19 @@ Description: MonetDB database server ver
package if you want to work using the MAL language, or if you want to
use the SQL frontend (in which case you need monetdb5-sql as well).
+Package: monetdb5-jaql
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server
+Description: MonetDB5 JAQL
+ 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 JAQL extension for MonetDB5. JAQL is a
+ querly language for JavaScript Object Notation (JSON).
+
Package: monetdb5-sql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server (=
${source:Version})
diff --git a/debian/monetdb5-jaql.install b/debian/monetdb5-jaql.install
new file mode 100644
--- /dev/null
+++ b/debian/monetdb5-jaql.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/monetdb5/autoload/*_jaql.mal usr/lib/monetdb5/autoload
+debian/tmp/usr/lib/monetdb5/jaql*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/json*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_jaql.so usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_json.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
@@ -70,7 +70,6 @@ debian/tmp/usr/lib/monetdb5/urlbox.mal u
debian/tmp/usr/lib/monetdb5/vault.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/xml.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/zorder.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/autoload/*_jaql.mal usr/lib/monetdb5/autoload
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/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
b/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
--- a/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
@@ -31,9 +31,7 @@ clients = []
for i in range(50):
c = process.client('sql', args = ['-s', 'SELECT rad(55.81689)'],
user = 'testuser', passwd = 'testpassword',
-# stdout = process.PIPE,
-# stderr = process.PIPE
- )
+ stdout = process.PIPE, stderr = process.PIPE)
clients.append(c)
for c in clients:
diff --git a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
--- a/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
+++ b/sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
@@ -39,8 +39,7 @@ drop table t;
create table t(u url);
--- this works on UNIX, on Windows we likely need an extra / after file://
-insert into t values ('file://$TSTSRCDIR/url_script_test.Bug-2972.txt');
+insert into t values ('$UTSTSRCDIR/url_script_test.Bug-2972.txt');
select getContent(u) from t;
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1101,6 +1101,7 @@ def PerformDir(env, testdir, testlist, B
env['TSTDB'] = TSTDB
env['TSTDIR'] = TSTDIR
env['TSTSRCDIR'] = TSTSRCDIR
+ env['UTSTSRCDIR'] = 'file:' + url(TSTSRCDIR)
env['TSTTRGDIR'] = TSTTRGDIR
if TSTDIR == os.curdir:
env['RELSRCDIR'] = os.path.join(os.pardir, env['RELSRCBASE'], TSTSUFF)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
