Changeset: e4ae9e48d397 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4ae9e48d397 Modified Files: MonetDB5/configure.ag sql/configure.ag Branch: default Log Message:
merging diffs (truncated from 14248 to 300 lines): diff -r c1c8468d5b9e -r e4ae9e48d397 .hgignore --- a/.hgignore Wed Jul 07 16:51:13 2010 +0200 +++ b/.hgignore Wed Jul 07 16:55:54 2010 +0200 @@ -34,12 +34,18 @@ ^buildtools/burg/gram\.[ch]$ ^buildtools/burg/y\.tab\.h$ ^buildtools/burg/ylwrap$ +^buildtools/depcomp$ +^buildtools/doc/HowToRelease\.html$ +^buildtools/doc/HowToRelease\.pdf$ +^buildtools/doc/windowsbuild\.html$ +^buildtools/doc/windowsbuild\.pdf$ ^buildtools/dummy.h.in$ ^buildtools/mel/.*\.[ch]$ ^buildtools/mel/.*\.cxx$ ^buildtools/mel/depcomp$ ^buildtools/mel/mel\.ll$ ^buildtools/mel/mel\.yy$ +^buildtools/ylwrap$ ^clients/NT/Runmclient\.bat$ ^java/NT/.*\.jar$ ^java/NT/nl/ diff -r c1c8468d5b9e -r e4ae9e48d397 .hgtags --- a/.hgtags Wed Jul 07 16:51:13 2010 +0200 +++ b/.hgtags Wed Jul 07 16:55:54 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 c1c8468d5b9e -r e4ae9e48d397 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB/MonetDB.spec Wed Jul 07 16:55:54 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 @@ -123,7 +123,7 @@ * Tue Apr 20 2010 Stefan Manegold <maneg...@cwi.nl> - 1.38.1-20100618 - Made compilation of "testing" (and "java") independent of MonetDB. - This is mainy for Windows, but also on other systems, "testing" can now be + This is mainly for Windows, but also on other systems, "testing" can now be built independently of (and hence before) "MonetDB". Files that mimic configure functionality on Windows were moved from "MonetDB" to "buildtools"; hence, this affects all packages on Windows, diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB/debian/changelog --- a/MonetDB/debian/changelog Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB/debian/changelog Wed Jul 07 16:55:54 2010 +0200 @@ -31,7 +31,7 @@ monetdb (1.38.1-20100618) unstable; urgency=low * Made compilation of "testing" (and "java") independent of MonetDB. - This is mainy for Windows, but also on other systems, "testing" can now be + This is mainly for Windows, but also on other systems, "testing" can now be built independently of (and hence before) "MonetDB". Files that mimic configure functionality on Windows were moved from "MonetDB" to "buildtools"; hence, this affects all packages on Windows, diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Wed Jul 07 16:55:54 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 @@ -233,7 +233,7 @@ * Tue Apr 20 2010 Stefan Manegold <maneg...@cwi.nl> - 4.38.1-20100618 - Made compilation of "testing" (and "java") independent of MonetDB. - This is mainy for Windows, but also on other systems, "testing" can now be + This is mainly for Windows, but also on other systems, "testing" can now be built independently of (and hence before) "MonetDB". Files that mimic configure functionality on Windows were moved from "MonetDB" to "buildtools"; hence, this affects all packages on Windows, diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB4/debian/changelog Wed Jul 07 16:55:54 2010 +0200 @@ -31,7 +31,7 @@ monetdb4-server (4.38.1-20100618) unstable; urgency=low * Made compilation of "testing" (and "java") independent of MonetDB. - This is mainy for Windows, but also on other systems, "testing" can now be + This is mainly for Windows, but also on other systems, "testing" can now be built independently of (and hence before) "MonetDB". Files that mimic configure functionality on Windows were moved from "MonetDB" to "buildtools"; hence, this affects all packages on Windows, diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010 Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010 Wed Jul 07 16:55:54 2010 +0200 @@ -1,15 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Thr Jul 01 2010 Fabian Groffen <fab...@cwi.nl> -- 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 <stefan.maneg...@cwi.nl> -- 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 c1c8468d5b9e -r e4ae9e48d397 MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Wed Jul 07 16:55:54 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}} @@ -213,6 +213,18 @@ %{_libdir}/*.so %changelog +* Thu Jul 01 2010 Fabian Groffen <fab...@cwi.nl> - 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 <stefan.maneg...@cwi.nl> - 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 <sjo...@acm.org> - 5.20.1-20100630 - Rebuilt. @@ -240,14 +252,14 @@ * Sat May 1 2010 Stefan Manegold <maneg...@cwi.nl> - 5.20.1-20100618 - fixed BUG #2994521 "mat.slice unable to cope with only empty BAT arguments" https://sourceforge.net/tracker/index.php?func=detail&aid=2994521&group_id=56967&atid=482468 - by makeing MATpackSliceInternal() handle empty input BATs correctly + by making MATpackSliceInternal() handle empty input BATs correctly * Tue Apr 20 2010 Martin Kersten <martin.kers...@cwi.nl> - 5.20.1-20100618 - Select <col> from <t> limit <n> has been improved by introducing mat.slice(). * Tue Apr 20 2010 Stefan Manegold <maneg...@cwi.nl> - 5.20.1-20100618 - Made compilation of "testing" (and "java") independent of MonetDB. - This is mainy for Windows, but also on other systems, "testing" can now be + This is mainly for Windows, but also on other systems, "testing" can now be built independently of (and hence before) "MonetDB". Files that mimic configure functionality on Windows were moved from "MonetDB" to "buildtools"; hence, this affects all packages on Windows, @@ -267,7 +279,7 @@ an optional hash '#', which produces line numbers for each of reference and analysis of variable span. - The dataflow scheduler has been revamped to allow for - more parellelism to be exploited. + more parallelism to be exploited. - The garbage collection administration has been changed. Every variable record now comes with an end-of-life field (eolife), which denotes the instruction whereafter the BAT variable reference counter can be decremented. The garbage collector is @@ -275,7 +287,7 @@ pressing needs to retain them. This means that MAL functions defined and used in the context of SQL, and which are not inlined, may cause a leakage. The garbage collection has become part of each interpreter step. - The new approach makes the SQL/MAL plans half te size as before. + The new approach makes the SQL/MAL plans half the size as before. * Tue Apr 20 2010 Fabian Groffen <fab...@cwi.nl> - 5.20.1-20100618 - Removed stethoscope from MonetDB5 sources. New location is in the diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB5/debian/changelog Wed Jul 07 16:55:54 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 <fab...@cwi.nl> 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 <stefan.maneg...@cwi.nl> Wed, 30 Jun 2010 14:06:18 +0200 + monetdb5-server (5.20.1-20100630) unstable; urgency=low * Rebuilt. @@ -50,7 +68,7 @@ * fixed BUG #2994521 "mat.slice unable to cope with only empty BAT arguments" https://sourceforge.net/tracker/index.php?func=detail&aid=2994521&group_id=56967&atid=482468 - by makeing MATpackSliceInternal() handle empty input BATs correctly + by making MATpackSliceInternal() handle empty input BATs correctly -- Stefan Manegold <maneg...@cwi.nl> Sat, 1 May 2010 10:58:37 +0200 @@ -63,7 +81,7 @@ monetdb5-server (5.20.1-20100618) unstable; urgency=low * Made compilation of "testing" (and "java") independent of MonetDB. - This is mainy for Windows, but also on other systems, "testing" can now be + This is mainly for Windows, but also on other systems, "testing" can now be built independently of (and hence before) "MonetDB". Files that mimic configure functionality on Windows were moved from "MonetDB" to "buildtools"; hence, this affects all packages on Windows, @@ -89,7 +107,7 @@ an optional hash '#', which produces line numbers for each of reference and analysis of variable span. * The dataflow scheduler has been revamped to allow for - more parellelism to be exploited. + more parallelism to be exploited. * The garbage collection administration has been changed. Every variable record now comes with an end-of-life field (eolife), which denotes the instruction whereafter the BAT variable reference counter can be decremented. The garbage collector is @@ -97,7 +115,7 @@ pressing needs to retain them. This means that MAL functions defined and used in the context of SQL, and which are not inlined, may cause a leakage. The garbage collection has become part of each interpreter step. - The new approach makes the SQL/MAL plans half te size as before. + The new approach makes the SQL/MAL plans half the size as before. -- Martin Kersten <martin.kers...@cwi.nl> Tue, 20 Apr 2010 10:58:37 +0200 diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB5/src/mal/Tests/tst654.mal --- a/MonetDB5/src/mal/Tests/tst654.mal Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst654.mal Wed Jul 07 16:55:54 2010 +0200 @@ -16,6 +16,8 @@ b2:= bat.new(:oid,:str); bat.append(b2,"hello world"); bat.append(b2,"goodbye world"); +bat.setName(b1,"BAT_b1"); +bat.setName(b2,"BAT_b2"); tablet.setProperties("name,type,dense,sorted,key,min,max"); tablet.display(b1,b2); diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB5/src/mal/Tests/tst654.stable.out --- a/MonetDB5/src/mal/Tests/tst654.stable.out Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst654.stable.out Wed Jul 07 16:55:54 2010 +0200 @@ -31,6 +31,8 @@ #b2:= new(:void,:str); #insert(b2,"hello world"); #insert(b2,"goodbye world"); +#bat.setName(b1,"BAT_b1"); +#bat.setName(b2,"BAT_b2"); # #tablet.setProperties("name,type,dense,sorted,key,min,max"); #tablet.display(b1,b2); @@ -76,6 +78,8 @@ b2 := bat.new(:oid,:str); bat.append(b2,"hello world"); bat.append(b2,"goodbye world"); + bat.setName(b1,"BAT_b1"); + bat.setName(b2,"BAT_b2"); tablet.setProperties("name,type,dense,sorted,key,min,max"); tablet.display(b1,b2); in := calc.int(nil); @@ -117,7 +121,7 @@ [ 1, 2 ] #-----------------------# #-------------------------------# -% tmp_7,tmp_10 # name +% BAT_b1,BAT_b2 # name % int, str # type % false,false # dense % true, false # sorted @@ -128,7 +132,7 @@ [ 42, "hello world" ] [ 49, "goodbye world" ] #---------------------------------------# -% tmp_7, tmp_10 # name +% BAT_b1, BAT_b2 # name #---------------------------------------# [ 4.2, "hello world" ] [ 4.9, "goodbye world" ] diff -r c1c8468d5b9e -r e4ae9e48d397 MonetDB5/src/mal/Tests/tst655.mal --- a/MonetDB5/src/mal/Tests/tst655.mal Wed Jul 07 16:51:13 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst655.mal Wed Jul 07 16:55:54 2010 +0200 @@ -6,6 +6,8 @@ b2:= bat.new(:oid,:str); _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
