Changeset: f72fd7e68a06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f72fd7e68a06
Modified Files:
MonetDB5/MonetDB-server.spec
MonetDB5/debian/control
MonetDB5/debian/libmonetdb5-server5.install
MonetDB5/src/modules/atoms/Tests/xml100.mal
MonetDB5/src/modules/atoms/Tests/xml100.stable.out
MonetDB5/src/modules/mal/Makefile.ag
MonetDB5/src/modules/mal/Tests/xml00.mal
MonetDB5/src/modules/mal/Tests/xml00.stable.out
MonetDB5/src/modules/mal/Tests/xml01.mal
MonetDB5/src/modules/mal/Tests/xml01.stable.out
MonetDB5/src/modules/mal/Tests/xml02.mal
MonetDB5/src/modules/mal/Tests/xml02.stable.out
MonetDB5/src/modules/mal/Tests/xml03.mal
MonetDB5/src/modules/mal/Tests/xml03.stable.out
MonetDB5/src/modules/mal/Tests/xml04.mal
MonetDB5/src/modules/mal/Tests/xml04.stable.out
MonetDB5/src/modules/mal/Tests/xml05.mal
MonetDB5/src/modules/mal/Tests/xml05.stable.out
MonetDB5/src/modules/mal/Tests/xml06.mal
MonetDB5/src/modules/mal/Tests/xml10.mal
MonetDB5/src/modules/mal/Tests/xml10.stable.out
sql/src/test/sql_xml/Tests/funcs.dbinit5
sql/src/test/sql_xml/Tests/xml.dbinit5
sql/src/test/sql_xml/Tests/xml_attribute_parsing.SF-1855673.dbinit5
sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.dbinit5
sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.err
sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.out
Branch: Jun2010
Log Message:
Created autoload file for sql/xml.
diffs (269 lines):
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Wed Jun 23 11:26:09 2010 +0200
@@ -182,6 +182,7 @@
%dir %{_libdir}/MonetDB5
%dir %{_libdir}/MonetDB5/lib
%dir %{_libdir}/MonetDB5/autoload
+%{_libdir}/MonetDB5/autoload/*xml*.mal
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/debian/control
--- a/MonetDB5/debian/control Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/debian/control Wed Jun 23 11:26:09 2010 +0200
@@ -3,8 +3,8 @@
Priority: extra
Maintainer: MonetDB BV <mo...@cwi.nl>
Build-Depends: debhelper (>= 5), autotools-dev, libpcre3-dev, libssl-dev,
libraptor1-dev, libxml2-dev, libmonetdb-dev, libmonetdb-client-dev, cdbs
+Standards-Version: 3.8.0
-Standards-Version: 3.8.0
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb5-server5, adduser
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/debian/libmonetdb5-server5.install
--- a/MonetDB5/debian/libmonetdb5-server5.install Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/debian/libmonetdb5-server5.install Wed Jun 23 11:26:09
2010 +0200
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/lib*.so.* usr/lib
debian/tmp/usr/lib/MonetDB5/lib/lib*.so* usr/lib/MonetDB5/lib
debian/tmp/usr/lib/MonetDB5/*.mal usr/lib/MonetDB5
+debian/tmp/usr/lib/MonetDB5/autoload/*.mal usr/lib/MonetDB5/autoload
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/atoms/Tests/xml100.mal
--- a/MonetDB5/src/modules/atoms/Tests/xml100.mal Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/atoms/Tests/xml100.mal Wed Jun 23 11:26:09
2010 +0200
@@ -1,5 +1,3 @@
-include xml;
-
b:= "Mary Ann Walker";
c:= "brown";
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/atoms/Tests/xml100.stable.out
--- a/MonetDB5/src/modules/atoms/Tests/xml100.stable.out Wed Jun 23
10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/atoms/Tests/xml100.stable.out Wed Jun 23
11:26:09 2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := "Mary Ann Walker";
c := "brown";
n := nil:xml;
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Makefile.ag
--- a/MonetDB5/src/modules/mal/Makefile.ag Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Makefile.ag Wed Jun 23 11:26:09 2010 +0200
@@ -75,6 +75,12 @@
$(LIBXML2_LIBS) $(ICONV_LIBS)
}
+headers_autoload = {
+ HEADERS = mal
+ DIR = libdir/MonetDB5/autoload
+ SOURCES = 30_xml.mal
+}
+
lib_bpm = {
DIR = libdir/MonetDB5
SEP = _
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml00.mal
--- a/MonetDB5/src/modules/mal/Tests/xml00.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml00.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/mal/Tests/xml00.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml00.stable.out Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml00.stable.out Wed Jun 23 11:26:09
2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml01.mal
--- a/MonetDB5/src/modules/mal/Tests/xml01.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml01.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/mal/Tests/xml01.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml01.stable.out Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml01.stable.out Wed Jun 23 11:26:09
2010 +0200
@@ -15,7 +15,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml02.mal
--- a/MonetDB5/src/modules/mal/Tests/xml02.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml02.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/mal/Tests/xml02.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml02.stable.out Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml02.stable.out Wed Jun 23 11:26:09
2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml03.mal
--- a/MonetDB5/src/modules/mal/Tests/xml03.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml03.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/mal/Tests/xml03.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml03.stable.out Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml03.stable.out Wed Jun 23 11:26:09
2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml04.mal
--- a/MonetDB5/src/modules/mal/Tests/xml04.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml04.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/mal/Tests/xml04.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml04.stable.out Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml04.stable.out Wed Jun 23 11:26:09
2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml05.mal
--- a/MonetDB5/src/modules/mal/Tests/xml05.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml05.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/mal/Tests/xml05.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml05.stable.out Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml05.stable.out Wed Jun 23 11:26:09
2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml06.mal
--- a/MonetDB5/src/modules/mal/Tests/xml06.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml06.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,nil:str);
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 MonetDB5/src/modules/mal/Tests/xml10.mal
--- a/MonetDB5/src/modules/mal/Tests/xml10.mal Wed Jun 23 10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml10.mal Wed Jun 23 11:26:09 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
# produce a more complex structure
# such as
#<books>
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
MonetDB5/src/modules/mal/Tests/xml10.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml10.stable.out Wed Jun 23 10:40:46
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml10.stable.out Wed Jun 23 11:26:09
2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
# produce a more complex structure
# such as
#<books>
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 sql/src/test/sql_xml/Tests/funcs.dbinit5
--- a/sql/src/test/sql_xml/Tests/funcs.dbinit5 Wed Jun 23 10:40:46 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-include xml; include batxml;
diff -r 8ee1fdff6bb2 -r f72fd7e68a06 sql/src/test/sql_xml/Tests/xml.dbinit5
--- a/sql/src/test/sql_xml/Tests/xml.dbinit5 Wed Jun 23 10:40:46 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-include xml; include batxml;
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
sql/src/test/sql_xml/Tests/xml_attribute_parsing.SF-1855673.dbinit5
--- a/sql/src/test/sql_xml/Tests/xml_attribute_parsing.SF-1855673.dbinit5
Wed Jun 23 10:40:46 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-include xml; include batxml;
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.dbinit5
--- a/sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.dbinit5 Wed Jun
23 10:40:46 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-include xml; include batxml;
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.err
--- a/sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.err
Wed Jun 23 10:40:46 2010 +0200
+++ b/sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.err
Wed Jun 23 11:26:09 2010 +0200
@@ -2,7 +2,7 @@
# 17:58:04 >
-# 17:58:04 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37455 --set
xrpc_port=42019 --set monet_prompt= --trace "--dbname=mTests_src_test_sql_xml"
--set mal_listing=0 "--dbinit=include xml; include batxml; include sql;" ; echo
; echo Over..
+# 17:58:04 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37455 --set
xrpc_port=42019 --set monet_prompt= --trace "--dbname=mTests_src_test_sql_xml"
--set mal_listing=0 "--dbinit=include sql;" ; echo ; echo Over..
# 17:58:04 >
# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
diff -r 8ee1fdff6bb2 -r f72fd7e68a06
sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.out
--- a/sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.out
Wed Jun 23 10:40:46 2010 +0200
+++ b/sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.out
Wed Jun 23 11:26:09 2010 +0200
@@ -2,7 +2,7 @@
# 17:58:04 >
-# 17:58:04 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37455 --set
xrpc_port=42019 --set monet_prompt= --trace "--dbname=mTests_src_test_sql_xml"
--set mal_listing=0 "--dbinit=include xml; include batxml; include sql;" ; echo
; echo Over..
+# 17:58:04 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37455 --set
xrpc_port=42019 --set monet_prompt= --trace "--dbname=mTests_src_test_sql_xml"
--set mal_listing=0 "--dbinit=include sql;" ; echo ; echo Over..
# 17:58:04 >
# MonetDB server v5.14.0, based on kernel v1.32.0
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
