Changeset: 38a75a821a93 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38a75a821a93 Modified Files: Branch: default Log Message:
merge with default diffs (truncated from 399 to 300 lines): diff --git a/buildtools/ChangeLog.Apr2011 b/buildtools/ChangeLog.Apr2011 --- a/buildtools/ChangeLog.Apr2011 +++ b/buildtools/ChangeLog.Apr2011 @@ -1,3 +1,10 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Wed Jun 29 2011 Sjoerd Mullender <[email protected]> +- We can now also build on Fedora 15. This required some very minor + changes. +- Changed configure check for OpenSSL so that we can also build on CentOS + 5.6. We now no longer demand that OpenSSL is at least version 0.9.8f, + but instead we require that the hash functions we need are supported. + diff --git a/clients/ChangeLog.Apr2011 b/clients/ChangeLog.Apr2011 --- a/clients/ChangeLog.Apr2011 +++ b/clients/ChangeLog.Apr2011 @@ -1,3 +1,7 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Wed Jun 29 2011 Sjoerd Mullender <[email protected]> +- The separate Python distribution now uses the same version number as + the main package. + diff --git a/gdk/ChangeLog.Apr2011 b/gdk/ChangeLog.Apr2011 --- a/gdk/ChangeLog.Apr2011 +++ b/gdk/ChangeLog.Apr2011 @@ -1,3 +1,6 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Wed Jun 29 2011 Sjoerd Mullender <[email protected]> +- Fixes to memory detection on FreeBSD. + diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All --- a/monetdb5/modules/mal/Tests/All +++ b/monetdb5/modules/mal/Tests/All @@ -33,6 +33,7 @@ remote04 remote06 remote08 +remote09 # needs Merovingian and aims at SQL #remote88 #remote89 diff --git a/monetdb5/modules/mal/Tests/remote08.mal b/monetdb5/modules/mal/Tests/remote08.mal --- a/monetdb5/modules/mal/Tests/remote08.mal +++ b/monetdb5/modules/mal/Tests/remote08.mal @@ -8,9 +8,21 @@ b := bat.insert(b, nil:oid, 2); b := bat.insert(b, nil:oid, 4); +b := bat.insert(b, nil:oid, 6); +b := bat.delete(b, nil:oid, 2); b := algebra.markH(b); + rb2 := remote.put(conn1, b); +lb2:bat[:oid,:int] := remote.get(conn1, rb2); +io.print(lb2); + +b := bat.insert(b, nil:oid, 8); +b := bat.insert(b, nil:oid, 10); +b := algebra.slice(b, 1, 2); +b := algebra.markH(b); + +rb2 := remote.put(conn1, b); lb2:bat[:oid,:int] := remote.get(conn1, rb2); io.print(lb2); diff --git a/monetdb5/modules/mal/Tests/remote08.stable.out b/monetdb5/modules/mal/Tests/remote08.stable.out --- a/monetdb5/modules/mal/Tests/remote08.stable.out +++ b/monetdb5/modules/mal/Tests/remote08.stable.out @@ -23,6 +23,15 @@ b := bat.new(:oid,:int); b := bat.insert(b,nil:oid,2); b := bat.insert(b,nil:oid,4); + b := bat.insert(b,nil:oid,6); + b := bat.delete(b,nil:oid,2); + b := algebra.markH(b); + rb2 := remote.put(conn1,b); + lb2:bat[:oid,:int] := remote.get(conn1,rb2); + io.print(lb2); + b := bat.insert(b,nil:oid,8); + b := bat.insert(b,nil:oid,10); + b := algebra.slice(b,1,2); b := algebra.markH(b); rb2 := remote.put(conn1,b); lb2:bat[:oid,:int] := remote.get(conn1,rb2); @@ -35,8 +44,14 @@ # h t # name # void int # type #-----------------# -[ 0@0, 2 ] +[ 0@0, 6 ] [ 1@0, 4 ] +#-----------------# +# h t # name +# void int # type +#-----------------# +[ 0@0, 4 ] +[ 1@0, 8 ] # 13:26:30 > # 13:26:30 > Done. diff --git a/monetdb5/modules/mal/Tests/remote09.mal b/monetdb5/modules/mal/Tests/remote09.mal new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/remote09.mal @@ -0,0 +1,42 @@ +# let connect figure out itself how to connect to the running db +uri := sabaoth.getLocalConnectionURI(); + +# create a persistent connecton to ourself +conn1:str := remote.connect(uri, "monetdb", "monetdb"); + +b := bat.new(:oid, :str); + +b := bat.insert(b, nil:oid, "maandag"); +b := bat.insert(b, nil:oid, "dinsdag"); +b := bat.insert(b, nil:oid, "woensdag"); +b := bat.insert(b, nil:oid, "donderdag"); +b := bat.insert(b, nil:oid, "vrijdag"); +b := bat.insert(b, nil:oid, "januari"); +b := bat.insert(b, nil:oid, "februari"); +b := bat.insert(b, nil:oid, "maart"); +b := bat.insert(b, nil:oid, "april"); +b := bat.insert(b, nil:oid, "mei"); +b := bat.insert(b, nil:oid, "juni"); +b := bat.insert(b, nil:oid, "juli"); +b := bat.insert(b, nil:oid, "augustus"); +b := bat.insert(b, nil:oid, "september"); +b := bat.insert(b, nil:oid, "oktober"); +b := bat.insert(b, nil:oid, "november"); +b := bat.insert(b, nil:oid, "december"); +b := bat.insert(b, nil:oid, "morgen"); +b := bat.insert(b, nil:oid, "middag"); +b := bat.insert(b, nil:oid, "avond"); +b := bat.insert(b, nil:oid, "nacht"); +b := bat.insert(b, nil:oid, "licht"); +b := bat.insert(b, nil:oid, "duisternis"); + +b := algebra.markH(b); + +rb2 := remote.put(conn1, b); +lb2:bat[:oid,:str] := remote.get(conn1, rb2); + +io.print(lb2); + +# help testweb a bit, since currently no cleanup is done on server +# shutdown +remote.disconnect(conn1); diff --git a/monetdb5/modules/mal/Tests/remote09.stable.err b/monetdb5/modules/mal/Tests/remote09.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/remote09.stable.err @@ -0,0 +1,31 @@ +stderr of test 'remote09` in directory 'modules/mal` itself: + + +# 15:38:56 > +# 15:38:56 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-volund.ins.cwi.nl/five/dbfarm" --set mapi_open=true --set mapi_port=32448 --set monet_prompt= --trace --forcemito --set mal_listing=2 --dbname=mTests_modules_mal remote09.mal +# 15:38:56 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/monetdb/current/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-volund.ins.cwi.nl/five/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 32448 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_modules_mal + +# 15:38:57 > +# 15:38:57 > Done. +# 15:38:57 > + diff --git a/monetdb5/modules/mal/Tests/remote09.stable.out b/monetdb5/modules/mal/Tests/remote09.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/remote09.stable.out @@ -0,0 +1,86 @@ +stdout of test 'remote09` in directory 'modules/mal` itself: + + +# 15:38:56 > +# 15:38:56 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-volund.ins.cwi.nl/five/dbfarm" --set mapi_open=true --set mapi_port=32448 --set monet_prompt= --trace --forcemito --set mal_listing=2 --dbname=mTests_modules_mal remote09.mal +# 15:38:56 > + +# MonetDB 5 server v11.4.0 "current-a384b06d6f96" +# Serving database 'mTests_modules_mal', using 4 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved +# Visit http://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://volund.ins.cwi.nl:32448/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +function user.main():void; +# let connect figure out itself how to connect to the running db + uri := sabaoth.getLocalConnectionURI(); +# create a persistent connecton to ourself + conn1:str := remote.connect(uri,"monetdb","monetdb"); + b := bat.new(:oid,:str); + b := bat.insert(b,nil:oid,"maandag"); + b := bat.insert(b,nil:oid,"dinsdag"); + b := bat.insert(b,nil:oid,"woensdag"); + b := bat.insert(b,nil:oid,"donderdag"); + b := bat.insert(b,nil:oid,"vrijdag"); + b := bat.insert(b,nil:oid,"januari"); + b := bat.insert(b,nil:oid,"februari"); + b := bat.insert(b,nil:oid,"maart"); + b := bat.insert(b,nil:oid,"april"); + b := bat.insert(b,nil:oid,"mei"); + b := bat.insert(b,nil:oid,"juni"); + b := bat.insert(b,nil:oid,"juli"); + b := bat.insert(b,nil:oid,"augustus"); + b := bat.insert(b,nil:oid,"september"); + b := bat.insert(b,nil:oid,"oktober"); + b := bat.insert(b,nil:oid,"november"); + b := bat.insert(b,nil:oid,"december"); + b := bat.insert(b,nil:oid,"morgen"); + b := bat.insert(b,nil:oid,"middag"); + b := bat.insert(b,nil:oid,"avond"); + b := bat.insert(b,nil:oid,"nacht"); + b := bat.insert(b,nil:oid,"licht"); + b := bat.insert(b,nil:oid,"duisternis"); + b := algebra.markH(b); + rb2 := remote.put(conn1,b); + lb2:bat[:oid,:str] := remote.get(conn1,rb2); + io.print(lb2); +# help testweb a bit, since currently no cleanup is done on server +# shutdown + remote.disconnect(conn1); +end main; +#-------------------------# +# h t # name +# void str # type +#-------------------------# +[ 0@0, "maandag" ] +[ 1@0, "dinsdag" ] +[ 2@0, "woensdag" ] +[ 3@0, "donderdag" ] +[ 4@0, "vrijdag" ] +[ 5@0, "januari" ] +[ 6@0, "februari" ] +[ 7@0, "maart" ] +[ 8@0, "april" ] +[ 9@0, "mei" ] +[ 10@0, "juni" ] +[ 11@0, "juli" ] +[ 12@0, "augustus" ] +[ 13@0, "september" ] +[ 14@0, "oktober" ] +[ 15@0, "november" ] +[ 16@0, "december" ] +[ 17@0, "morgen" ] +[ 18@0, "middag" ] +[ 19@0, "avond" ] +[ 20@0, "nacht" ] +[ 21@0, "licht" ] +[ 22@0, "duisternis" ] + +# 15:38:57 > +# 15:38:57 > Done. +# 15:38:57 > + diff --git a/monetdb5/modules/mal/remote.mx b/monetdb5/modules/mal/remote.mx --- a/monetdb5/modules/mal/remote.mx +++ b/monetdb5/modules/mal/remote.mx @@ -1211,6 +1211,8 @@ if (!(b->htype == TYPE_void || (b->htype == TYPE_oid && b->H->dense))) throw(ILLARG, "remote.bincopyto", "only void-headed BATs are supported"); + BBPincref(bid, FALSE); + mnstr_printf(cntxt->fdout, /*JSON*/"{" "\"version\":1," "\"htype\":%d," @@ -1223,18 +1225,18 @@ TYPE_void, b->ttype, b->hseqbase == oid_nil ? 0 : b->hseqbase, - BATcount(b), - BATcount(b) * b->T->width, - b->T->varsized ? b->T->vheap->free : 0 + b->batCount, _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
