Changeset: 2c5e204b6272 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c5e204b6272 Modified Files: Branch: Jun2010 Log Message:
merging diffs (truncated from 500 to 300 lines): diff -r 4218d0f17d5d -r 2c5e204b6272 .hgtags --- a/.hgtags Tue Jul 06 17:37:29 2010 +0200 +++ b/.hgtags Tue Jul 06 17:50:49 2010 +0200 @@ -412,3 +412,6 @@ c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1 c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1 e042ecc2e895b1bb5f06da65d0db6a8756cdb6d3 Jun2010_1 +2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3 +2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3 +700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3 diff -r 4218d0f17d5d -r 2c5e204b6272 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Tue Jul 06 17:37:29 2010 +0200 +++ b/MonetDB/MonetDB.spec Tue Jul 06 17:50:49 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Jun2010/%{name}-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010-SP1/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: zlib-devel, bzip2-devel, openssl-devel diff -r 4218d0f17d5d -r 2c5e204b6272 MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Tue Jul 06 17:37:29 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Tue Jul 06 17:50:49 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB4-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB4-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(pre): shadow-utils diff -r 4218d0f17d5d -r 2c5e204b6272 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010 Tue Jul 06 17:37:29 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010 Tue Jul 06 17:50:49 2010 +0200 @@ -1,15 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Thr Jul 01 2010 Fabian Groffen <[email protected]> -- Return a correct URI for local connection from Sabaoth when the - connection is a UNIX domain socket. Partial fix for bug #2567. - -* Wed Jun 30 2010 Stefan Manegold <[email protected]> -- various performance fixes in grouping and grouped aggregation code - (MonetDB5/src/modules/kernel/group.mx, MonetDB5/src/modules/kernel/aggr*.mx) - to reduce the execution time the following query that mimics a two-column - primary key check over the ~5 billion tuple "neighbors" table of the - Skyserver database from 26 hours to 1.5 hours (on a 64 GB machine): - SELECT count(c), sum(c), min(c), max(c) FROM (SELECT count(*) AS c FROM "neighbors" GROUP BY "objID","NeighborObjID") AS t; - diff -r 4218d0f17d5d -r 2c5e204b6272 MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Tue Jul 06 17:37:29 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Tue Jul 06 17:50:49 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB5-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB5-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}} @@ -214,6 +214,18 @@ %{_libdir}/*.so %changelog +* Thu Jul 01 2010 Fabian Groffen <[email protected]> - 5.20.3-20100706 +- Return a correct URI for local connection from Sabaoth when the + connection is a UNIX domain socket. Partial fix for bug #2567. + +* Wed Jun 30 2010 Stefan Manegold <[email protected]> - 5.20.3-20100706 +- various performance fixes in grouping and grouped aggregation code + (MonetDB5/src/modules/kernel/group.mx, MonetDB5/src/modules/kernel/aggr*.mx) + to reduce the execution time the following query that mimics a two-column + primary key check over the ~5 billion tuple "neighbors" table of the + Skyserver database from 26 hours to 1.5 hours (on a 64 GB machine): + SELECT count(c), sum(c), min(c), max(c) FROM (SELECT count(*) AS c FROM "neighbors" GROUP BY "objID","NeighborObjID") AS t; + * Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 5.20.1-20100630 - Rebuilt. diff -r 4218d0f17d5d -r 2c5e204b6272 MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Tue Jul 06 17:37:29 2010 +0200 +++ b/MonetDB5/debian/changelog Tue Jul 06 17:50:49 2010 +0200 @@ -1,3 +1,21 @@ +monetdb5-server (5.20.3-20100706) unstable; urgency=low + + * Return a correct URI for local connection from Sabaoth when the + connection is a UNIX domain socket. Partial fix for bug #2567. + + -- Fabian Groffen <[email protected]> Thu, 01 Jul 2010 14:06:18 +0200 + +monetdb5-server (5.20.3-20100706) unstable; urgency=low + + * various performance fixes in grouping and grouped aggregation code + (MonetDB5/src/modules/kernel/group.mx, MonetDB5/src/modules/kernel/aggr*.mx) + to reduce the execution time the following query that mimics a two-column + primary key check over the ~5 billion tuple "neighbors" table of the + Skyserver database from 26 hours to 1.5 hours (on a 64 GB machine): + SELECT count(c), sum(c), min(c), max(c) FROM (SELECT count(*) AS c FROM "neighbors" GROUP BY "objID","NeighborObjID") AS t; + + -- Stefan Manegold <[email protected]> Wed, 30 Jun 2010 14:06:18 +0200 + monetdb5-server (5.20.1-20100630) unstable; urgency=low * Rebuilt. diff -r 4218d0f17d5d -r 2c5e204b6272 MonetDB5/src/modules/kernel/calc.mx --- a/MonetDB5/src/modules/kernel/calc.mx Tue Jul 06 17:37:29 2010 +0200 +++ b/MonetDB5/src/modules/kernel/calc.mx Tue Jul 06 17:50:49 2010 +0200 @@ -312,6 +312,7 @@ address calcbinarymin_no_...@2; @- @mal + @:mal_binary_ops(bit,bit)@ @:mal_binary_ops(chr,chr)@ @:mal_binary_ops(bte,bte)@ @:mal_binary_ops(sht,sht)@ @@ -339,6 +340,7 @@ address calcun...@1sign comment "Returns +1, 0, -1 based on the sign of the given expression"; @= unary_ops + @:@1_unary_ops(bit)@ @:@1_unary_ops(chr)@ @:@1_unary_ops(bte)@ @:@1_unary_ops(sht)@ @@ -667,6 +669,7 @@ @:calc_macrobinop_no_nil(MIN,calc_min_no_n...@1,@1)@ @c +@:calc_min_max(bit)@ @:calc_min_max(chr)@ @:calc_min_max(bte)@ @:calc_min_max(sht)@ diff -r 4218d0f17d5d -r 2c5e204b6272 MonetDB5/src/modules/mal/Tests/inspect05.stable.out --- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Tue Jul 06 17:37:29 2010 +0200 +++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Tue Jul 06 17:50:49 2010 +0200 @@ -4346,6 +4346,7 @@ [ "-", "command", "calc", "(x:sht):sht ", "CALCunaryshtNEG;" ] [ "-", "command", "calc", "(x:bte):bte ", "CALCunarybteNEG;" ] [ "-", "command", "calc", "(x:chr):chr ", "CALCunarychrNEG;" ] +[ "-", "command", "calc", "(x:bit):bit ", "CALCunarybitNEG;" ] [ "-", "command", "calc", "(left:lng,right:dbl):dbl ", "CALCbinarySUBlngdbl;" ] [ "-", "command", "calc", "(left:lng,right:flt):dbl ", "CALCbinarySUBlngflt;" ] [ "-", "command", "calc", "(left:lng,right:lng):lng ", "CALCbinarySUBlnglng;" ] @@ -4726,6 +4727,7 @@ [ "abs", "command", "calc", "(x:sht):sht ", "CALCunaryshtABS;" ] [ "abs", "command", "calc", "(x:bte):bte ", "CALCunarybteABS;" ] [ "abs", "command", "calc", "(x:chr):chr ", "CALCunarychrABS;" ] +[ "abs", "command", "calc", "(x:bit):bit ", "CALCunarybitABS;" ] [ "blob", "command", "calc", "(s:str):blob ", "BLOBblob_fromstr;" ] [ "blob", "command", "calc", "(b:blob):blob ", "BLOBblob_blob;" ] [ "bat", "command", "calc", "(v:void):bat[:any_1,:any_2] ", "CALCnil2bat;" ] @@ -4872,6 +4874,7 @@ [ "inv", "command", "calc", "(x:sht):sht ", "CALCunarycheckshtINV;" ] [ "inv", "command", "calc", "(x:bte):bte ", "CALCunarycheckbteINV;" ] [ "inv", "command", "calc", "(x:chr):chr ", "CALCunarycheckchrINV;" ] +[ "inv", "command", "calc", "(x:bit):bit ", "CALCunarycheckbitINV;" ] [ "isnotnil", "command", "calc", "(v:void):bit ", "CALCisnotnil_void;" ] [ "isnil", "command", "calc", "(v:void):bit ", "CALCisnil_void;" ] [ "isnotnil", "command", "calc", "(v:BAT):bit ", "CALCisnotnil_bat;" ] @@ -4963,6 +4966,10 @@ [ "max_no_nil", "command", "calc", "(l:chr,r:chr):chr ", "CALCbinaryMAX_NO_NILchr;" ] [ "min", "command", "calc", "(l:chr,r:chr):chr ", "CALCbinaryMINchr;" ] [ "max", "command", "calc", "(l:chr,r:chr):chr ", "CALCbinaryMAXchr;" ] +[ "min_no_nil", "command", "calc", "(ll:bit,r:bit):bit ", "CALCbinaryMIN_NO_NILbit;" ] +[ "max_no_nil", "command", "calc", "(l:bit,r:bit):bit ", "CALCbinaryMAX_NO_NILbit;" ] +[ "min", "command", "calc", "(l:bit,r:bit):bit ", "CALCbinaryMINbit;" ] +[ "max", "command", "calc", "(l:bit,r:bit):bit ", "CALCbinaryMAXbit;" ] [ "newoid", "command", "calc", "(incr:int):oid ", "CALCnewoidInc;" ] [ "newoid", "command", "calc", "(incr:lng):oid ", "CALCnewoidInclng;" ] [ "newoid", "command", "calc", "():oid ", "CALCnewoidBase;" ] @@ -5046,6 +5053,8 @@ [ "sizeof", "command", "calc", "(x:bte):int ", "CALCsizeofbte;" ] [ "sign", "command", "calc", "(x:chr):chr ", "CALCunarychrSIGN;" ] [ "sizeof", "command", "calc", "(x:chr):int ", "CALCsizeofchr;" ] +[ "sign", "command", "calc", "(x:bit):bit ", "CALCunarybitSIGN;" ] +[ "sizeof", "command", "calc", "(x:bit):int ", "CALCsizeofbit;" ] [ "sqladd", "command", "calc", "(left:lng,right:dbl):dbl ", "CALCbinarySQLADDlngdbl;" ] [ "sqladd", "command", "calc", "(left:lng,right:flt):dbl ", "CALCbinarySQLADDlngflt;" ] [ "sqladd", "command", "calc", "(left:lng,right:lng):lng ", "CALCbinarySQLADDlnglng;" ] diff -r 4218d0f17d5d -r 2c5e204b6272 buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog Tue Jul 06 17:37:29 2010 +0200 +++ b/buildtools/conf/Maddlog Tue Jul 06 17:50:49 2010 +0200 @@ -28,7 +28,7 @@ exit -1 fi -nocommit= +nocommit=true while [ $# -gt 0 ]; do case "$1" in --logfile=*) @@ -44,8 +44,8 @@ CL=${1#-f} shift ;; - --nocommit) - nocommit=true + --commit) + nocommit= shift ;; --) @@ -57,7 +57,7 @@ $0: unknown option $1 Valid options are: --logfile=filename (-f filename) - --nocommit + --commit EOF exit 1 ;; @@ -135,7 +135,12 @@ mv $file "$CL" +hg add "$CL" >& /dev/null + if [ ! "$nocommit" ]; then - hg add "$CL" >& /dev/null - hg commit -m " $msg" "$CL" + hg commit -m " $msg" "$CL" +else + hg diff "$CL" + echo "Don't forget to COMMIT." fi +echo "Don't forget to PUSH." diff -r 4218d0f17d5d -r 2c5e204b6272 clients/ChangeLog.Jun2010 --- a/clients/ChangeLog.Jun2010 Tue Jul 06 17:37:29 2010 +0200 +++ b/clients/ChangeLog.Jun2010 Tue Jul 06 17:50:49 2010 +0200 @@ -1,10 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Mon Jul 5 2010 Sjoerd Mullender <[email protected]> -- Implemented dumping of GRANT statements. - This fixes bug 2574. - -* Thr Jul 1 2010 Fabian Groffen <[email protected]> -- Fix implementation of mapi_mapiuri to deal with UNIX socket urls - properly. This fixes one part of Bug #2567. diff -r 4218d0f17d5d -r 2c5e204b6272 clients/MonetDB-client.spec --- a/clients/MonetDB-client.spec Tue Jul 06 17:37:29 2010 +0200 +++ b/clients/MonetDB-client.spec Tue Jul 06 17:50:49 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB-client-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB-client-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: MonetDB >= 1.38 @@ -333,6 +333,14 @@ %{_libdir}/MonetDB/Tests/* %changelog +* Mon Jul 5 2010 Sjoerd Mullender <[email protected]> - 1.38.3-20100706 +- Implemented dumping of GRANT statements. + This fixes bug 2574. + +* Thu Jul 1 2010 Fabian Groffen <[email protected]> - 1.38.3-20100706 +- Fix implementation of mapi_mapiuri to deal with UNIX socket urls + properly. This fixes one part of Bug #2567. + * Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 1.38.1-20100630 - Rebuilt. diff -r 4218d0f17d5d -r 2c5e204b6272 clients/debian/changelog --- a/clients/debian/changelog Tue Jul 06 17:37:29 2010 +0200 +++ b/clients/debian/changelog Tue Jul 06 17:50:49 2010 +0200 @@ -1,3 +1,16 @@ +monetdb-client (1.38.3-20100706) unstable; urgency=low + + * Implemented dumping of GRANT statements. + This fixes bug 2574. + + -- Sjoerd Mullender <[email protected]> Mon, 5 Jul 2010 14:06:18 +0200 + +monetdb-client (1.38.3-20100706) unstable; urgency=low + + * Fix implementation of mapi_mapiuri to deal with UNIX socket urls + + -- Fabian Groffen <[email protected]> Thu, 1 Jul 2010 14:06:18 +0200 + monetdb-client (1.38.1-20100630) unstable; urgency=low * Rebuilt. diff -r 4218d0f17d5d -r 2c5e204b6272 geom/MonetDB-geom.spec --- a/geom/MonetDB-geom.spec Tue Jul 06 17:37:29 2010 +0200 +++ b/geom/MonetDB-geom.spec Tue Jul 06 17:50:49 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB-geom-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB-geom-%{version}.tar.gz _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
