MonetDB: - Created a new RPM MonetDB5-server-rdf for the option...
Changeset: 96ec36e7d99a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=96ec36e7d99a
Modified Files:
Branch:
Log Message:
Created a new RPM MonetDB5-server-rdf for the optional MonetDB/RDF module.
diffs (100 lines):
diff -r bfba7f6a1a5d -r 96ec36e7d99a MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Tue May 18 14:16:16 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Wed May 19 14:33:38 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed May 19 2010 Sjoerd Mullender sjo...@acm.org
+- Created a new RPM MonetDB5-server-rdf for the optional MonetDB/RDF module.
+
* Sun May 2 2010 Martin Kersten martin.kers...@cwi.nl
- Added the Z-order module to simplify future manipulation of arrays.
diff -r bfba7f6a1a5d -r 96ec36e7d99a MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue May 18 14:16:16 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Wed May 19 14:33:38 2010 +0200
@@ -33,9 +33,6 @@
Requires(pre): shadow-utils
BuildRequires: pcre-devel
-%if %{?_with_raptor:1}%{!?_with_raptor:0}
-BuildRequires: raptor-devel = 1.4.16
-%endif
BuildRequires: libxml2-devel
# when we want MonetDB to run as system daemon, we need this
@@ -63,6 +60,14 @@
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
%endif
+%if %{?_with_raptor:1}%{!?_with_raptor:0}
+%package rdf
+Summary: MonetDB RDF interface
+Group: Applications/Databases
+Requires: %{name} = %{version}-%{release}
+BuildRequires: raptor-devel = 1.4.16
+%endif
+
%package devel
Summary: MonetDB development package
Group: Applications/Databases
@@ -82,6 +87,16 @@
use the SQL frontend (in which case you need MonetDB-SQL-server5 as
well).
+%if %{?_with_raptor:1}%{!?_with_raptor:0}
+%description rdf
+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, SQL- and XML- frontends.
+
+This package contains the MonetDB5 RDF module.
+%endif
+
%description devel
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -122,6 +137,8 @@
find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB5/Tests/*
+find $RPM_BUILD_ROOT%{_libdir}/MonetDB5 \( -name \*.mal -o -name \*.so\* \) !
-name '*rdf*' -print | sed s|^$RPM_BUILD_ROOT|| lib-files
+
%pre
getent group monetdb /dev/null || groupadd -r monetdb
getent passwd monetdb /dev/null || \
@@ -153,7 +170,7 @@
%clean
rm -fr $RPM_BUILD_ROOT
-%files
+%files -f lib-files
%defattr(-,root,root)
%{_bindir}/mserver5
%{_bindir}/Mbeddedmal
@@ -161,8 +178,7 @@
%{_libdir}/*.so.*
%dir %{_libdir}/MonetDB5
%dir %{_libdir}/MonetDB5/lib
-%{_libdir}/MonetDB5/lib/*.so*
-%{_libdir}/MonetDB5/*.mal
+%dir %{_libdir}/MonetDB5/autoload
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
@@ -170,6 +186,13 @@
%config(noreplace) %{_sysconfdir}/monetdb5.conf
%{_mandir}/man5/monetdb5.conf.5.gz
+%if %{?_with_raptor:1}%{!?_with_raptor:0}
+%files rdf
+%{_libdir}/MonetDB5/rdf.mal
+%{_libdir}/MonetDB5/lib/lib_rdf.so*
+%{_libdir}/MonetDB5/autoload/*_rdf.mal
+%endif
+
%files devel
%defattr(-,root,root)
%{_bindir}/monetdb5-config
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: - Merge from Jun2010: Created a new RPM MonetDB5-serve...
Changeset: cbbfb77ab516 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbbfb77ab516
Modified Files:
Branch:
Log Message:
Merge from Jun2010: Created a new RPM MonetDB5-server-rdf for the optional
MonetDB/RDF module.
diffs (100 lines):
diff -r 1d93562fabf5 -r cbbfb77ab516 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Tue May 18 14:16:47 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Wed May 19 14:35:55 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed May 19 2010 Sjoerd Mullender sjo...@acm.org
+- Created a new RPM MonetDB5-server-rdf for the optional MonetDB/RDF module.
+
* Sun May 2 2010 Martin Kersten martin.kers...@cwi.nl
- Added the Z-order module to simplify future manipulation of arrays.
diff -r 1d93562fabf5 -r cbbfb77ab516 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue May 18 14:16:47 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Wed May 19 14:35:55 2010 +0200
@@ -33,9 +33,6 @@
Requires(pre): shadow-utils
BuildRequires: pcre-devel
-%if %{?_with_raptor:1}%{!?_with_raptor:0}
-BuildRequires: raptor-devel = 1.4.16
-%endif
BuildRequires: libxml2-devel
# when we want MonetDB to run as system daemon, we need this
@@ -63,6 +60,14 @@
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
%endif
+%if %{?_with_raptor:1}%{!?_with_raptor:0}
+%package rdf
+Summary: MonetDB RDF interface
+Group: Applications/Databases
+Requires: %{name} = %{version}-%{release}
+BuildRequires: raptor-devel = 1.4.16
+%endif
+
%package devel
Summary: MonetDB development package
Group: Applications/Databases
@@ -82,6 +87,16 @@
use the SQL frontend (in which case you need MonetDB-SQL-server5 as
well).
+%if %{?_with_raptor:1}%{!?_with_raptor:0}
+%description rdf
+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, SQL- and XML- frontends.
+
+This package contains the MonetDB5 RDF module.
+%endif
+
%description devel
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -122,6 +137,8 @@
find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB5/Tests/*
+find $RPM_BUILD_ROOT%{_libdir}/MonetDB5 \( -name \*.mal -o -name \*.so\* \) !
-name '*rdf*' -print | sed s|^$RPM_BUILD_ROOT|| lib-files
+
%pre
getent group monetdb /dev/null || groupadd -r monetdb
getent passwd monetdb /dev/null || \
@@ -153,7 +170,7 @@
%clean
rm -fr $RPM_BUILD_ROOT
-%files
+%files -f lib-files
%defattr(-,root,root)
%{_bindir}/mserver5
%{_bindir}/Mbeddedmal
@@ -161,8 +178,7 @@
%{_libdir}/*.so.*
%dir %{_libdir}/MonetDB5
%dir %{_libdir}/MonetDB5/lib
-%{_libdir}/MonetDB5/lib/*.so*
-%{_libdir}/MonetDB5/*.mal
+%dir %{_libdir}/MonetDB5/autoload
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
@@ -170,6 +186,13 @@
%config(noreplace) %{_sysconfdir}/monetdb5.conf
%{_mandir}/man5/monetdb5.conf.5.gz
+%if %{?_with_raptor:1}%{!?_with_raptor:0}
+%files rdf
+%{_libdir}/MonetDB5/rdf.mal
+%{_libdir}/MonetDB5/lib/lib_rdf.so*
+%{_libdir}/MonetDB5/autoload/*_rdf.mal
+%endif
+
%files devel
%defattr(-,root,root)
%{_bindir}/monetdb5-config
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010.
Changeset: d77b51f6d695 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d77b51f6d695 Modified Files: sql/src/backends/monet5/sql.mx sql/src/server/rel_optimizer.mx sql/src/server/rel_schema.mx Branch: default Log Message: Merge from Jun2010. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merge backport from Feb2010.
Changeset: 5aed9ea3f536 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5aed9ea3f536 Modified Files: sql/src/backends/monet5/sql.mx sql/src/server/rel_optimizer.mx sql/src/server/rel_schema.mx sql/src/storage/store.mx Branch: Jun2010 Log Message: Merge backport from Feb2010. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Feb2010 - Ignore files created on Windows.
Changeset: f39aa809b318 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f39aa809b318 Modified Files: Branch: Feb2010 Log Message: Ignore files created on Windows. diffs (87 lines): diff -r b253ed971b5c -r f39aa809b318 .hgignore --- a/.hgignore Wed May 19 22:00:26 2010 +0200 +++ b/.hgignore Thu May 20 13:19:51 2010 +0200 @@ -1,30 +1,62 @@ +/\# +/\.\# +/@ +MANIFEST$ +Makefile\.in$ +MonetDB4/NT/MonetDB\.pc$ +NT/.*_config\.h$ +NT/RunMapprove\.bat$ +NT/RunMserver\.bat$ +NT/RunMtest\.bat$ +NT/conf/ +NT/inttypes\.h$ +NT/scripts/ +NT/src/ +NT/unistd\.h$ TAGS$ +\.exe$ +\.exe\.manifest$ +\.incs\.ag$ +\.incs\.in$ +\.obj$ +\.orig$ +\.rej$ +^(?!buildtools).*/Makefile\.am$ +^(?!buildtools).*/Makefile\.msc$ +^TestTools/ +^buildtools/Mx/depcomp$ +^buildtools/Mx/mx_config\.h$ +^buildtools/autogen/build/ +^buildtools/burg/burg_config\.h$ +^buildtools/burg/depcomp$ +^buildtools/burg/gram\.[ch]$ +^buildtools/burg/y\.tab\.h$ +^buildtools/burg/ylwrap$ +^buildtools/mel/.*\.[ch]$ +^buildtools/mel/.*\.cxx$ +^buildtools/mel/depcomp$ +^buildtools/mel/mel\.ll$ +^buildtools/mel/mel\.yy$ +^clients/NT/Runmclient\.bat$ +^java/NT/.*\.jar$ +^java/NT/nl/ +^java/NT/tests/ +^pathfinder/NT/compiler/ +^pathfinder/NT/modules/ +^pathfinder/NT/runtime/ +^pathfinder/conf/compile$ +^sql/NT/MonetDB-SQL\.pc$ aclocal\.m4$ acout\.in$ autom4te\.cache$ +callant.*\.bat$ config\.guess$ +config\.h\.in$ config\.sub$ -install-sh$ -ltmain\.sh$ -missing$ -install\.lst$ configure$ configure\.in$ doc\.lst$ -config\.h\.in$ -/\# -/\.\# -^(?!buildtools).*/Makefile\.am$ -Makefile\.in$ -Makefile\.msc$ -\.incs\.ag$ -\.incs\.in$ -\.orig$ -\.rej$ -MANIFEST$ -^TestTools/ -^buildtools/Mx/depcomp$ -^buildtools/burg/depcomp$ -^buildtools/burg/ylwrap$ -^buildtools/mel/depcomp$ -^pathfinder/conf/compile$ +install-sh$ +install\.lst$ +ltmain\.sh$ +missing$ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Ignore files created on Windows (merge from F...
Changeset: 29b1e8077e9c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29b1e8077e9c Modified Files: .hgignore Branch: Jun2010 Log Message: Ignore files created on Windows (merge from Feb2010). diffs (89 lines): diff -r 5aed9ea3f536 -r 29b1e8077e9c .hgignore --- a/.hgignore Thu May 20 10:21:32 2010 +0200 +++ b/.hgignore Thu May 20 13:27:02 2010 +0200 @@ -1,31 +1,63 @@ +/\# +/\.\# +/@ +MANIFEST$ +Makefile\.in$ +MonetDB4/NT/MonetDB\.pc$ +NT/.*_config\.h$ +NT/RunMapprove\.bat$ +NT/RunMserver\.bat$ +NT/RunMtest\.bat$ +NT/conf/ +NT/inttypes\.h$ +NT/scripts/ +NT/src/ +NT/unistd\.h$ TAGS$ +\.exe$ +\.exe\.manifest$ +\.incs\.ag$ +\.incs\.in$ +\.obj$ +\.orig$ +\.rej$ +^(?!buildtools).*/Makefile\.am$ +^(?!buildtools).*/Makefile\.msc$ +^TestTools/ +^buildtools/Mx/depcomp$ +^buildtools/Mx/mx_config\.h$ +^buildtools/autogen/build/ +^buildtools/burg/burg_config\.h$ +^buildtools/burg/depcomp$ +^buildtools/burg/gram\.[ch]$ +^buildtools/burg/y\.tab\.h$ +^buildtools/burg/ylwrap$ +^buildtools/dummy.h.in$ +^buildtools/mel/.*\.[ch]$ +^buildtools/mel/.*\.cxx$ +^buildtools/mel/depcomp$ +^buildtools/mel/mel\.ll$ +^buildtools/mel/mel\.yy$ +^clients/NT/Runmclient\.bat$ +^java/NT/.*\.jar$ +^java/NT/nl/ +^java/NT/tests/ +^pathfinder/NT/compiler/ +^pathfinder/NT/modules/ +^pathfinder/NT/runtime/ +^pathfinder/conf/compile$ +^sql/NT/MonetDB-SQL\.pc$ aclocal\.m4$ acout\.in$ autom4te\.cache$ +callant.*\.bat$ config\.guess$ +config\.h\.in$ config\.sub$ -install-sh$ -ltmain\.sh$ -missing$ -install\.lst$ configure$ configure\.in$ doc\.lst$ -config\.h\.in$ -/\# -/\.\# -^(?!buildtools).*/Makefile\.am$ -Makefile\.in$ -Makefile\.msc$ -\.incs\.ag$ -\.incs\.in$ -\.orig$ -\.rej$ -MANIFEST$ -^TestTools/ -^buildtools/dummy.h.in$ -^buildtools/Mx/depcomp$ -^buildtools/burg/depcomp$ -^buildtools/burg/ylwrap$ -^buildtools/mel/depcomp$ -^pathfinder/conf/compile$ +install-sh$ +install\.lst$ +ltmain\.sh$ +missing$ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch: Updated Vendor in...
Changeset: 5961b4c8349e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5961b4c8349e
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/MonetDB-SQL.spec
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merged from Jun2010 branch: Updated Vendor information.
diffs (230 lines):
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org
+- Updated Vendor information.
+
* Wed Mar 31 2010 Stefan Manegold maneg...@cwi.nl
- Made compilation of testing (and java) independent of MonetDB.
This is mainy for Windows, but also on other systems, testing can now be
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon May 31 10:55:28 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV mo...@cwi.nl
+Vendor: MonetDB BV i...@monetdb.org
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB4
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org
+- Updated Vendor information.
+
* Wed Mar 31 2010 Stefan Manegold maneg...@cwi.nl
- Made compilation of testing (and java) independent of MonetDB.
This is mainy for Windows, but also on other systems, testing can now be
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon May 31 10:55:28 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV mo...@cwi.nl
+Vendor: MonetDB BV i...@monetdb.org
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org
+- Updated Vendor information.
+
* Wed May 19 2010 Sjoerd Mullender sjo...@acm.org
- Created a new RPM MonetDB5-server-rdf for the optional MonetDB/RDF module.
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon May 31 10:55:28 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV mo...@cwi.nl
+Vendor: MonetDB BV i...@monetdb.org
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r b71fdf74b459 -r 5961b4c8349e buildtools/conf/MonetDB-release.spec
--- a/buildtools/conf/MonetDB-release.spec Sun May 30 15:13:18 2010 +0200
+++ b/buildtools/conf/MonetDB-release.spec Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,6 @@
Name: MonetDB-release
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MonetDB YUM Repository
Group: Applications/Databases
@@ -9,7 +9,7 @@
Source0:
http://monetdb.cwi.nl/downloads/sources/%{name}-%{version}.tar.gz
BuildArch: noarch
-Vendor:MonetDB B.V.
+Vendor:MonetDB BV i...@monetdb.org
Requires: fedora-release
@@ -49,6 +49,9 @@
%changelog
+* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org - 1.0-4
+- Updated Vendor information.
+
* Fri Dec 11 2009 Sjoerd Mullender sjo...@acm.org - 1.0-3
- Added a testing repository (for release candidates).
diff -r b71fdf74b459 -r 5961b4c8349e clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Sun May 30 15:13:18 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org
+- Updated Vendor information.
+
* Thu Apr 8 2010 Sjoerd Mullender sjo...@acm.org
- The MonetDB ODBC driver now no longer depends on its own copy
MonetDB: default - Merged from Jun2010 branch: Added Mock config...
Changeset: 40b307447188 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40b307447188 Modified Files: Branch: default Log Message: Merged from Jun2010 branch: Added Mock configuration files for Fedora 13. diffs (100 lines): diff -r 5961b4c8349e -r 40b307447188 buildtools/conf/mock/fedora-13-i386-monetdb.cfg --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/buildtools/conf/mock/fedora-13-i386-monetdb.cfg Mon May 31 10:58:22 2010 +0200 @@ -0,0 +1,44 @@ +config_opts['root'] = 'fedora-13-i386' +config_opts['target_arch'] = 'i686' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13arch=i386 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13arch=i386 +failovermethod=priority + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/i386/ +cost=2000 +enabled=0 + +[monetdb] +name=monetdb +baseurl=http://localhost/MonetDB-repo/Fedora/13/i386/ +metadata_expire=1 +http_caching=none +exclude=*debuginfo* + + + + diff -r 5961b4c8349e -r 40b307447188 buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg Mon May 31 10:58:22 2010 +0200 @@ -0,0 +1,48 @@ +config_opts['root'] = 'fedora-13-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 +# The above is not needed anymore with yum multilib policy of best which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13arch=x86_64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13arch=x86_64 +failovermethod=priority + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/x86_64/ +cost=2000 +enabled=0 + +[monetdb] +name=monetdb +baseurl=http://localhost/MonetDB-repo/Fedora/13/x86_64/ +metadata_expire=1 +http_caching=none +exclude=*debuginfo* + + + + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Make that views on bats don't cause the paren...
Changeset: 142086e32817 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=142086e32817
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_align.mx
MonetDB/src/gdk/gdk_bbp.mx
MonetDB/src/gdk/gdk_heap.mx
MonetDB5/src/modules/kernel/bat5.mx
MonetDB5/src/modules/kernel/batcalc.mx
Branch: default
Log Message:
Make that views on bats don't cause the parent bat to remain loaded.
When a bat has a view, the physical reference of the parent bat is
incremented, causing it to stay in core while the view exists.
However, the parent bat also remains in core when the view has a
physical reference of 0 (but with a logical reference 0 so that the
view does still exist).
This patch changes that.
When a view's physical reference count goes to zero, the paren't
reference count is decremented. This means that if there are no other
references to the parent bat, it too may be swapped out. When the
view's physical reference count goes up to one, the parent's physical
reference count is also incremented, so that it is loaded again if it
had been swapped out.
diffs (truncated from 623 to 300 lines):
diff -r 40b307447188 -r 142086e32817 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxMon May 31 10:58:22 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxMon May 31 15:09:31 2010 +0200
@@ -2094,8 +2094,8 @@
#define BBPname(i) (BBPcheck((i),BBPname)?((i) 0 ||
BBP_logical(i))?BBP_logical(i):BBP_logical(-(i)):)
#define BBPvalid(i)(BBP_logical(i) != NULL *BBP_logical(i) != '.')
#define BATgetId(b)BBPname((b)-batCacheid)
-#define BBPfix(i) BBPincref(i, FALSE)
-#define BBPunfix(i)BBPdecref(i, FALSE)
+#define BBPfix(i) BBPincref((i), FALSE)
+#define BBPunfix(i)BBPdecref((i), FALSE)
#define BBPRENAME_ALREADY (-1)
#define BBPRENAME_ILLEGAL (-2)
diff -r 40b307447188 -r 142086e32817 MonetDB/src/gdk/gdk_align.mx
--- a/MonetDB/src/gdk/gdk_align.mx Mon May 31 10:58:22 2010 +0200
+++ b/MonetDB/src/gdk/gdk_align.mx Mon May 31 15:09:31 2010 +0200
@@ -560,7 +560,7 @@
tp = VIEWtparent(b);
if (hp || tp) {
BAT *r = b;
- BAT *n = b = BBP_cache(ABS(b-batCacheid));
+ BAT *n = b = BATdescriptor(ABS(b-batCacheid));
BAT *m = BATmirror(n);
BAT *v;
BATstore *bs = BBP_desc(b-batCacheid);
@@ -615,10 +615,14 @@
/* cut the link to your parents */
VIEWunlink(n);
- if (hp)
+ if (hp) {
BBPunshare(hp);
- if (tp)
+ BBPunfix(hp);
+ }
+ if (tp) {
BBPunshare(tp);
+ BBPunfix(tp);
+ }
/* make sure everything points there */
m-U = n-U = bs-U;
@@ -679,10 +683,13 @@
/* insert all of v in b, and quit */
BATins(b, v, FALSE);
BBPreclaim(v);
+ BBPunfix(b-batCacheid);
b = r;
}
return b;
bailout:
+ if (b)
+ BBPunfix(b-batCacheid);
HEAPfree(head);
HEAPfree(tail);
HEAPfree(hh);
diff -r 40b307447188 -r 142086e32817 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxMon May 31 10:58:22 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxMon May 31 15:09:31 2010 +0200
@@ -183,6 +183,7 @@
static void BBPuncacheit_(bat bid, int unloaddesc);
static void BBPinitcache(void);
static int BBPprepare(bit subcommit);
+static BAT *getBBPdescriptor(bat i, int lock);
static int stamp = 0;
@@ -934,7 +935,7 @@
BBPexit(void)
{
bat i;
- int skipped = 1;
+ int skipped;
if (!BBP)
return; /* AARGH */
@@ -943,7 +944,7 @@
BBPlock(BBPexit); /* stop all threads ever touching more
descriptors */
/* free all memory (just for leak-checking in Purify) */
- while (skipped) {
+ do {
skipped = 0;
for (i = 0; i BBPsize; i++) {
if (BBPvalid(i)) {
@@ -958,14 +959,22 @@
if (isVIEW(b)) {
bat hp = VIEWhparent(b), tp =
VIEWtparent(b);
bat vhp = VIEWvhparent(b), vtp
= VIEWvtparent(b);
- if (hp)
+ if (hp) {
BBP_cache(hp)-batSharecnt--;
- if (tp)
+ --BBP_lrefs(hp);
+ }
+ if (tp) {
MonetDB: default - Merged heads.
Changeset: f7c9a3659dd6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7c9a3659dd6
Modified Files:
Branch: default
Log Message:
Merged heads.
diffs (118 lines):
diff -r 142086e32817 -r f7c9a3659dd6 MonetDB5/src/mal/mal_recycle.mx
--- a/MonetDB5/src/mal/mal_recycle.mx Mon May 31 15:09:31 2010 +0200
+++ b/MonetDB5/src/mal/mal_recycle.mx Mon May 31 15:31:10 2010 +0200
@@ -2618,10 +2618,11 @@
#endif
if ( ((getFunctionId(q) == bindRef ||
getFunctionId(q) == bind_idxRef )
- ( getVarConstant(recycleBlk,
getArg(q,5)).val.ival == 0 )) ||
+ ( getVarConstant(recycleBlk,
getArg(q,5)).val.ival =
+ getVarConstant(mb,
getArg(p,1)).val.ival )) ||
( getFunctionId(q) == bind_dbatRef ) ){
- for (j=p-retc; jp-argc; j++)
- if( VALcmp(
stk-stk[getArg(p,j)], getVarConstant(recycleBlk,getArg(q,j+1
+ for (j=p-retc+1; jp-argc; j++)
+ if( VALcmp(
stk-stk[getArg(p,j)], getVarConstant(recycleBlk,getArg(q,j
break;
if (j == p-argc){
v =
getVarConstant(recycleBlk,getArg(q,0));
diff -r 142086e32817 -r f7c9a3659dd6 MonetDB5/src/modules/mal/recycle.mx
--- a/MonetDB5/src/modules/mal/recycle.mx Mon May 31 15:09:31 2010 +0200
+++ b/MonetDB5/src/modules/mal/recycle.mx Mon May 31 15:31:10 2010 +0200
@@ -83,11 +83,15 @@
pattern reset(bid:bat):void
address RECYCLEresetCMD
-comment Reset off all recycled variables;
+comment Reset a recycled bat variable;
-pattern reset(sname:str...):void
+pattern reset(delta:int,sname:str...):void
address RECYCLEresetCMD
-comment Reset off all recycled variables;
+comment Reset off all recycled variables matching the arguments:
+delta:0 only the main bat, 2 including delta bats
+sname: schema name,
+tname: table name (optional)
+cname: column name (optional);
pattern shutdown():void
address RECYCLEshutdownWrap
diff -r 142086e32817 -r f7c9a3659dd6 MonetDB5/src/optimizer/opt_prelude.mx
--- a/MonetDB5/src/optimizer/opt_prelude.mx Mon May 31 15:09:31 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_prelude.mx Mon May 31 15:31:10 2010 +0200
@@ -47,6 +47,7 @@
opt_export str bpmRef;
opt_export str bstreamRef;
opt_export str calcRef;
+opt_export str catalogRef;
opt_export str clear_tableRef;
opt_export str closeRef;
opt_export str compressRef;
@@ -241,6 +242,7 @@
str bpmRef;
str bstreamRef;
str calcRef;
+str catalogRef;
str clear_tableRef;
str closeRef;
str compressRef;
@@ -431,6 +433,7 @@
bpmRef = putName(bpm,3);
bstreamRef = putName(bstream,7);
calcRef = putName(calc,4);
+ catalogRef = putName(catalog,7);
clear_tableRef = putName(clear_table,11);
closeRef = putName(close,5);
compressRef = putName(compress,8);
diff -r 142086e32817 -r f7c9a3659dd6 MonetDB5/src/optimizer/opt_recycler.mx
--- a/MonetDB5/src/optimizer/opt_recycler.mxMon May 31 15:09:31 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_recycler.mxMon May 31 15:31:10 2010 +0200
@@ -109,13 +109,13 @@
static int
OPTrecycleImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
- int i, j, cnt, actions = 0, marks = 0;
+ int i, j, cnt, tp, c, actions = 0, marks = 0, delta = 0;
Lifespan span;
InstrPtr *old, q;
int limit, updstmt = 0;
char *recycled;
short app_sc = -1, in = 0;
-
+ ValRecord cst;
(void) cntxt;
(void) stk;
@@ -176,13 +176,30 @@
continue;
else app_sc = getArg(p,2);
}
+ VALset(cst,TYPE_int,delta);
+ c = defConstant(mb, TYPE_int, cst);
q = newFcnCall(mb,recycle,reset);
+ pushArgument(mb,q,c);
pushArgument(mb,q, getArg(p,2));
pushArgument(mb,q, getArg(p,3));
if (getFunctionId(p) == updateRef)
pushArgument(mb,q, getArg(p,4));
+ actions++;
}
- actions++;
+ }
+ if (getModuleId(p) == sqlRef getFunctionId(p) ==
catalogRef ){
+
MonetDB: Feb2010 - Typo in comment.
Changeset: 3c0584bec999 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c0584bec999
Modified Files:
pathfinder/runtime/pathfinder.mx
Branch: Feb2010
Log Message:
Typo in comment.
diffs (12 lines):
diff -r c562b02b5ae5 -r 3c0584bec999 pathfinder/runtime/pathfinder.mx
--- a/pathfinder/runtime/pathfinder.mx Fri May 21 21:36:40 2010 +0200
+++ b/pathfinder/runtime/pathfinder.mx Fri May 21 14:43:55 2010 +0200
@@ -5703,7 +5703,7 @@
* these persist accross sessions as the generated PROCs refer to them.
* This mostly for leakage monitoring purposes, such that dir(); does
* not show any tmp_X bats. Not doing this would not cause a leak; next
- * session the old values are overwritten (and cleant up in MIL).
+ * session the old values are overwritten (and cleaned up in MIL).
*/
Variable v = monet_cntxt[ctx-stk].var;
while(v strcmp(v-name, v_vid000)) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merged from Feb2010 branch: Typo in comment.
Changeset: dc4bb05489cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc4bb05489cf
Modified Files:
pathfinder/runtime/pathfinder.mx
Branch: Jun2010
Log Message:
Merged from Feb2010 branch: Typo in comment.
diffs (12 lines):
diff -r 0946f34b97b8 -r dc4bb05489cf pathfinder/runtime/pathfinder.mx
--- a/pathfinder/runtime/pathfinder.mx Mon May 31 10:57:51 2010 +0200
+++ b/pathfinder/runtime/pathfinder.mx Mon May 31 15:50:12 2010 +0200
@@ -5703,7 +5703,7 @@
* these persist accross sessions as the generated PROCs refer to them.
* This mostly for leakage monitoring purposes, such that dir(); does
* not show any tmp_X bats. Not doing this would not cause a leak; next
- * session the old values are overwritten (and cleant up in MIL).
+ * session the old values are overwritten (and cleaned up in MIL).
*/
Variable v = monet_cntxt[ctx-stk].var;
while(v strcmp(v-name, v_vid000)) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch: Typo in comment.
Changeset: 8adaed9d8a97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8adaed9d8a97
Modified Files:
pathfinder/runtime/pathfinder.mx
Branch: default
Log Message:
Merged from Jun2010 branch: Typo in comment.
diffs (12 lines):
diff -r f7c9a3659dd6 -r 8adaed9d8a97 pathfinder/runtime/pathfinder.mx
--- a/pathfinder/runtime/pathfinder.mx Mon May 31 15:31:10 2010 +0200
+++ b/pathfinder/runtime/pathfinder.mx Mon May 31 15:50:34 2010 +0200
@@ -5703,7 +5703,7 @@
* these persist accross sessions as the generated PROCs refer to them.
* This mostly for leakage monitoring purposes, such that dir(); does
* not show any tmp_X bats. Not doing this would not cause a leak; next
- * session the old values are overwritten (and cleant up in MIL).
+ * session the old values are overwritten (and cleaned up in MIL).
*/
Variable v = monet_cntxt[ctx-stk].var;
while(v strcmp(v-name, v_vid000)) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Don't flush parent's heap. Remove unnecessar...
Changeset: 80afe14ca780 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80afe14ca780
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:
Don't flush parent's heap. Remove unnecessary call to BBPquickdesc.
diffs (20 lines):
diff -r ffac5d51ac0f -r 80afe14ca780 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 08:21:49 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 10:02:37 2010 +0200
@@ -2051,9 +2051,14 @@
if (swap) {
int destroy = BBP_lrefs(i) == 0 (BBP_status(i) BBPDELETED)
== 0;
- b = BBPquickdesc(i, TRUE);
if (b destroy) {
- BATaccessBegin(b, USE_HEAD | USE_TAIL, MMAP_DONTNEED);
+ int flag = 0;
+ if (hp == 0)
+ flag |= USE_HEAD;
+ if (tp == 0)
+ flag |= USE_TAIL;
+ if (flag)
+ BATaccessBegin(b, flag, MMAP_DONTNEED);
BBPdestroy(b); /* free memory (if loaded) and delete
from disk (if transient but saved) */
} else if (b) {
BATDEBUG {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Fix previous fix: we need to look inside the ...
Changeset: 135c86c30203 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=135c86c30203
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:
Fix previous fix: we need to look inside the BAT and not use hp/tp since
they're not set for logical decref.
diffs (15 lines):
diff -r fffaf17cfe20 -r 135c86c30203 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 12:34:02 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxTue Jun 01 13:24:26 2010 +0200
@@ -2053,9 +2053,9 @@
if (b destroy) {
int flag = 0;
- if (hp == 0)
+ if (b-H-heap.parentid == 0)
flag |= USE_HEAD;
- if (tp == 0)
+ if (b-T-heap.parentid == 0)
flag |= USE_TAIL;
if (flag)
BATaccessBegin(b, flag, MMAP_DONTNEED);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Prevent buffer underflow and close string. A...
Changeset: ec76161adec3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec76161adec3
Modified Files:
buildtools/Mx/disclaimer.c
Branch: default
Log Message:
Prevent buffer underflow and close string. Also recognize alternative record
separator on Windows.
diffs (19 lines):
diff -r 135c86c30203 -r ec76161adec3 buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.cTue Jun 01 13:24:26 2010 +0200
+++ b/buildtools/Mx/disclaimer.cTue Jun 01 14:23:49 2010 +0200
@@ -47,8 +47,14 @@
buf[0] = '\0';
strncat(buf, inputdir, 8096 - 1);
len = strlen(buf);
- if (len 8095 buf[len - 1] != DIR_SEP)
+ if (len 0 len 8095 buf[len - 1] != DIR_SEP
+#ifdef WIN32
+buf[len - 1] != '/'
+#endif
+ ) {
buf[len++] = DIR_SEP;
+ buf[len] = 0;
+ }
/* search backwards, such that we can find the license.txt
* file in the root of each module */
strncat(buf, filename, 8095 - len);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Prevent buffer underflow and close string. A...
Changeset: d3570bb29148 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3570bb29148 Modified Files: Branch: default Log Message: Prevent buffer underflow and close string. Also recognize alternative record separator on Windows. (transplanted from ec76161adec379b6b26c79f91279396cd9db2a53) (transplanted from 6780f36b38554f9df3c9a1585bb6c9eb87559b51) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Feb2010 - Fix reference in array module.
Changeset: dcf50312dbc0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dcf50312dbc0 Modified Files: MonetDB5/src/modules/kernel/array.mx Branch: Feb2010 Log Message: Fix reference in array module. diffs (12 lines): diff -r 17aafcd73449 -r dcf50312dbc0 MonetDB5/src/modules/kernel/array.mx --- a/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 08:19:18 2010 +0200 +++ b/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 16:36:30 2010 +0200 @@ -46,7 +46,7 @@ comment Fills an index BAT, (grpcount,grpsize,clustersize,offset); command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] -address arraygridb...@1 +address arraygridbatshi...@1 comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) and shift all elemenets with a factor s; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merge from Feb2010 branch: Fix reference in a...
Changeset: 528327db2c29 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=528327db2c29 Modified Files: Branch: Jun2010 Log Message: Merge from Feb2010 branch: Fix reference in array module. diffs (12 lines): diff -r 6780f36b3855 -r 528327db2c29 MonetDB5/src/modules/kernel/array.mx --- a/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 14:23:49 2010 +0200 +++ b/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 16:37:07 2010 +0200 @@ -46,7 +46,7 @@ comment Fills an index BAT, (grpcount,grpsize,clustersize,offset); command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] -address arraygridb...@1 +address arraygridbatshi...@1 comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) and shift all elemenets with a factor s; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Fix reference in a...
Changeset: 7d70539ee951 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d70539ee951 Modified Files: Branch: default Log Message: Merge from Jun2010 branch: Fix reference in array module. diffs (12 lines): diff -r d3570bb29148 -r 7d70539ee951 MonetDB5/src/modules/kernel/array.mx --- a/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 14:23:49 2010 +0200 +++ b/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 16:37:36 2010 +0200 @@ -46,7 +46,7 @@ comment Fills an index BAT, (grpcount,grpsize,clustersize,offset); command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] -address arraygridb...@1 +address arraygridbatshi...@1 comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) and shift all elemenets with a factor s; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Feb2010 - Ignore backup files.
Changeset: 268d2bc71235 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=268d2bc71235 Modified Files: .hgignore Branch: Feb2010 Log Message: Ignore backup files. diffs (11 lines): diff -r dcf50312dbc0 -r 268d2bc71235 .hgignore --- a/.hgignore Tue Jun 01 16:36:30 2010 +0200 +++ b/.hgignore Wed Jun 02 12:50:37 2010 +0200 @@ -1,6 +1,7 @@ /\# /\.\# /@ +~$ MANIFEST$ Makefile\.in$ MonetDB4/NT/MonetDB\.pc$ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merge from Feb2010 branch: Ignore backup files.
Changeset: c203be41b694 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c203be41b694 Modified Files: .hgignore Branch: Jun2010 Log Message: Merge from Feb2010 branch: Ignore backup files. diffs (11 lines): diff -r 528327db2c29 -r c203be41b694 .hgignore --- a/.hgignore Tue Jun 01 16:37:07 2010 +0200 +++ b/.hgignore Wed Jun 02 12:51:30 2010 +0200 @@ -1,6 +1,7 @@ /\# /\.\# /@ +~$ MANIFEST$ Makefile\.in$ MonetDB4/NT/MonetDB\.pc$ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Ignore backup files.
Changeset: f0c052d55106 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0c052d55106 Modified Files: .hgignore Branch: default Log Message: Merge from Jun2010 branch: Ignore backup files. diffs (11 lines): diff -r 42775467d209 -r f0c052d55106 .hgignore --- a/.hgignore Wed Jun 02 11:52:46 2010 +0200 +++ b/.hgignore Wed Jun 02 12:52:11 2010 +0200 @@ -1,6 +1,7 @@ /\# /\.\# /@ +~$ MANIFEST$ Makefile\.in$ MonetDB4/NT/MonetDB\.pc$ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Ignore python/build directory.
Changeset: 9960db314a23 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9960db314a23 Modified Files: .hgignore Branch: default Log Message: Ignore python/build directory. diffs (11 lines): diff -r f0c052d55106 -r 9960db314a23 .hgignore --- a/.hgignore Wed Jun 02 12:52:11 2010 +0200 +++ b/.hgignore Wed Jun 02 12:42:09 2010 +0200 @@ -48,6 +48,7 @@ ^pathfinder/NT/modules/ ^pathfinder/NT/runtime/ ^pathfinder/conf/compile$ +^python/build/ ^sql/NT/MonetDB-SQL\.pc$ aclocal\.m4$ acout\.in$ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Feb2010 - Ported Mdebootstrap to Mercurial.
Changeset: 4f256fddbcb8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f256fddbcb8 Modified Files: buildtools/conf/Mdebootstrap Branch: Feb2010 Log Message: Ported Mdebootstrap to Mercurial. diffs (31 lines): diff -r 268d2bc71235 -r 4f256fddbcb8 buildtools/conf/Mdebootstrap --- a/buildtools/conf/Mdebootstrap Wed Jun 02 12:50:37 2010 +0200 +++ b/buildtools/conf/Mdebootstrap Wed Jun 02 16:33:27 2010 +0200 @@ -52,7 +52,7 @@ if [ x$x = 'xy' ]; then ( /bin/rm -f $R $*echo $n files deleted. ) || echo rm failed. else - echo rm canceled, no files/directories deleted. + echo rm cancelled, no files/directories deleted. fi fi } @@ -79,8 +79,16 @@ RM -rf autom4*.cache `find .[^.]* [^_]* -name Makefile.\* | egrep -v '(\.(|ag|standalone|rules|bsd|svr4|sun4|PL|inc|svn-base)|burg/Makefile.orig)$' ; find .[^.]* [^_]* -name \*.class -o -name \*.orig -o -name \*.rej -o -name .cache -o -name .incs.\* -o -name \*.pyc -o -name \*~ -o -name .\*~ -o -name .#\* -o -name \*.bak | grep -v 'burg/Makefile.orig$'` ./install.lst ./doc.lst ./acout.in ./configure.in ./aclocal.m4 ./configure ./stamp-h.in ./conf/depcomp ./conf/mkinstalldirs ./conf/stamp-h.in ./conf/config.h.in ./conf/install-sh ./conf/config.guess ./conf/config.sub ./conf/ltconfig ./conf/ltmain.sh ./conf/missing ./conf/compile ./acconfig.h ./*_config.h.in fi -echo ' +if [ -d CVS ]; then +echo ' It might be a good idea to run cvs -q diff --brief, now, -to check whether required files have been removed accidently. +to check whether required files have been removed accidentally. If so, these files can be restored by cvs update file. ' +else +echo ' +It might be a good idea to run hg status -d, now, +to check whether required files have been removed accidentally. +If so, these files can be restored by hg revert file. +' +fi ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merged from Feb2010 branch: Ported Mdebootstr...
Changeset: e0cf6598decb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0cf6598decb Modified Files: Branch: Jun2010 Log Message: Merged from Feb2010 branch: Ported Mdebootstrap to Mercurial. diffs (31 lines): diff -r c203be41b694 -r e0cf6598decb buildtools/conf/Mdebootstrap --- a/buildtools/conf/Mdebootstrap Wed Jun 02 12:51:30 2010 +0200 +++ b/buildtools/conf/Mdebootstrap Wed Jun 02 16:34:02 2010 +0200 @@ -52,7 +52,7 @@ if [ x$x = 'xy' ]; then ( /bin/rm -f $R $*echo $n files deleted. ) || echo rm failed. else - echo rm canceled, no files/directories deleted. + echo rm cancelled, no files/directories deleted. fi fi } @@ -79,8 +79,16 @@ RM -rf autom4*.cache `find .[^.]* [^_]* -name Makefile.\* | egrep -v '(\.(|ag|standalone|rules|bsd|svr4|sun4|PL|inc|svn-base)|burg/Makefile.orig)$' ; find .[^.]* [^_]* -name \*.class -o -name \*.orig -o -name \*.rej -o -name .cache -o -name .incs.\* -o -name \*.pyc -o -name \*~ -o -name .\*~ -o -name .#\* -o -name \*.bak | grep -v 'burg/Makefile.orig$'` ./install.lst ./doc.lst ./acout.in ./configure.in ./aclocal.m4 ./configure ./stamp-h.in ./conf/depcomp ./conf/mkinstalldirs ./conf/stamp-h.in ./conf/config.h.in ./conf/install-sh ./conf/config.guess ./conf/config.sub ./conf/ltconfig ./conf/ltmain.sh ./conf/missing ./conf/compile ./acconfig.h ./*_config.h.in fi -echo ' +if [ -d CVS ]; then +echo ' It might be a good idea to run cvs -q diff --brief, now, -to check whether required files have been removed accidently. +to check whether required files have been removed accidentally. If so, these files can be restored by cvs update file. ' +else +echo ' +It might be a good idea to run hg status -d, now, +to check whether required files have been removed accidentally. +If so, these files can be restored by hg revert file. +' +fi ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch: Ported Mdebootstr...
Changeset: 30f35cac46cf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=30f35cac46cf Modified Files: Branch: default Log Message: Merged from Jun2010 branch: Ported Mdebootstrap to Mercurial. diffs (31 lines): diff -r 9960db314a23 -r 30f35cac46cf buildtools/conf/Mdebootstrap --- a/buildtools/conf/Mdebootstrap Wed Jun 02 12:42:09 2010 +0200 +++ b/buildtools/conf/Mdebootstrap Wed Jun 02 16:34:29 2010 +0200 @@ -52,7 +52,7 @@ if [ x$x = 'xy' ]; then ( /bin/rm -f $R $*echo $n files deleted. ) || echo rm failed. else - echo rm canceled, no files/directories deleted. + echo rm cancelled, no files/directories deleted. fi fi } @@ -79,8 +79,16 @@ RM -rf autom4*.cache `find .[^.]* [^_]* -name Makefile.\* | egrep -v '(\.(|ag|standalone|rules|bsd|svr4|sun4|PL|inc|svn-base)|burg/Makefile.orig)$' ; find .[^.]* [^_]* -name \*.class -o -name \*.orig -o -name \*.rej -o -name .cache -o -name .incs.\* -o -name \*.pyc -o -name \*~ -o -name .\*~ -o -name .#\* -o -name \*.bak | grep -v 'burg/Makefile.orig$'` ./install.lst ./doc.lst ./acout.in ./configure.in ./aclocal.m4 ./configure ./stamp-h.in ./conf/depcomp ./conf/mkinstalldirs ./conf/stamp-h.in ./conf/config.h.in ./conf/install-sh ./conf/config.guess ./conf/config.sub ./conf/ltconfig ./conf/ltmain.sh ./conf/missing ./conf/compile ./acconfig.h ./*_config.h.in fi -echo ' +if [ -d CVS ]; then +echo ' It might be a good idea to run cvs -q diff --brief, now, -to check whether required files have been removed accidently. +to check whether required files have been removed accidentally. If so, these files can be restored by cvs update file. ' +else +echo ' +It might be a good idea to run hg status -d, now, +to check whether required files have been removed accidentally. +If so, these files can be restored by hg revert file. +' +fi ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Cleanup: replace all occurrences of hheap and...
Changeset: ba323345dd9e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba323345dd9e
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_bat.mx
MonetDB/src/gdk/gdk_batop.mx
MonetDB/src/gdk/gdk_bbp.mx
MonetDB/src/gdk/gdk_delta.mx
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_scanselect.mx
MonetDB/src/gdk/gdk_storage.mx
MonetDB4/src/modules/contrib/malalgebra.mx
MonetDB4/src/modules/plain/aggr.mx
MonetDB4/src/modules/plain/aggrX3_be_minmax.mx
MonetDB4/src/modules/plain/aggrX3_bge_minmax.mx
MonetDB4/src/modules/plain/algebra.mx
MonetDB4/src/modules/plain/bat.mx
MonetDB4/src/modules/plain/decimal.mx
MonetDB4/src/modules/plain/enum.mx
MonetDB4/src/modules/plain/radix.mx
MonetDB4/src/modules/plain/sys.mx
MonetDB4/src/modules/plain/tcpip.mx
MonetDB4/src/modules/plain/xtables.mx
MonetDB4/src/monet/monet_multiplex.mx
MonetDB5/src/mal/mal_profiler.mx
MonetDB5/src/modules/kernel/aggr_be_minmax.mx
MonetDB5/src/modules/kernel/aggr_bge_minmax.mx
MonetDB5/src/modules/kernel/algebra.mx
MonetDB5/src/modules/kernel/algebra2.mx
MonetDB5/src/modules/kernel/bat5.mx
MonetDB5/src/modules/kernel/group.mx
MonetDB5/src/modules/mal/crackers/crackers_joins.mx
MonetDB5/src/modules/mal/crackers/crackers_sortmerge.mx
MonetDB5/src/modules/mal/radix.mx
MonetDB5/src/modules/mal/urlbox.mx
pathfinder/runtime/shredder.mx
pathfinder/runtime/xrpc_common.mx
Branch: Jun2010
Log Message:
Cleanup: replace all occurrences of hheap and theap with H-vheap and T-vheap.
diffs (truncated from 1624 to 300 lines):
diff -r 2620ee703b85 -r ba323345dd9e MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxSun Jun 06 21:32:06 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxMon Jun 07 09:42:27 2010 +0200
@@ -1012,8 +1012,6 @@
#define tsortedT-sorted
#define hdense H-dense
#define tdense T-dense
-#define hheap H-vheap
-#define theap T-vheap
#define hident H-id
#define tident T-id
#define halign H-align
@@ -3209,7 +3207,7 @@
If so, we can just compare integer index numbers instead of strings:
@h
#define HASHloop_fstr(bi, h, hb, idx, v) \
- for (hb = h-hash[strHash(v)h-mask], idx =
strLocate((bi.b)-hheap,v); \
+ for (hb = h-hash[strHash(v)h-mask], idx =
strLocate((bi.b)-H-vheap,v); \
hb != BUN_NONE; hb = h-link[hb]) \
if (VarHeapValRaw((bi).b-H-heap.base, hb, (bi).b-H-width)
== idx)
@
diff -r 2620ee703b85 -r ba323345dd9e MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxSun Jun 06 21:32:06 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Jun 07 09:42:27 2010 +0200
@@ -1959,7 +1959,7 @@
}
@= dohash
-ATOMstorage(@1-@2type) != TYPE_chr (ATOMstorage(@1-@2type) !=
TYPE_str || !GDK_ELIMDOUBLES(@1-@2heap))
+ATOMstorage(@1-@2-type) != TYPE_chr (ATOMstorage(@1-@2-type) !=
TYPE_str || !GDK_ELIMDOUBLES(@1-@2-vheap))
@c
BUN
BUNlocate(BAT *b, ptr x, ptr y)
@@ -2034,16 +2034,16 @@
/* regrettably MonetDB support only single-column hashes
* strategy: create a hash on both columns, and select the
column with the best distribution
*/
- if ((b-T-hash b-H-hash == NULL) || !(@:dohash(b,h)@))
+ if ((b-T-hash b-H-hash == NULL) || !(@:dohash(b,H)@))
@:swap()@
if (b-H-hash == NULL (v = VIEWcreate_(b, b, TRUE)) !=
NULL) {
/* As we are going to remove the worst hash table
later, we must do everything
* in a view, as it is not permitted to remove a hash
table from a read-only
* operation (like BUNlocate). Other threads might then
crash.
*/
- if (@:dohash(v,h)@)
+ if (@:dohash(v,H)@)
(void) BATprepareHash(v);
- if (@:dohash(v,t)@)
+ if (@:dohash(v,T)@)
(void) BATprepareHash(BATmirror(v));
if (v-H-hash v-T-hash) { /* we can choose
between two hash tables */
BUN hcnt = 0, tcnt = 0;
diff -r 2620ee703b85 -r ba323345dd9e MonetDB/src/gdk/gdk_batop.mx
--- a/MonetDB/src/gdk/gdk_batop.mx Sun Jun 06 21:32:06 2010 +0200
+++ b/MonetDB/src/gdk/gdk_batop.mx Mon Jun 07 09:42:27 2010 +0200
@@ -906,7 +906,7 @@
q++;
}
@= stringselect
- if (strElimDoubles(b-hheap)) {
+ if (strElimDoubles(b-H-vheap)) {
BUN p;
size_t j;
@@ -1840,7
MonetDB: default - Merged from Jun2010 branch.
Changeset: 4dd1701e7f19 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4dd1701e7f19
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_batop.mx
MonetDB/src/gdk/gdk_bbp.mx
MonetDB/src/gdk/gdk_logger.mx
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_storage.mx
MonetDB5/src/modules/kernel/bat5.mx
pathfinder/runtime/pathfinder.mx
sql/src/include/sql_catalog.h
sql/src/server/sql_mvc.mx
sql/src/storage/sql_storage.h
sql/src/storage/store.mx
Branch: default
Log Message:
Merged from Jun2010 branch.
diffs (truncated from 2095 to 300 lines):
diff -r 697999a64eaf -r 4dd1701e7f19 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxSat Jun 05 16:56:57 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxMon Jun 07 10:10:45 2010 +0200
@@ -1012,8 +1012,6 @@
#define tsortedT-sorted
#define hdense H-dense
#define tdense T-dense
-#define hheap H-vheap
-#define theap T-vheap
#define hident H-id
#define tident T-id
#define halign H-align
@@ -3209,7 +3207,7 @@
If so, we can just compare integer index numbers instead of strings:
@h
#define HASHloop_fstr(bi, h, hb, idx, v) \
- for (hb = h-hash[strHash(v)h-mask], idx =
strLocate((bi.b)-hheap,v); \
+ for (hb = h-hash[strHash(v)h-mask], idx =
strLocate((bi.b)-H-vheap,v); \
hb != BUN_NONE; hb = h-link[hb]) \
if (VarHeapValRaw((bi).b-H-heap.base, hb, (bi).b-H-width)
== idx)
@
diff -r 697999a64eaf -r 4dd1701e7f19 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxSat Jun 05 16:56:57 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Jun 07 10:10:45 2010 +0200
@@ -1959,7 +1959,7 @@
}
@= dohash
-ATOMstorage(@1-@2type) != TYPE_chr (ATOMstorage(@1-@2type) !=
TYPE_str || !GDK_ELIMDOUBLES(@1-@2heap))
+ATOMstorage(@1-@2-type) != TYPE_chr (ATOMstorage(@1-@2-type) !=
TYPE_str || !GDK_ELIMDOUBLES(@1-@2-vheap))
@c
BUN
BUNlocate(BAT *b, ptr x, ptr y)
@@ -2034,16 +2034,16 @@
/* regrettably MonetDB support only single-column hashes
* strategy: create a hash on both columns, and select the
column with the best distribution
*/
- if ((b-T-hash b-H-hash == NULL) || !(@:dohash(b,h)@))
+ if ((b-T-hash b-H-hash == NULL) || !(@:dohash(b,H)@))
@:swap()@
if (b-H-hash == NULL (v = VIEWcreate_(b, b, TRUE)) !=
NULL) {
/* As we are going to remove the worst hash table
later, we must do everything
* in a view, as it is not permitted to remove a hash
table from a read-only
* operation (like BUNlocate). Other threads might then
crash.
*/
- if (@:dohash(v,h)@)
+ if (@:dohash(v,H)@)
(void) BATprepareHash(v);
- if (@:dohash(v,t)@)
+ if (@:dohash(v,T)@)
(void) BATprepareHash(BATmirror(v));
if (v-H-hash v-T-hash) { /* we can choose
between two hash tables */
BUN hcnt = 0, tcnt = 0;
diff -r 697999a64eaf -r 4dd1701e7f19 MonetDB/src/gdk/gdk_batop.mx
--- a/MonetDB/src/gdk/gdk_batop.mx Sat Jun 05 16:56:57 2010 +0200
+++ b/MonetDB/src/gdk/gdk_batop.mx Mon Jun 07 10:10:45 2010 +0200
@@ -906,7 +906,7 @@
q++;
}
@= stringselect
- if (strElimDoubles(b-hheap)) {
+ if (strElimDoubles(b-H-vheap)) {
BUN p;
size_t j;
@@ -1840,7 +1840,7 @@
@:chk_order(dbl,@3,@5)@
} else {
/* check sortedness tuple-by-tuple */
- if (b-hheap) {
+ if (b-H-vheap) {
char *base = Hbase(b);
char *prv = base + BUNhvaroff(bi, cur);
@@ -1999,7 +1999,7 @@
b = BATrevert(b);
return b;
}
- g...@7sort@3(Hloc(b,BUNfirst(b)), Tloc(b,BUNfirst(b)),
(b-hheap)?b-H-vheap-base:NULL, BATcount(b), Hsize(b), Tsize(b), b-htype);
+ g...@7sort@3(Hloc(b,BUNfirst(b)), Tloc(b,BUNfirst(b)),
(b-H-vheap)?b-H-vheap-base:NULL, BATcount(b), Hsize(b), Tsize(b),
b-htype);
HASHdestroy(b);
ALIGNdel(b, bator...@3, FALSE);
b-hsorted = (bit) gdk_sor...@2;
@@ -3054,7 +3054,7 @@
BATcheck(b, BAThistogram);
- tricky = (b-ttype == TYPE_str strElimDoubles(b-theap));
+ tricky = (b-ttype == TYPE_str strElimDoubles(b-T-vheap));
if (b-talign == 0) {
b-talign = OIDnew(1);
}
@@ -3069,8 +3069,8 @@
by
MonetDB: default - Tool to compare the results of two different ...
Changeset: 9eb9dec5f7b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9eb9dec5f7b3
Modified Files:
testing/src/cmptests.py
Branch: default
Log Message:
Tool to compare the results of two different Mtest runs.
This tool compares the times.lst files in the two given
directories and reports all tests whose results differ. If the
standard output differs, differences in the error output are not
reported. The tool is meant to find tests whose results differ, not
to list all differences.
Optionally, significant (more than 10%) slow down of succeeding
tests can also be reported. (If tests fail, the speed is useless
and thus not reported.) Note that comparing times is only useful if
the tests were run under comparable circumstances (optimization,
machine load, etc).
diffs (94 lines):
diff -r ff8b1b418aa3 -r 9eb9dec5f7b3 testing/src/cmptests.py
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/testing/src/cmptests.py Thu Jun 10 14:02:07 2010 +0200
@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+
+# Tool to compare the results of two different Mtest runs.
+#
+# This tool compares the times.lst files in the two given
+# directories and reports all tests whose results differ. If the
+# standard output differs, differences in the error output are not
+# reported. The tool is meant to find tests whose results differ, not
+# to list all differences.
+#
+# Optionally, significant (more than 10%) slow down of succeeding
+# tests can also be reported. (If tests fail, the speed is useless
+# and thus not reported.) Note that comparing times is only useful if
+# the tests were run under comparable circumstances (optimization,
+# machine load, etc).
+
+import os
+
+def cmptests(dir1, dir2, timing = True):
+lst1 = os.path.join(dir1, 'times.lst')
+lst2 = os.path.join(dir2, 'times.lst')
+res1 = {}
+for line in open(lst1):
+line = line.strip().split('\t')
+if res1.has_key(line[0]):
+print sys.stderr, '%s: duplicate key %s' % (lst1, line[0])
+sys.exit(1)
+if len(line) != 4:
+continue
+if line[0][-2:] == '/:':
+continue
+res1[line[0]] = tuple(line[1:])
+slowdown = []
+for line in open(lst2):
+line = line.strip().split('\t')
+if len(line) != 4:
+continue
+if line[0][-2:] == '/:':
+continue
+if not res1.has_key(line[0]):
+print 'New test in %s: %s' % (lst2, line[0])
+continue
+tm1, out1, err1 = res1[line[0]]
+tm2, out2, err2 = tuple(line[1:])
+if out1 != out2:
+print '%s output differs: %s %s' % (line[0], out1, out2)
+elif err1 != err2:
+print '%s errout differs: %s %s' % (line[0], err1, err2)
+if timing and out1 == 'F_OK' and out2 == 'F_OK' and err1 == 'F_OK' and
err2 == 'F_OK':
+ftm1 = float(tm1)
+ftm2 = float(tm2)
+if ftm1 ftm2:
+if ftm2 - ftm1 0.1 * ftm1 or ftm2 - ftm1 0.1 * ftm2:
+slowdown.append((line[0], tm1, tm2))
+del res1[line[0]]
+if res1:
+print '\nRemoved tests in %s:' % lst1
+for tst in res1:
+print tst
+if slowdown:
+print '\nSignificant slowdown in tests:'
+for tst, tm1, tm2 in slowdown:
+print '%s %s %s' % (tst, tm1, tm2)
+
+if __name__ == '__main__':
+import getopt, sys
+
+timing = False
+
+def usage(ext):
+print sys.stderr, 'Usage: %s [-t] dir1 dir2' % sys.argv[0]
+print sys.stderr, 'Compare test outputs in dir1 and dir2.'
+print sys.stderr, 'If -t option given, report significant slow
down.'
+sys.exit(ext)
+
+try:
+opts, args = getopt.getopt(sys.argv[1:], 'ht')
+except getopt.GetoptError:
+usage(1)
+
+for o, a in opts:
+if o == '-h':
+usage(0)
+elif o == '-t':
+timing = True
+
+if len(args) != 2:
+usage(1)
+
+cmptests(args[0], args[1], timing)
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Tool to compare the results of two different ...
Changeset: 7cd395014cc8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7cd395014cc8
Modified Files:
testing/src/cmptests.py
Branch: Jun2010
Log Message:
Tool to compare the results of two different Mtest runs.
This tool compares the times.lst files in the two given
directories and reports all tests whose results differ. If the
standard output differs, differences in the error output are not
reported. The tool is meant to find tests whose results differ, not
to list all differences.
Optionally, significant (more than 10%) slow down of succeeding
tests can also be reported. (If tests fail, the speed is useless
and thus not reported.) Note that comparing times is only useful if
the tests were run under comparable circumstances (optimization,
machine load, etc).
diffs (94 lines):
diff -r 9fe5beb976cf -r 7cd395014cc8 testing/src/cmptests.py
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/testing/src/cmptests.py Thu Jun 10 14:02:07 2010 +0200
@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+
+# Tool to compare the results of two different Mtest runs.
+#
+# This tool compares the times.lst files in the two given
+# directories and reports all tests whose results differ. If the
+# standard output differs, differences in the error output are not
+# reported. The tool is meant to find tests whose results differ, not
+# to list all differences.
+#
+# Optionally, significant (more than 10%) slow down of succeeding
+# tests can also be reported. (If tests fail, the speed is useless
+# and thus not reported.) Note that comparing times is only useful if
+# the tests were run under comparable circumstances (optimization,
+# machine load, etc).
+
+import os
+
+def cmptests(dir1, dir2, timing = True):
+lst1 = os.path.join(dir1, 'times.lst')
+lst2 = os.path.join(dir2, 'times.lst')
+res1 = {}
+for line in open(lst1):
+line = line.strip().split('\t')
+if res1.has_key(line[0]):
+print sys.stderr, '%s: duplicate key %s' % (lst1, line[0])
+sys.exit(1)
+if len(line) != 4:
+continue
+if line[0][-2:] == '/:':
+continue
+res1[line[0]] = tuple(line[1:])
+slowdown = []
+for line in open(lst2):
+line = line.strip().split('\t')
+if len(line) != 4:
+continue
+if line[0][-2:] == '/:':
+continue
+if not res1.has_key(line[0]):
+print 'New test in %s: %s' % (lst2, line[0])
+continue
+tm1, out1, err1 = res1[line[0]]
+tm2, out2, err2 = tuple(line[1:])
+if out1 != out2:
+print '%s output differs: %s %s' % (line[0], out1, out2)
+elif err1 != err2:
+print '%s errout differs: %s %s' % (line[0], err1, err2)
+if timing and out1 == 'F_OK' and out2 == 'F_OK' and err1 == 'F_OK' and
err2 == 'F_OK':
+ftm1 = float(tm1)
+ftm2 = float(tm2)
+if ftm1 ftm2:
+if ftm2 - ftm1 0.1 * ftm1 or ftm2 - ftm1 0.1 * ftm2:
+slowdown.append((line[0], tm1, tm2))
+del res1[line[0]]
+if res1:
+print '\nRemoved tests in %s:' % lst1
+for tst in res1:
+print tst
+if slowdown:
+print '\nSignificant slowdown in tests:'
+for tst, tm1, tm2 in slowdown:
+print '%s %s %s' % (tst, tm1, tm2)
+
+if __name__ == '__main__':
+import getopt, sys
+
+timing = False
+
+def usage(ext):
+print sys.stderr, 'Usage: %s [-t] dir1 dir2' % sys.argv[0]
+print sys.stderr, 'Compare test outputs in dir1 and dir2.'
+print sys.stderr, 'If -t option given, report significant slow
down.'
+sys.exit(ext)
+
+try:
+opts, args = getopt.getopt(sys.argv[1:], 'ht')
+except getopt.GetoptError:
+usage(1)
+
+for o, a in opts:
+if o == '-h':
+usage(0)
+elif o == '-t':
+timing = True
+
+if len(args) != 2:
+usage(1)
+
+cmptests(args[0], args[1], timing)
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Updated Windows installers.
Changeset: 938da565a0e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=938da565a0e0
Modified Files:
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: Jun2010
Log Message:
Updated Windows installers.
diffs (truncated from 24078 to 300 lines):
diff -r 75848849b8db -r 938da565a0e0
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Sun Jun 13 16:13:18
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Mon Jun 14 12:39:03
2010 +0200
@@ -15,85 +15,85 @@
{
Entry
{
-MsmKey = 8:_01A7A9C357864DB1BFED452463C8C3B9
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0279D5B52C0449DE8BDE3AC5FDB2E513
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0296252113B54BD2B0AB9177C69B427F
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0372A03E06714D32B097839607541F3F
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0659283729D34AD1812D2DECCAC83522
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_06ABF2C10E414823964A07158E1FEA97
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_09C8A5CF1F47485EA0148BD065CDCAFC
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_09E1B4DF3AEA4588B72FFB835FFD8290
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0AA7B378BE1D4314B1DE9D6B3596B30C
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0AD01EA500C34B0F92A4FC1E4C63F02A
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0BD054122A26435DA32A2D3402C9D0EB
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0C9C3CA8031A455E85C5F9254679DFC6
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0CCAB41DD9E2436E8DF70B80F831F6B5
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0D30AA674C2F4232A4D23F4B21FA06F6
+MsmKey = 8:_000267DF157B46FB8E0C8758839C77D6
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_001F7FA9E020485BA3D88A53D6F82D23
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_0046C4F1D5BB4A78947C071F1BD8CF14
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_02667329E135464EBA107268AECBE8CA
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_02C05049F4FB4357A3B8A3293B49591E
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_03CDCA9DB4134189B5E9A3C46EF9A721
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_045170836A7A460B841A3EC9CF38EDB0
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_0550FF5F3BE14213947B465CF707CE60
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_080DBBC49C9A477490259EEBEB0BFA5B
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_085581AFC2AC4F09A5FE2C62212A2251
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_089231425C2D4338A212A0303631F92C
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_09D592FBFB404544B7BA7B41CCD94F9E
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_0A5F3B58FD3941D3836F06609899376D
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
+MsmKey = 8:_0B50ACBD65134671B473FD8850780322
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
}
@@ -105,7 +105,25 @@
}
Entry
{
-MsmKey = 8:_12793F11E1C64CDB941F38DC957C1743
+
MonetDB: default - Updated Windows installers; added msqldump to...
Changeset: ebf66baf9455 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebf66baf9455
Modified Files:
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
Branch: default
Log Message:
Updated Windows installers; added msqldump to appropriate instllers.
diffs (truncated from 11260 to 300 lines):
diff -r 1412c0ac90ca -r ebf66baf9455
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdprojMon Jun 14
14:37:56 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdprojMon Jun 14
14:50:26 2010 +0200
@@ -15,307 +15,325 @@
{
Entry
{
-MsmKey = 8:_00EF4EC35E9B4756A00A962F64822973
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_039FAB4CF48E4358840E7EFA24B59F6F
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_04CF306845524107B154A47AFD7CC5EF
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_05703B6EA96D4956B3D2F8CAE6B54C49
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_05CE6836E48C4054AA7EFEFCD3B15023
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_083F4914123B46E69F9C86773E2E45EB
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_097017A602F6478EAD45E6300475
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_09B96FE25EF342A39ACDAB33E3279F6A
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0A28BE3CC8144D71A2C5D17A86E77685
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0BD5F303E02F44949ABB25E4602AB112
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0F722F2D5E6C4578AC15FB15FC6876AC
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_0FA9405D3A2D4E6585E76D5C9EC6F538
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_104C7AE42BBA40BAB2FE112BA6DDE349
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_1092BDFB869F4E0E8C9912DB1143263C
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_112D4D4280A3480ABB9928997A9C3F52
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_13C29E1DDC7D42E9A391373611ABAFB0
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_148094990C694AD79B7377FBFE065880
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_14D637FFB6B34EEBBB9EE35E40EFEABC
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_15A9CE2477EA4B23A4B0850E4E7AB4E6
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_15AB78A6CD8B4E3AB0677D5FF8870FA9
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_17CDF4AAEB254A129BE542C499043324
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_18396379089C49E181B3116DE4D3E463
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_1BD50ECE826E461EA03AFE3620F4EA7E
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_1C28B5C9A9964B05B33E823F5656E3EE
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_1C410F0F756E4704BC5B6989ECA49F1A
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
-MsmKey = 8:_1C6518BA71604131896F20592F623842
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-
MonetDB: default - Merge from Jun2010 branch.
Changeset: c82ff214897c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c82ff214897c Modified Files: Branch: default Log Message: Merge from Jun2010 branch. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Add msqldump.bat. Somehow this got mislaid.
Changeset: 4d71ecaba145 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d71ecaba145 Modified Files: clients/NT/msqldump.bat Branch: Jun2010 Log Message: Add msqldump.bat. Somehow this got mislaid. diffs (18 lines): diff -r 637bd5f2a469 -r 4d71ecaba145 clients/NT/msqldump.bat --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/clients/NT/msqldump.bat Tue Jun 15 15:28:20 2010 +0200 @@ -0,0 +1,14 @@ +...@rem figure out the folder name +...@set MONETDB=%~dp0 + +...@rem remove the final backslash from the path +...@set MONETDB=%MONETDB:~0,-1% + +...@rem extend the search path with our EXE and DLL folders +...@rem we depend on pthreadVCE.dll having been copied to the lib folder +...@set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH% + +...@rem start the real client +@%MONETDB%\bin\msqldump.exe %* + +...@if ERRORLEVEL 1 pause ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: 3920853fb751 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3920853fb751 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: b6ced64542c1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6ced64542c1 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (11 lines): diff -r 3920853fb751 -r b6ced64542c1 pathfinder/NT/Makefile --- a/pathfinder/NT/MakefileTue Jun 15 15:31:38 2010 +0200 +++ b/pathfinder/NT/MakefileTue Jun 15 16:19:33 2010 +0200 @@ -44,6 +44,7 @@ if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\pf.bat $(prefix) $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix) $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix) + -if $(bits)==32 if exist C:\Program Files (x86) C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/ $(prefix)\$(INSTALLER)$(IBITS).vdproj -devenv $(prefix)\$(INSTALLER)$(IBITS).sln /build if exist $(prefix)\$(INSTALLER)$(IBITS).msi del /f $(prefix)\$(INSTALLER)$(IBITS).msi if exist $(prefix)\Debug\$(INSTALLER)$(IBITS).msi $(INSTALL) /Y $(prefix)\Debug\$(INSTALLER)$(IBITS).msi $(prefix) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: ca5de789af67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca5de789af67
Modified Files:
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge from Jun2010 branch.
diffs (229 lines):
diff -r 20f7b1dd3807 -r ca5de789af67 clients/NT/mclient.bat
--- a/clients/NT/mclient.batThu Jun 17 13:05:14 2010 +0200
+++ b/clients/NT/mclient.batThu Jun 17 13:16:38 2010 +0200
@@ -1,14 +1,20 @@
-...@rem figure out the folder name
-...@set MONETDB=%~dp0
+...@echo off
+rem figure out the folder name
+set MONETDB=%~dp0
-...@rem remove the final backslash from the path
-...@set MONETDB=%MONETDB:~0,-1%
+rem remove the final backslash from the path
+set MONETDB=%MONETDB:~0,-1%
-...@rem extend the search path with our EXE and DLL folders
-...@rem we depend on pthreadVCE.dll having been copied to the lib folder
-...@set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
+rem extend the search path with our EXE and DLL folders
+rem we depend on pthreadVCE.dll having been copied to the lib folder
+set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
-...@rem start the real client
-@%MONETDB%\bin\mclient.exe %*
+if %1==/STARTED-FROM-MENU (
+shift
+if %DOTMONETDBFILE%== if exist %MONETDB%\etc\.monetdb set
DOTMONETDBFILE=%MONETDB%\etc\.monetdb
+)
-...@if ERRORLEVEL 1 pause
+rem start the real client
+%MONETDB%\bin\mclient.exe %1 %2 %3 %4 %5 %6 %7 %8
+
+if ERRORLEVEL 1 pause
diff -r 20f7b1dd3807 -r ca5de789af67
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 13:16:38 2010 +0200
@@ -4371,7 +4371,7 @@
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
{
Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --user=monetdb --passwd=monetdb
--encoding=cp437
+Arguments = 8:--language=xquery --encoding=cp437
Description = 8:
ShowCmd = 3:1
IconIndex = 3:0
diff -r 20f7b1dd3807 -r ca5de789af67
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:16:38 2010 +0200
@@ -4339,7 +4339,7 @@
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
{
Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --user=monetdb --passwd=monetdb
--encoding=cp437
+Arguments = 8:--language=xquery --encoding=cp437
Description = 8:
ShowCmd = 3:1
IconIndex = 3:0
diff -r 20f7b1dd3807 -r ca5de789af67 sql/NT/Makefile
--- a/sql/NT/Makefile Thu Jun 17 13:05:14 2010 +0200
+++ b/sql/NT/Makefile Thu Jun 17 13:16:38 2010 +0200
@@ -18,7 +18,7 @@
IBITS = 64
!ENDIF
-all: $(SRCDIR)\Makefile.msc all-msc unistd.h inttypes.h RunMserver.bat
RunMtest.bat RunMapprove.bat
+all: $(SRCDIR)\Makefile.msc all-msc unistd.h inttypes.h RunMserver.bat
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) all
check: $(SRCDIR)\Makefile.msc RunMtest.bat
@@ -28,6 +28,7 @@
install: targetdirs all install-m5installer $(INSTALLER_PREREQ)
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) install
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\MSQLserver.bat
$(prefix)
+ $(INSTALL) .monetdb $(sysconfdir)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
-if exist C:\Program Files (x86) if $(bits) == 32
C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/
$(prefix)\$(INSTALLER)$(IBITS).vdproj
@@ -78,6 +79,10 @@
$(ECHO) typedef int int32_t; inttypes.h
$(ECHO) typedef unsigned int uint32_t; inttypes.h
+.monetdb:
+ $(ECHO) user=monetdb .monetdb
+ $(ECHO) password=monetdb .monetdb
+
RunMtest.bat: $(SRCDIR)\RunMtest.bat.in
$(CONFIGURE) $(SRCDIR)\RunMtest.bat.in RunMtest.bat
diff -r 20f7b1dd3807 -r ca5de789af67
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:05:14
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:16:38
2010 +0200
@@ -1269,6 +1269,12 @@
}
Entry
{
+MsmKey = 8:_D301CC5DC1BE412A900D7C90166AC804
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_D5C7D6567FD6463E846405B973A4AD8A
MonetDB: Jun2010 - Fix XQuery client startup.
Changeset: 4969ca46ac20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4969ca46ac20
Modified Files:
clients/NT/Makefile
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/Makefile
Branch: Jun2010
Log Message:
Fix XQuery client startup.
diffs (166 lines):
diff -r 33e5a4b811db -r 4969ca46ac20 clients/NT/Makefile
--- a/clients/NT/Makefile Thu Jun 17 13:06:49 2010 +0200
+++ b/clients/NT/Makefile Thu Jun 17 14:23:48 2010 +0200
@@ -19,7 +19,7 @@
IBITS = 64
!ENDIF
-all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat
RunMtest.bat RunMapprove.bat
+all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) all
check: $(SRCDIR)\Makefile.msc
@@ -30,6 +30,7 @@
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) install
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\mclient.bat
$(prefix)
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\msqldump.bat
$(prefix)
+ $(INSTALL) .monetdb $(sysconfdir)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
-if exist C:\Program Files (x86) if $(bits) == 32
C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/
$(prefix)\$(INSTALLER)$(IBITS).vdproj
@@ -74,6 +75,10 @@
$(ECHO) typedef int int32_t; inttypes.h
$(ECHO) typedef unsigned int uint32_t; inttypes.h
+.monetdb:
+ $(ECHO) user=monetdb .monetdb
+ $(ECHO) password=monetdb .monetdb
+
Runmclient.bat: $(SRCDIR)\Runmclient.bat.in
$(CONFIGURE) $(SRCDIR)\Runmclient.bat.in Runmclient.bat
diff -r 33e5a4b811db -r 4969ca46ac20
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 13:06:49 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 14:23:48 2010 +0200
@@ -813,6 +813,12 @@
}
Entry
{
+MsmKey = 8:_E37FEE23A93548469BB7560D5524BD93
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_E4A29EC2213B4C99B49B7AC34E99F880
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -3654,6 +3660,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E37FEE23A93548469BB7560D5524BD93
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+PackageAs = 3:1
+Register = 3:1
+Exclude = 11:FALSE
+IsDependency = 11:FALSE
+IsolateTo = 8:
+}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E4A29EC2213B4C99B49B7AC34E99F880
{
SourcePath = 8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll
@@ -4371,7 +4397,7 @@
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
{
Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --encoding=cp437
+Arguments = 8:/STARTED-FROM-MENU --language=xquery
--encoding=cp437
Description = 8:
ShowCmd = 3:1
IconIndex = 3:0
diff -r 33e5a4b811db -r 4969ca46ac20
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:06:49 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 14:23:48 2010 +0200
@@ -51,6 +51,12 @@
}
Entry
{
+MsmKey = 8:_0EF9137A18874950B2B979E4A3D14364
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_0F0962C21371457C8ABE0A563FC8A41A
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -1122,6 +1128,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0EF9137A18874950B2B979E4A3D14364
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+Condition = 8:
+Transitive = 11:FALSE
+Vital =
MonetDB: default - Merge from Jun2010 branch.
Changeset: 99d16aff6ce6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99d16aff6ce6
Modified Files:
Branch: default
Log Message:
Merge from Jun2010 branch.
diffs (166 lines):
diff -r 4d32d055c1ea -r 99d16aff6ce6 clients/NT/Makefile
--- a/clients/NT/Makefile Thu Jun 17 13:47:19 2010 +0200
+++ b/clients/NT/Makefile Thu Jun 17 14:39:08 2010 +0200
@@ -19,7 +19,7 @@
IBITS = 64
!ENDIF
-all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat
RunMtest.bat RunMapprove.bat
+all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) all
check: $(SRCDIR)\Makefile.msc
@@ -30,6 +30,7 @@
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) install
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\mclient.bat
$(prefix)
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\msqldump.bat
$(prefix)
+ $(INSTALL) .monetdb $(sysconfdir)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
-if exist C:\Program Files (x86) if $(bits) == 32
C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/
$(prefix)\$(INSTALLER)$(IBITS).vdproj
@@ -74,6 +75,10 @@
$(ECHO) typedef int int32_t; inttypes.h
$(ECHO) typedef unsigned int uint32_t; inttypes.h
+.monetdb:
+ $(ECHO) user=monetdb .monetdb
+ $(ECHO) password=monetdb .monetdb
+
Runmclient.bat: $(SRCDIR)\Runmclient.bat.in
$(CONFIGURE) $(SRCDIR)\Runmclient.bat.in Runmclient.bat
diff -r 4d32d055c1ea -r 99d16aff6ce6
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 14:39:08 2010 +0200
@@ -813,6 +813,12 @@
}
Entry
{
+MsmKey = 8:_E37FEE23A93548469BB7560D5524BD93
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_E4A29EC2213B4C99B49B7AC34E99F880
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -3654,6 +3660,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E37FEE23A93548469BB7560D5524BD93
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+PackageAs = 3:1
+Register = 3:1
+Exclude = 11:FALSE
+IsDependency = 11:FALSE
+IsolateTo = 8:
+}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E4A29EC2213B4C99B49B7AC34E99F880
{
SourcePath = 8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll
@@ -4371,7 +4397,7 @@
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
{
Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --encoding=cp437
+Arguments = 8:/STARTED-FROM-MENU --language=xquery
--encoding=cp437
Description = 8:
ShowCmd = 3:1
IconIndex = 3:0
diff -r 4d32d055c1ea -r 99d16aff6ce6
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 14:39:08 2010 +0200
@@ -51,6 +51,12 @@
}
Entry
{
+MsmKey = 8:_0EF9137A18874950B2B979E4A3D14364
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_0F0962C21371457C8ABE0A563FC8A41A
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -1122,6 +1128,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0EF9137A18874950B2B979E4A3D14364
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+
MonetDB: Jun2010 - Updated debian config files.
Changeset: ad87ef49effa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad87ef49effa Modified Files: geom/debian/libmonetdb5-server-geom0.install sql/debian/monetdb5-sql.install Branch: Jun2010 Log Message: Updated debian config files. diffs (19 lines): diff -r 50b5de4c9d96 -r ad87ef49effa geom/debian/libmonetdb5-server-geom0.install --- a/geom/debian/libmonetdb5-server-geom0.install Thu Jun 17 22:37:37 2010 +0200 +++ b/geom/debian/libmonetdb5-server-geom0.install Fri Jun 18 09:39:08 2010 +0200 @@ -1,2 +1,3 @@ debian/tmp/usr/lib/MonetDB5/geom.mal /usr/lib/MonetDB5 +debian/tmp/usr/lib/MonetDB5/autoload/*.mal /usr/lib/MonetDB5/autoload debian/tmp/usr/lib/MonetDB5/lib/lib_geom.so* /usr/lib/MonetDB5/lib diff -r 50b5de4c9d96 -r ad87ef49effa sql/debian/monetdb5-sql.install --- a/sql/debian/monetdb5-sql.install Thu Jun 17 22:37:37 2010 +0200 +++ b/sql/debian/monetdb5-sql.install Fri Jun 18 09:39:08 2010 +0200 @@ -2,6 +2,7 @@ debian/tmp/usr/bin/merovingian usr/bin debian/tmp/usr/bin/monetdb usr/bin debian/tmp/usr/lib/MonetDB5/*.mal usr/lib/MonetDB5 +debian/tmp/usr/lib/MonetDB5/*.sql usr/lib/MonetDB5 +debian/tmp/usr/lib/MonetDB5/autoload/*.mal usr/lib/MonetDB5/autoload debian/tmp/usr/share/man/man1/merovingian.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/monetdb.1 usr/share/man/man1 -debian/tmp/usr/share/MonetDB/sql/* usr/share/MonetDB/sql ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Create monetdb user with correct group (monet...
Changeset: 9fc3d7700822 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9fc3d7700822 Modified Files: MonetDB4/debian/monetdb4-server.postinst MonetDB5/debian/monetdb5-server.postinst Branch: Jun2010 Log Message: Create monetdb user with correct group (monetdb). diffs (24 lines): diff -r 81b61fff8276 -r 9fc3d7700822 MonetDB4/debian/monetdb4-server.postinst --- a/MonetDB4/debian/monetdb4-server.postinst Mon Jun 21 20:42:27 2010 +0200 +++ b/MonetDB4/debian/monetdb4-server.postinst Tue Jun 22 11:46:59 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb /dev/null; then -adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb +adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB4 chown monetdb:monetdb /var/MonetDB4 diff -r 81b61fff8276 -r 9fc3d7700822 MonetDB5/debian/monetdb5-server.postinst --- a/MonetDB5/debian/monetdb5-server.postinst Mon Jun 21 20:42:27 2010 +0200 +++ b/MonetDB5/debian/monetdb5-server.postinst Tue Jun 22 11:46:59 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb /dev/null; then -adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb +adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB5 chown monetdb:monetdb /var/MonetDB5 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Create monetdb use...
Changeset: dd95b836c486 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd95b836c486 Modified Files: Branch: default Log Message: Merge from Jun2010 branch: Create monetdb user with correct group (monetdb). diffs (24 lines): diff -r 6abda8507eb5 -r dd95b836c486 MonetDB4/debian/monetdb4-server.postinst --- a/MonetDB4/debian/monetdb4-server.postinst Mon Jun 21 23:35:48 2010 +0200 +++ b/MonetDB4/debian/monetdb4-server.postinst Tue Jun 22 11:47:40 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb /dev/null; then -adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb +adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB4 chown monetdb:monetdb /var/MonetDB4 diff -r 6abda8507eb5 -r dd95b836c486 MonetDB5/debian/monetdb5-server.postinst --- a/MonetDB5/debian/monetdb5-server.postinst Mon Jun 21 23:35:48 2010 +0200 +++ b/MonetDB5/debian/monetdb5-server.postinst Tue Jun 22 11:47:40 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb /dev/null; then -adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb +adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB5 chown monetdb:monetdb /var/MonetDB5 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Preparations for building the Jun2010 release.
Changeset: d83c56c4bba7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d83c56c4bba7
Modified Files:
MonetDB/MonetDB.spec
MonetDB/debian/changelog
MonetDB4/MonetDB-server.spec
MonetDB4/debian/changelog
MonetDB5/MonetDB-server.spec
MonetDB5/debian/changelog
clients/MonetDB-client.spec
clients/debian/changelog
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
geom/debian/changelog
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
pathfinder/debian/changelog
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/debian/changelog
testing/MonetDB-testing.spec
testing/debian/changelog
Branch: Jun2010
Log Message:
Preparations for building the Jun2010 release.
Moved contents of ChangeLog.Jun2010 to .spec file and debian/changelog.
diffs (truncated from 470 to 300 lines):
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jun 22 14:39:09 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://downloads.sourceforge.net/monetdb/%{name}-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100618
- Rebuilt.
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB/debian/changelog Tue Jun 22 14:39:09 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb (1.38.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Jun 22 14:39:09 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://downloads.sourceforge.net/monetdb/MonetDB4-server-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB4-server-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
Requires(pre): shadow-utils
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100618
- Rebuilt.
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jun 22 14:39:09 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb4-server (4.38.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Tue Jun 22 14:39:09 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://downloads.sourceforge.net/monetdb/MonetDB5-server-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB5-server-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
%{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}}
@@ -213,6 +213,9 @@
%{_libdir}/*.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100618
- Rebuilt.
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jun
MonetDB: default - Merge from Jun2010 branch: Preparations for b...
Changeset: 24c4d5e6120d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24c4d5e6120d
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge from Jun2010 branch: Preparations for building the Jun2010 release.
diffs (truncated from 470 to 300 lines):
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jun 22 14:54:19 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://downloads.sourceforge.net/monetdb/%{name}-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100618
- Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb (1.38.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Jun 22 14:54:19 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://downloads.sourceforge.net/monetdb/MonetDB4-server-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB4-server-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
Requires(pre): shadow-utils
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100618
- Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb4-server (4.38.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Tue Jun 22 14:54:19 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://downloads.sourceforge.net/monetdb/MonetDB5-server-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB5-server-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
%{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}}
@@ -213,6 +213,9 @@
%{_libdir}/*.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100618
- Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb5-server (5.20.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/clients/MonetDB-client.spec Tue Jun 22 14:54:19 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://downloads.sourceforge.net/monetdb/MonetDB-client
MonetDB: Jun2010 - Merge heads.
Changeset: 1ec5859c4994 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ec5859c4994 Modified Files: Branch: Jun2010 Log Message: Merge heads. diffs (9 lines): diff -r 90f0410e1611 -r 1ec5859c4994 .hgtags --- a/.hgtags Tue Jun 22 18:45:20 2010 +0200 +++ b/.hgtags Wed Jun 23 09:34:35 2010 +0200 @@ -406,3 +406,5 @@ e821c6a9dd33b30ccbb51376b6db7355cf12684e Jun2006_root d3db8bef1dd54bcfb335599338a374b4ca8975fa Jun2010_root 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: 6471ec4d124f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6471ec4d124f Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (9 lines): diff -r fd214ada7e0e -r 6471ec4d124f .hgtags --- a/.hgtags Tue Jun 22 18:48:02 2010 +0200 +++ b/.hgtags Wed Jun 23 09:36:20 2010 +0200 @@ -406,3 +406,5 @@ e821c6a9dd33b30ccbb51376b6db7355cf12684e Jun2006_root d3db8bef1dd54bcfb335599338a374b4ca8975fa Jun2010_root 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - No RDF on Windows.
Changeset: c75ec0752957 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c75ec0752957 Modified Files: MonetDB5/src/mal/Tests/tst450.stable.out.Windows Branch: Jun2010 Log Message: No RDF on Windows. diffs (truncated from 543 to 300 lines): diff -r 1ec5859c4994 -r c75ec0752957 MonetDB5/src/mal/Tests/tst450.stable.out.Windows --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/MonetDB5/src/mal/Tests/tst450.stable.out.Windows Wed Jun 23 10:40:20 2010 +0200 @@ -0,0 +1,539 @@ +stdout of test 'tst450` in directory 'src/mal` itself: + + +# 22:19:31 +# 22:19:31 Mtimeout -timeout 60 Mserver --config=/ufs/mk/monet5/src/mal/Tests/All.conf --debug=10 --set monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB --set gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm --set sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log --set mapi_port=30312 --set sql_port=6 --set xquery_port=54810 --set monet_prompt= --trace --config=/ufs/mk/monet5/src/mal/Tests/All.conf --dbname=mTests_src_mal tst450.mal /dev/null +# 22:19:31 + +# Monet Database Server V4.99.19 +# Copyright (c) 1993-2005, CWI. All rights reserved. +# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. +# config:/ufs/mk/monet5/src/mal/Tests/All.conf +# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm +# dbname:mTests_src_mal +# Visit http://monetdb.cwi.nl/ for further information. +##testing the inspect module for help information +# +#a:= inspect.getAtomNames(); io.print(a); +#m:= inspect.getModule(); mr:= bat.reverse(m); +#m1:= algebra.kunique(mr); m1r:= bat.reverse(m1); io.print(m1r); +#stmt:= inspect.getDefinition(algebra,select); +#sig:= inspect.getSignature(algebra,select); +# +#n:= manual.help(algebra,insert); io.print(n); +#d:= inspect.getDefinition(inspect,dir); io.print(d); +# +function user.main():void; +#testing the inspect module for help information +a := inspect.getAtomNames(); +io.print(a); +m := inspect.getModule(); +mr := bat.reverse(m); +m1 := algebra.kunique(mr); +z := algebra.project(m1); +zs := algebra.sortHT(z); +io.print(zs); +stmt := inspect.getDefinition(algebra,select); +sig := inspect.getSignature(algebra,select); +n := manual.search(insert); +io.print(n); +end main; +#-# +# view atom # name +# int str # type +#-# +[ 0, void ] +[ 1, bit ] +[ 2, chr ] +[ 3, bte ] +[ 4, sht ] +[ 5, BAT ] +[ 6, int ] +[ 7, oid ] +[ 8, wrd ] +[ 9, ptr ] +[ 10,flt ] +[ 11,dbl ] +[ 12,lng ] +[ 13,str ] +[ 14,lock ] +[ 15,sema ] +[ 16,streams ] +[ 17,bstream ] +[ 18,blob ] +[ 19,sqlblob ] +[ 20,color ] +[ 21,url ] +[ 22,date ] +[ 23,daytime ] +[ 24,timestamp ] +[ 25,timezone ] +[ 26,zrule ] +[ 27,inet ] +[ 28,identifier] +[ 29,pcre ] +[ 30,mapentry ] +#-# +# th # name +# oid str # type +#-# +[ aggr,nil ] +[ alarm, nil ] +[ algebra, nil ] +[ array, nil ] +[ bat, nil ] +[ batcalc, nil ] +[ batcolor,nil ] +[ batmmath,nil ] +[ batmtime,nil ] +[ batstr, nil ] +[ bbp, nil ] +[ blob,nil ] +[ box, nil ] +[ bpm, nil ] +[ bstream, nil ] +[ calc,nil ] +[ clients, nil ] +[ cluster, nil ] +[ color, nil ] +[ const, nil ] +[ constraints, nil] +[ crackers,nil ] +[ date,nil ] +[ daytime, nil ] +[ dictionary, nil ] +[ factories, nil ] +[ group, nil ] +[ identifier, nil ] +[ inet,nil ] +[ inspect, nil ] +[ io, nil ] +[ language,nil ] +[ lock,nil ] +[ mal, nil ] +[ manual, nil ] +[ mapi,nil ] +[ master, nil ] +[ mat, nil ] +[ mdb, nil ] +[ mkey,nil ] +[ mmath, nil ] +[ mtime, nil ] +[ octopus, nil ] +[ optimizer, nil ] +[ pcre,nil ] +[ pqueue, nil ] +[ profiler,nil ] +[ recycle, nil ] +[ remote, nil ] +[ sabaoth, nil ] +[ scheduler, nil ] +[ sema,nil ] +[ slave, nil ] +[ sql, nil ] +[ sqlblob, nil ] +[ statistics, nil ] +[ status, nil ] +[ str, nil
MonetDB: Jun2010 - Disabled test that is not going to be fixed.
Changeset: 8ee1fdff6bb2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ee1fdff6bb2 Modified Files: MonetDB4/tests/BugDay_2005-12-19_4.9.3/Tests/All Branch: Jun2010 Log Message: Disabled test that is not going to be fixed. diffs (12 lines): diff -r c75ec0752957 -r 8ee1fdff6bb2 MonetDB4/tests/BugDay_2005-12-19_4.9.3/Tests/All --- a/MonetDB4/tests/BugDay_2005-12-19_4.9.3/Tests/All Wed Jun 23 10:40:20 2010 +0200 +++ b/MonetDB4/tests/BugDay_2005-12-19_4.9.3/Tests/All Wed Jun 23 10:40:46 2010 +0200 @@ -3,7 +3,7 @@ bat_reverse_named_ls_dir.SF-1216455 void-outerjoin.SF-1216457 stream_assert_quit.SF-1218291 -type_names_are_not_keywords.SF-1227464 +#type_names_are_not_keywords.SF-1227464 assertion_on_bat_cast.SF-1230320 bat_cast_makes_writable.SF-1238930 pump_properties.SF-1267155 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Created autoload file for sql/xml.
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.outWed Jun 23
10:40:46 2010 +0200
+++ b/MonetDB5/src/modules/atoms/Tests/xml100.stable.outWed 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
MonetDB: Jun2010 - Created autoload file for sql/xml, part 2 (ad...
Changeset: 37aafd1e037c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37aafd1e037c Modified Files: MonetDB5/src/modules/mal/30_xml.mal Branch: Jun2010 Log Message: Created autoload file for sql/xml, part 2 (adding the file). diffs (6 lines): diff -r f72fd7e68a06 -r 37aafd1e037c MonetDB5/src/modules/mal/30_xml.mal --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/MonetDB5/src/modules/mal/30_xml.mal Wed Jun 23 11:33:18 2010 +0200 @@ -0,0 +1,2 @@ +include xml; +include batxml; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Added sql/xml autoload file to 64 bit install...
Changeset: 12eac3b61448 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12eac3b61448
Modified Files:
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: Jun2010
Log Message:
Added sql/xml autoload file to 64 bit installers.
diffs (122 lines):
diff -r 37aafd1e037c -r 12eac3b61448
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Wed Jun 23
11:33:18 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Wed Jun 23
11:47:41 2010 +0200
@@ -933,6 +933,12 @@
}
Entry
{
+MsmKey = 8:_B35EAC82AF2741E4A18B08FA86CC4BE7
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_B4E2E55E0E234699BDCC98C58D5D0998
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -4381,6 +4387,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B35EAC82AF2741E4A18B08FA86CC4BE7
+{
+SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
+TargetName = 8:30_xml.mal
+Tag = 8:
+Folder = 8:_C309E2E9F9604E2CBB8CA7584F049CD3
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+PackageAs = 3:1
+Register = 3:1
+Exclude = 11:FALSE
+IsDependency = 11:FALSE
+IsolateTo = 8:
+}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4E2E55E0E234699BDCC98C58D5D0998
{
SourcePath = 8:Lib\\MonetDB5\\opt_mergetable.mal
@@ -5620,6 +5646,17 @@
Property = 8:_762E204C3D494003AADB714FE800A1AF
Folders
{
+
{9EF0B969-E518-4E46-987F-47570745A589}:_C309E2E9F9604E2CBB8CA7584F049CD3
+{
+Name = 8:autoload
+AlwaysCreate = 11:FALSE
+Condition = 8:
+Transitive = 11:FALSE
+Property =
8:_4D4BCF1E8B4543CD854C9EE4E6C6318E
+Folders
+{
+}
+}
}
}
}
diff -r 37aafd1e037c -r 12eac3b61448
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Wed Jun 23
11:33:18 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Wed Jun 23
11:47:41 2010 +0200
@@ -1203,6 +1203,12 @@
}
Entry
{
+MsmKey = 8:_CAEBC4C88AD24AD5AE555E49284941B5
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_CB3C9EC9B4FF49E9815AC97E05BB8A46
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -5595,6 +5601,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CAEBC4C88AD24AD5AE555E49284941B5
+{
+SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
+TargetName = 8:30_xml.mal
+Tag = 8:
+Folder = 8:_CBC2B495BACD4CA8A55E11008F8B563D
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+PackageAs = 3:1
+Register = 3:1
+Exclude = 11:FALSE
+IsDependency = 11:FALSE
+IsolateTo = 8:
+}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB3C9EC9B4FF49E9815AC97E05BB8A46
{
SourcePath = 8:lib\\libmutils.dll
@@ -7023,14 +7049,14 @@
{
Name = 8:Microsoft Visual Studio
ProductName = 8:MonetDB5
-ProductCode = 8:{D5D0F43F-8638-4716-975B-ED4D6CEAC0FD}
-PackageCode = 8:{76AC7B72-8281-4588-8E1B-D6DEE18AB9E2}
+ProductCode = 8:{597F6819-3742-481D-925E-41E985B53128}
+PackageCode = 8:{8063A55A-782B-4A9F-A6EB-06A3141FA713}
UpgradeCode = 8:{839D3C90-B578-41E2-A004-431440F9E899}
RestartWWWService = 11:FALSE
RemovePreviousVersions = 11:TRUE
DetectNewerInstalledVersion = 11:TRUE
MonetDB: Jun2010 - Added missing conditional.
Changeset: b291de0e71eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b291de0e71eb
Modified Files:
MonetDB5/src/modules/mal/Makefile.ag
Branch: Jun2010
Log Message:
Added missing conditional.
diffs (11 lines):
diff -r 12eac3b61448 -r b291de0e71eb MonetDB5/src/modules/mal/Makefile.ag
--- a/MonetDB5/src/modules/mal/Makefile.ag Wed Jun 23 11:47:41 2010 +0200
+++ b/MonetDB5/src/modules/mal/Makefile.ag Wed Jun 23 11:48:10 2010 +0200
@@ -76,6 +76,7 @@
}
headers_autoload = {
+ COND = HAVE_LIBXML2
HEADERS = mal
DIR = libdir/MonetDB5/autoload
SOURCES = 30_xml.mal
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Added sql xml autoload file to installers.
Changeset: b2d50c1b34a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2d50c1b34a9
Modified Files:
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
Branch: Jun2010
Log Message:
Added sql xml autoload file to installers.
diffs (122 lines):
diff -r b291de0e71eb -r b2d50c1b34a9
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdprojWed Jun 23
11:48:10 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdprojWed Jun 23
12:30:51 2010 +0200
@@ -189,6 +189,12 @@
}
Entry
{
+MsmKey = 8:_1E640F4673BF4D94A50D359AD86002AD
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_1F665F81F90C4178A64A0D45D1468031
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -1935,6 +1941,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E640F4673BF4D94A50D359AD86002AD
+{
+SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
+TargetName = 8:30_xml.mal
+Tag = 8:
+Folder = 8:_853248B6DA0549A48FAF7F562E7D1B8F
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+PackageAs = 3:1
+Register = 3:1
+Exclude = 11:FALSE
+IsDependency = 11:FALSE
+IsolateTo = 8:
+}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F665F81F90C4178A64A0D45D1468031
{
SourcePath = 8:Lib\\MonetDB5\\lib_mtime.dll
@@ -5614,6 +5640,17 @@
Property = 8:_762E204C3D494003AADB714FE800A1AF
Folders
{
+
{9EF0B969-E518-4E46-987F-47570745A589}:_853248B6DA0549A48FAF7F562E7D1B8F
+{
+Name = 8:autoload
+AlwaysCreate = 11:FALSE
+Condition = 8:
+Transitive = 11:FALSE
+Property =
8:_464AA55C3A3E47B5A5EE2363DC72DC9C
+Folders
+{
+}
+}
}
}
}
diff -r b291de0e71eb -r b2d50c1b34a9
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Wed Jun 23 11:48:10
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Wed Jun 23 12:30:51
2010 +0200
@@ -1551,6 +1551,12 @@
}
Entry
{
+MsmKey = 8:_F742FD1CA61447B399F90E61D4157DC4
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_FA9DDB4A77F54CF5A7E20EC1D6386115
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -6755,6 +6761,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F742FD1CA61447B399F90E61D4157DC4
+{
+SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
+TargetName = 8:30_xml.mal
+Tag = 8:
+Folder = 8:_A4A821D237B943CFACE8D54F3F3971E3
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+PackageAs = 3:1
+Register = 3:1
+Exclude = 11:FALSE
+IsDependency = 11:FALSE
+IsolateTo = 8:
+}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FA9DDB4A77F54CF5A7E20EC1D6386115
{
SourcePath = 8:Lib\\MonetDB5\\opt_reduce.mal
@@ -7023,14 +7049,14 @@
{
Name = 8:Microsoft Visual Studio
ProductName = 8:MonetDB5
-ProductCode = 8:{3CD21B23-9CD5-44F8-AAA8-D96F338C10A6}
-PackageCode = 8:{D7BC3B0C-3C14-4903-B0BD-2D4D29B9BDC4}
+ProductCode = 8:{5106602D-7310-49E9-9AFF-6E1311A5D5FA}
+PackageCode = 8:{3BC0446B-1AEA-424B-9255-A92C2DB28EFA}
UpgradeCode = 8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}
RestartWWWService = 11:FALSE
RemovePreviousVersions = 11:TRUE
DetectNewerInstalledVersion = 11:TRUE
InstallAllUsers = 11:TRUE
-
MonetDB: Jun2010 - Changelog message for XML autoloading.
Changeset: a0165c7540b0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0165c7540b0 Modified Files: MonetDB5/ChangeLog.Jun2010 Branch: Jun2010 Log Message: Changelog message for XML autoloading. diffs (10 lines): diff -r b2d50c1b34a9 -r a0165c7540b0 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010Wed Jun 23 12:30:51 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010Wed Jun 23 13:35:11 2010 +0200 @@ -1,3 +1,6 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org +- When libxml2 is available, the XML module is automatically loaded. + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: 0797a45f23a5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0797a45f23a5 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (10 lines): diff -r b2073a1b0b44 -r 0797a45f23a5 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010Wed Jun 23 12:33:52 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010Wed Jun 23 13:35:38 2010 +0200 @@ -1,3 +1,6 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org +- When libxml2 is available, the XML module is automatically loaded. + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Don't exit with an error if a legitimate conf...
Changeset: 623d812fd343 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=623d812fd343 Modified Files: sql/debian/monetdb5-sql.init.d Branch: Jun2010 Log Message: Don't exit with an error if a legitimate configuration is used. diffs (12 lines): diff -r a0165c7540b0 -r 623d812fd343 sql/debian/monetdb5-sql.init.d --- a/sql/debian/monetdb5-sql.init.dWed Jun 23 13:35:11 2010 +0200 +++ b/sql/debian/monetdb5-sql.init.dWed Jun 23 14:10:01 2010 +0200 @@ -61,7 +61,7 @@ start) if [ $STARTUP != yes ]; then echo can't start, should be enabled first by change STARTUP to yes in /etc/default/monetdb5-sql -exit 1 +exit 0 fi if running; then ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Extend test format...
Changeset: f8988a2c5eb0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8988a2c5eb0
Modified Files:
clients/src/mapiclient/mclient.mx
geom/src/sql/Tests/spatial.stable.out.32bit
Branch: default
Log Message:
Merge from Jun2010 branch: Extend test formatting to geom types.
diffs (truncated from 548 to 300 lines):
diff -r 11d6591fc870 -r f8988a2c5eb0 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jun 23 14:10:24 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Jun 23 16:41:33 2010 +0200
@@ -855,6 +855,35 @@
case '':
stream_write(toConsole, \\\,
1, 2);
break;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (strcmp(tp, curve) == 0 ||
+ strcmp(tp, geometry) == 0
||
+ strcmp(tp, linestring) ==
0 ||
+ strcmp(tp, mbr) == 0 ||
+ strcmp(tp,
multilinestring) == 0 ||
+ strcmp(tp, point) == 0 ||
+ strcmp(tp, polygon) == 0
||
+ strcmp(tp, surface) == 0)
{
+ char *e;
+ double d;
+ d = strtod(s, e);
+ if (s != e) {
+
stream_printf(toConsole, %.10g, d);
+ l -= e - s;
+ s = e;
+ continue;
+ }
+ }
+ /* fall through */
default:
if ((unsigned char) *s ' ')
stream_printf(toConsole,
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/basic.stable.out
--- a/geom/src/sql/Tests/basic.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/basic.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -35,35 +35,35 @@
% g # name
% geometry # type
% 0 # length
-[ POINT (10. 10.)]
-[ LINESTRING (10. 10., 20.
20., 30. 40.) ]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.))]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.), (15. 15.,
15. 20., 10.
15., 15. 15.)) ]
+[ POINT (10 10) ]
+[ LINESTRING (10 10, 20 20, 30 40) ]
+[ POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) ]
+[ POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))]
[ NULL ]
% sys.geoms # table_name
% g # name
% geometry # type
% 0 # length
-[ POINT (10. 10.)]
-[ LINESTRING (10. 10., 20.
20., 30. 40.) ]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.))]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.), (15.
MonetDB: Feb2010 - Use native format for .vdproj and .sln file...
Changeset: 733d55e0aa83 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=733d55e0aa83 Modified Files: .hgeol Branch: Feb2010 Log Message: Use native format for .vdproj and .sln files, since using CRLF gives weird results on Windows. diffs (23 lines): diff -r 7722eddf0e6e -r 733d55e0aa83 .hgeol --- a/.hgeolMon Jun 21 17:42:34 2010 +0200 +++ b/.hgeolWed Jun 23 17:08:42 2010 +0200 @@ -7,6 +7,7 @@ # various binary files **.bmp = BIN **.bz2 = BIN +**.chm = BIN **.dll = BIN **.gif = BIN **.gz = BIN @@ -16,11 +17,5 @@ **.png = BIN **.zip = BIN -# Windows specific files -**.chm = BIN -**.rtf = CRLF -**.sln = CRLF -**.vdproj = CRLF - # all the rest is text ** = native ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merge from Feb2010 branch.
Changeset: 61e15d016616 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61e15d016616 Modified Files: Branch: Jun2010 Log Message: Merge from Feb2010 branch. diffs (23 lines): diff -r d1d003602622 -r 61e15d016616 .hgeol --- a/.hgeolWed Jun 23 16:40:54 2010 +0200 +++ b/.hgeolWed Jun 23 17:09:25 2010 +0200 @@ -7,6 +7,7 @@ # various binary files **.bmp = BIN **.bz2 = BIN +**.chm = BIN **.dll = BIN **.gif = BIN **.gz = BIN @@ -16,11 +17,5 @@ **.png = BIN **.zip = BIN -# Windows specific files -**.chm = BIN -**.rtf = CRLF -**.sln = CRLF -**.vdproj = CRLF - # all the rest is text ** = native ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: da87f97d31f8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da87f97d31f8 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (23 lines): diff -r f8988a2c5eb0 -r da87f97d31f8 .hgeol --- a/.hgeolWed Jun 23 16:41:33 2010 +0200 +++ b/.hgeolWed Jun 23 17:09:51 2010 +0200 @@ -7,6 +7,7 @@ # various binary files **.bmp = BIN **.bz2 = BIN +**.chm = BIN **.dll = BIN **.gif = BIN **.gz = BIN @@ -16,11 +17,5 @@ **.png = BIN **.zip = BIN -# Windows specific files -**.chm = BIN -**.rtf = CRLF -**.sln = CRLF -**.vdproj = CRLF - # all the rest is text ** = native ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - xml is already automatically loaded.
Changeset: 346c38f0b41d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=346c38f0b41d
Modified Files:
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
xml is already automatically loaded.
diffs (104 lines):
diff -r 4e4501b3a3fc -r 346c38f0b41d
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Thu Jun 24
09:29:52 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Thu Jun 24
09:40:22 2010 +0200
@@ -933,12 +933,6 @@
}
Entry
{
-MsmKey = 8:_B35EAC82AF2741E4A18B08FA86CC4BE7
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_B4E2E55E0E234699BDCC98C58D5D0998
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -4387,26 +4381,6 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
-
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B35EAC82AF2741E4A18B08FA86CC4BE7
-{
-SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
-TargetName = 8:30_xml.mal
-Tag = 8:
-Folder = 8:_C309E2E9F9604E2CBB8CA7584F049CD3
-Condition = 8:
-Transitive = 11:FALSE
-Vital = 11:TRUE
-ReadOnly = 11:FALSE
-Hidden = 11:FALSE
-System = 11:FALSE
-Permanent = 11:FALSE
-SharedLegacy = 11:FALSE
-PackageAs = 3:1
-Register = 3:1
-Exclude = 11:FALSE
-IsDependency = 11:FALSE
-IsolateTo = 8:
-}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4E2E55E0E234699BDCC98C58D5D0998
{
SourcePath = 8:Lib\\MonetDB5\\opt_mergetable.mal
@@ -5646,17 +5620,6 @@
Property = 8:_762E204C3D494003AADB714FE800A1AF
Folders
{
-
{9EF0B969-E518-4E46-987F-47570745A589}:_C309E2E9F9604E2CBB8CA7584F049CD3
-{
-Name = 8:autoload
-AlwaysCreate = 11:FALSE
-Condition = 8:
-Transitive = 11:FALSE
-Property =
8:_4D4BCF1E8B4543CD854C9EE4E6C6318E
-Folders
-{
-}
-}
}
}
}
diff -r 4e4501b3a3fc -r 346c38f0b41d
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Thu Jun 24
09:29:52 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Thu Jun 24
09:40:22 2010 +0200
@@ -1203,12 +1203,6 @@
}
Entry
{
-MsmKey = 8:_CAEBC4C88AD24AD5AE555E49284941B5
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_CB3C9EC9B4FF49E9815AC97E05BB8A46
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -5601,26 +5595,6 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
-
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CAEBC4C88AD24AD5AE555E49284941B5
-{
-SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
-TargetName = 8:30_xml.mal
-Tag = 8:
-Folder = 8:_CBC2B495BACD4CA8A55E11008F8B563D
-Condition = 8:
-Transitive = 11:FALSE
-Vital = 11:TRUE
-ReadOnly = 11:FALSE
-Hidden = 11:FALSE
-System = 11:FALSE
-Permanent = 11:FALSE
-SharedLegacy = 11:FALSE
-PackageAs = 3:1
-Register = 3:1
-Exclude = 11:FALSE
-IsDependency = 11:FALSE
-IsolateTo = 8:
-}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB3C9EC9B4FF49E9815AC97E05BB8A46
{
SourcePath = 8:lib\\libmutils.dll
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - xml is already automatically loaded.
Changeset: 5bbbfb6a94e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5bbbfb6a94e0
Modified Files:
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
xml is already automatically loaded.
diffs (104 lines):
diff -r 346c38f0b41d -r 5bbbfb6a94e0
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdprojThu Jun 24
09:40:22 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdprojThu Jun 24
09:44:10 2010 +0200
@@ -189,12 +189,6 @@
}
Entry
{
-MsmKey = 8:_1E640F4673BF4D94A50D359AD86002AD
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_1F665F81F90C4178A64A0D45D1468031
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -1941,26 +1935,6 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
-
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E640F4673BF4D94A50D359AD86002AD
-{
-SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
-TargetName = 8:30_xml.mal
-Tag = 8:
-Folder = 8:_853248B6DA0549A48FAF7F562E7D1B8F
-Condition = 8:
-Transitive = 11:FALSE
-Vital = 11:TRUE
-ReadOnly = 11:FALSE
-Hidden = 11:FALSE
-System = 11:FALSE
-Permanent = 11:FALSE
-SharedLegacy = 11:FALSE
-PackageAs = 3:1
-Register = 3:1
-Exclude = 11:FALSE
-IsDependency = 11:FALSE
-IsolateTo = 8:
-}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F665F81F90C4178A64A0D45D1468031
{
SourcePath = 8:Lib\\MonetDB5\\lib_mtime.dll
@@ -5640,17 +5614,6 @@
Property = 8:_762E204C3D494003AADB714FE800A1AF
Folders
{
-
{9EF0B969-E518-4E46-987F-47570745A589}:_853248B6DA0549A48FAF7F562E7D1B8F
-{
-Name = 8:autoload
-AlwaysCreate = 11:FALSE
-Condition = 8:
-Transitive = 11:FALSE
-Property =
8:_464AA55C3A3E47B5A5EE2363DC72DC9C
-Folders
-{
-}
-}
}
}
}
diff -r 346c38f0b41d -r 5bbbfb6a94e0
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 24 09:40:22
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 24 09:44:10
2010 +0200
@@ -1551,12 +1551,6 @@
}
Entry
{
-MsmKey = 8:_F742FD1CA61447B399F90E61D4157DC4
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_FA9DDB4A77F54CF5A7E20EC1D6386115
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -6761,26 +6755,6 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
-
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F742FD1CA61447B399F90E61D4157DC4
-{
-SourcePath = 8:Lib\\MonetDB5\\autoload\\30_xml.mal
-TargetName = 8:30_xml.mal
-Tag = 8:
-Folder = 8:_A4A821D237B943CFACE8D54F3F3971E3
-Condition = 8:
-Transitive = 11:FALSE
-Vital = 11:TRUE
-ReadOnly = 11:FALSE
-Hidden = 11:FALSE
-System = 11:FALSE
-Permanent = 11:FALSE
-SharedLegacy = 11:FALSE
-PackageAs = 3:1
-Register = 3:1
-Exclude = 11:FALSE
-IsDependency = 11:FALSE
-IsolateTo = 8:
-}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FA9DDB4A77F54CF5A7E20EC1D6386115
{
SourcePath = 8:Lib\\MonetDB5\\opt_reduce.mal
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Preparations for building the Jun2010 release.
Changeset: c0927c19d269 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0927c19d269
Modified Files:
MonetDB/MonetDB.spec
MonetDB/debian/changelog
MonetDB4/MonetDB-server.spec
MonetDB4/debian/changelog
MonetDB5/ChangeLog.Jun2010
MonetDB5/MonetDB-server.spec
MonetDB5/debian/changelog
clients/MonetDB-client.spec
clients/debian/changelog
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
geom/debian/changelog
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
pathfinder/debian/changelog
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/debian/changelog
testing/MonetDB-testing.spec
testing/debian/changelog
Branch: Jun2010
Log Message:
Preparations for building the Jun2010 release.
Updated build installer version number.
Moved contents of ChangeLog.Jun2010 to .spec file and debian/changelog.
diffs (truncated from 414 to 300 lines):
diff -r e44e41ea156b -r c0927c19d269 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Thu Jun 24 17:40:34 2010 +0200
+++ b/MonetDB/MonetDB.spec Fri Jun 25 17:41:36 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
- Rebuilt.
diff -r e44e41ea156b -r c0927c19d269 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Thu Jun 24 17:40:34 2010 +0200
+++ b/MonetDB/debian/changelog Fri Jun 25 17:41:36 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
monetdb (1.38.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r e44e41ea156b -r c0927c19d269 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Thu Jun 24 17:40:34 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Fri Jun 25 17:41:36 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100622
- Rebuilt.
diff -r e44e41ea156b -r c0927c19d269 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Thu Jun 24 17:40:34 2010 +0200
+++ b/MonetDB4/debian/changelog Fri Jun 25 17:41:36 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
monetdb4-server (4.38.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r e44e41ea156b -r c0927c19d269 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Thu Jun 24 17:40:34 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Fri Jun 25 17:41:36 2010 +0200
@@ -1,6 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org
-- When libxml2 is available, the XML module is automatically loaded.
-
diff -r e44e41ea156b -r c0927c19d269 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Thu Jun 24 17:40:34 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Fri Jun 25 17:41:36 2010 +0200
@@ -214,6 +214,12 @@
%{_libdir}/*.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100625
+- Rebuilt.
+
+* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100625
+- When libxml2 is available, the XML module is automatically loaded.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100622
- Rebuilt.
diff -r e44e41ea156b -r c0927c19d269 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Thu Jun 24 17:40:34 2010 +0200
+++ b/MonetDB5/debian/changelog Fri Jun 25 17:41:36 2010 +0200
@@ -1,3 +1,15 @@
+monetdb5-server (5.20.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
+monetdb5-server (5.20.1-20100625) unstable; urgency=low
+
+ * When libxml2 is available, the XML module is automatically loaded.
+
+ -- Sjoerd Mullender sjo...@acm.org Wed, 23 Jun 2010 17:41:34 +0200
+
monetdb5-server (5.20.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r e44e41ea156b -r c0927c19d269 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Thu Jun 24 17:40:34 2010 +0200
+++ b/clients/MonetDB-client.spec Fri Jun 25 17
MonetDB: Jun2010 - Setting tag Jun2010_1 for the release build.
Changeset: 203a6ab66ea5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=203a6ab66ea5 Modified Files: .hgtags Branch: Jun2010 Log Message: Setting tag Jun2010_1 for the release build. diffs (9 lines): diff -r c0927c19d269 -r 203a6ab66ea5 .hgtags --- a/.hgtags Fri Jun 25 17:41:36 2010 +0200 +++ b/.hgtags Fri Jun 25 17:41:37 2010 +0200 @@ -408,3 +408,5 @@ 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 +d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 +c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 48b4be11fdf3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48b4be11fdf3
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 423 to 300 lines):
diff -r 7f53bc7587ca -r 48b4be11fdf3 .hgtags
--- a/.hgtags Mon Jun 28 06:23:17 2010 +0200
+++ b/.hgtags Mon Jun 28 09:44:16 2010 +0200
@@ -408,3 +408,5 @@
659965ec908548fa64649bce37f84e245428ce7b Jun2010_1
659965ec908548fa64649bce37f84e245428ce7b Jun2010_1
d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1
+d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1
+c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Jun 28 09:44:16 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
monetdb (1.38.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon Jun 28 09:44:16 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB4/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
monetdb4-server (4.38.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Mon Jun 28 09:44:16 2010 +0200
@@ -1,6 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org
-- When libxml2 is available, the XML module is automatically loaded.
-
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon Jun 28 09:44:16 2010 +0200
@@ -213,6 +213,12 @@
%{_libdir}/*.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100625
+- Rebuilt.
+
+* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100625
+- When libxml2 is available, the XML module is automatically loaded.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB5/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,15 @@
+monetdb5-server (5.20.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
+monetdb5-server (5.20.1-20100625) unstable; urgency=low
+
+ * When libxml2 is available, the XML module is automatically loaded.
+
+ -- Sjoerd Mullender sjo...@acm.org Wed, 23 Jun 2010 17:41:34 +0200
+
monetdb5-server (5.20.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/clients/MonetDB-client.spec Mon Jun 28 09:44:16 2010 +0200
@@ -301,6 +301,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/debian/changelog
--- a/clients/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/clients/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,9
MonetDB: Jun2010 - Disable tests that use unsupported features.
Changeset: ee6f2784538d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee6f2784538d Modified Files: pathfinder/benchmarks/MBench/Tests/All pathfinder/benchmarks/XMach-1/Tests/All pathfinder/benchmarks/XMark/XRpc/Tests/All pathfinder/runtime/Tests/All pathfinder/runtime/xrpc/admin/Tests/All pathfinder/tests/BugTracker/Tests/All pathfinder/tests/W3C_use_cases/XQ/PARTS/Tests/All pathfinder/tests/W3C_use_cases/XQ/TREE/Tests/All pathfinder/tests/W3C_use_cases/XQUF/Parts/Tests/All pathfinder/tests/WebSite/Tests/All pathfinder/tests/XQuery/Tests/All pathfinder/tests/XRpc/Tests/All Branch: Jun2010 Log Message: Disable tests that use unsupported features. diffs (truncated from 380 to 300 lines): diff -r 4ac7588c78fd -r ee6f2784538d pathfinder/benchmarks/MBench/Tests/All --- a/pathfinder/benchmarks/MBench/Tests/AllMon Jun 28 12:51:04 2010 +0200 +++ b/pathfinder/benchmarks/MBench/Tests/AllMon Jun 28 15:08:02 2010 +0200 @@ -39,10 +39,12 @@ qs34 qs35 qa01 -qa02 +# recursive function +NOT_ALGEBRA?qa02 qa04 qa05 -qa06 +# recursive function +NOT_ALGEBRA?qa06 qj01 #_requires_8GB__runs_5min_ WITH_ALGEBRA?qj02 diff -r 4ac7588c78fd -r ee6f2784538d pathfinder/benchmarks/XMach-1/Tests/All --- a/pathfinder/benchmarks/XMach-1/Tests/All Mon Jun 28 12:51:04 2010 +0200 +++ b/pathfinder/benchmarks/XMach-1/Tests/All Mon Jun 28 15:08:02 2010 +0200 @@ -8,7 +8,8 @@ count_nodes q1 q2 -q3 +# recursive function +NOT_ALGEBRA?q3 q4 q5 q6 diff -r 4ac7588c78fd -r ee6f2784538d pathfinder/benchmarks/XMark/XRpc/Tests/All --- a/pathfinder/benchmarks/XMark/XRpc/Tests/AllMon Jun 28 12:51:04 2010 +0200 +++ b/pathfinder/benchmarks/XMark/XRpc/Tests/AllMon Jun 28 15:08:02 2010 +0200 @@ -1,21 +1,21 @@ -import_doc -q01 -q02 -q03 -q04 -q05 -q06 -q07 -q08 -q09 -q10 -q11 -q12 -q13 -q14 -q15 -q16 -q17 -q18 -q19 -q20 +NOT_ALGEBRA?import_doc +NOT_ALGEBRA?q01 +NOT_ALGEBRA?q02 +NOT_ALGEBRA?q03 +NOT_ALGEBRA?q04 +NOT_ALGEBRA?q05 +NOT_ALGEBRA?q06 +NOT_ALGEBRA?q07 +NOT_ALGEBRA?q08 +NOT_ALGEBRA?q09 +NOT_ALGEBRA?q10 +NOT_ALGEBRA?q11 +NOT_ALGEBRA?q12 +NOT_ALGEBRA?q13 +NOT_ALGEBRA?q14 +NOT_ALGEBRA?q15 +NOT_ALGEBRA?q16 +NOT_ALGEBRA?q17 +NOT_ALGEBRA?q18 +NOT_ALGEBRA?q19 +NOT_ALGEBRA?q20 diff -r 4ac7588c78fd -r ee6f2784538d pathfinder/runtime/Tests/All --- a/pathfinder/runtime/Tests/All Mon Jun 28 12:51:04 2010 +0200 +++ b/pathfinder/runtime/Tests/All Mon Jun 28 15:08:02 2010 +0200 @@ -38,5 +38,5 @@ NOT_WIN32?pf_docname pf_log pf_sqrt -pf_pow +NOT_ALGEBRA?pf_pow deep_recursion diff -r 4ac7588c78fd -r ee6f2784538d pathfinder/runtime/xrpc/admin/Tests/All --- a/pathfinder/runtime/xrpc/admin/Tests/All Mon Jun 28 12:51:04 2010 +0200 +++ b/pathfinder/runtime/xrpc/admin/Tests/All Mon Jun 28 15:08:02 2010 +0200 @@ -1,8 +1,14 @@ add_del_doc_noxrpc -add_del_doc -backup_restore_noxrpc -backup_restore -db_stats_noxrpc -db_stats -db_env_noxrpc -db_env +NOT_ALGEBRA?add_del_doc +# fn:put() +NOT_ALGEBRA?backup_restore_noxrpc +# fn:put() +NOT_ALGEBRA?backup_restore +# pf:mil() +NOT_ALGEBRA?db_stats_noxrpc +# pf:mil() +NOT_ALGEBRA?db_stats +# pf:mil() +NOT_ALGEBRA?db_env_noxrpc +# pf:mil() +NOT_ALGEBRA?db_env diff -r 4ac7588c78fd -r ee6f2784538d pathfinder/tests/BugTracker/Tests/All --- a/pathfinder/tests/BugTracker/Tests/All Mon Jun 28 12:51:04 2010 +0200 +++ b/pathfinder/tests/BugTracker/Tests/All Mon Jun 28 15:08:02 2010 +0200 @@ -50,15 +50,19 @@ type_error_with_typeswitch.SF-1559355 type_errors_with_fn-name.SF-1563354 fn-name_on_text_nodes.SF-1564964 -complex-XQuery-batbat_lng_add_inplace-error-OK.SF-1562868 -complex-XQuery-batbat_lng_add_inplace-error-KO.SF-1562868 -complex-XQuery-batbat_lng_add_inplace-error-KO2.SF-1562868 +# recursive function +NOT_ALGEBRA?complex-XQuery-batbat_lng_add_inplace-error-OK.SF-1562868 +# recursive function +NOT_ALGEBRA?complex-XQuery-batbat_lng_add_inplace-error-KO.SF-1562868 +# recursive function +NOT_ALGEBRA?complex-XQuery-batbat_lng_add_inplace-error-KO2.SF-1562868 interpret_while-bit_nil.SF-1567021 treat_as.SF-1586454 shredding-remap-error.SF-1487156.unpack_doc shredding-remap-error.SF-1487156.shred_doc shredding-remap-error.SF-1487156.cache_doc -recursion_type_error.SF-1579524 +# recursive function +NOT_ALGEBRA?recursion_type_error.SF-1579524 #NOT_WIN32? ID_1509806?xs_untypedAtomic.SF-1509806.mps polymorphic_sequences.SF-1497419.mps @@ -74,7 +78,8 @@ inserting_multiple_elements.SF-1590583 collection-naming.SF-1590782 pf_docname.SF-2418722 -if-condition_testing_empty_sequence.SF-1589820 +# recursive function +NOT_ALGEBRA?if-condition_testing_empty_sequence.SF-1589820 update_error.SF-1579510 value_append_to_nil.SF-1592689 path_steps_with_name_tests_on_transsient_nodes.SF-1610247.alg @@ -100,10 +105,14 @@ seqcast_opt_int_to_numeric.SF-1637867 entities_dtd.SF-1642663 entities_dtd.SF-1642665 -call2builtin_function_crashes_XRPC_client.SF-1655857
MonetDB: default - Merge with Jun2010 branch.
Changeset: 4422020cdd27 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4422020cdd27 Modified Files: pathfinder/benchmarks/MBench/Tests/All pathfinder/benchmarks/XMach-1/Tests/All pathfinder/benchmarks/XMark/XRpc/Tests/All pathfinder/runtime/Tests/All pathfinder/runtime/xrpc/admin/Tests/All pathfinder/tests/BugTracker/Tests/All pathfinder/tests/W3C_use_cases/XQ/PARTS/Tests/All pathfinder/tests/W3C_use_cases/XQ/TREE/Tests/All pathfinder/tests/W3C_use_cases/XQUF/Parts/Tests/All pathfinder/tests/WebSite/Tests/All pathfinder/tests/XQuery/Tests/All pathfinder/tests/XRpc/Tests/All Branch: default Log Message: Merge with Jun2010 branch. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Approve SunOS5.10 output: casting values near...
Changeset: 1aa4dbcd13e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1aa4dbcd13e1
Modified Files:
MonetDB4/src/gdk/Tests/batcasts.stable.out.SunOS5.10
MonetDB4/src/gdk/Tests/batcasts.stable.out.SunOS5.10.oid64
MonetDB4/src/gdk/Tests/casts.stable.out.SunOS5.10
MonetDB4/src/gdk/Tests/casts.stable.out.SunOS5.10.oid64
MonetDB5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
MonetDB5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
Branch: Jun2010
Log Message:
Approve SunOS5.10 output: casting values near 9223372036854775807.0 to lng
result in 9223372036854775807.
diffs (truncated from 10892 to 300 lines):
diff -r ee6f2784538d -r 1aa4dbcd13e1
MonetDB4/src/gdk/Tests/batcasts.stable.out.SunOS5.10
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/MonetDB4/src/gdk/Tests/batcasts.stable.out.SunOS5.10 Mon Jun 28
16:15:53 2010 +0200
@@ -0,0 +1,2062 @@
+stdout of test 'batcasts` in directory 'src/gdk` itself:
+
+
+# 14:56:01
+# 14:56:01 Mtimeout -timeout 60 Mserver
--config=/ufs/boncz/MonetDB/linux/etc/monet.conf --debug=10 --set
monet_mod_path=/ufs/boncz/MonetDB/linux/lib/MonetDB --set
gdk_dbfarm=/ufs/boncz/MonetDB/linux/var/MonetDB/dbfarm --set
sql_logdir=/ufs/boncz/MonetDB/linux/var/MonetDB/log --set mapi_port=52524
--set sql_port=56156 --set monet_prompt= --trace --dbname=mTests_src_gdk
batcasts.milM
+# 14:56:01
+
+# Monet Database Server V4.3.13
+# Copyright (c) 1993-2004, CWI. All rights reserved.
+# compiled for i686-pc-linux-gnu/32bit; dynamically linked.
+# casting to int
+
+var b := new(void,int);
+b.append(0);
+b.append(1);
+b.append(32767);
+b.append(32768);
+b.append(32769);
+b.append(2147483647);
+#b.append(2147483648); # implicitly casted to lng
+#b.append(2147483649); # implicitly casted to lng
+b.append(-2147483647);
+#b.append(-2147483648); # implicitly casted to lng
+#b.append(-2147483649); # implicitly casted to lng
+b.access(BAT_READ);
+b.print();
+#-#
+# ht # name
+# void int # type
+#-#
+[ nil, 0 ]
+[ nil, 1 ]
+[ nil, 32767 ]
+[ nil, 32768 ]
+[ nil, 32769 ]
+[ nil, 2147483647]
+#[ nil,2147483648] # see above
+#[ nil,2147483649] # see above
+[ nil, -2147483647 ]
+#[ nil,-2147483648 ] # see above
+#[ nil,-2147483649 ] # see above
+
+# from bit
+b := new(void,bit);
+b.append(true);
+b.append(false);
+b.access(BAT_READ);
+b.[int]().print();
+#-#
+# ht # name
+# void int # type
+#-#
+[ nil, 1 ]
+[ nil, 0 ]
+
+# from chr
+b := new(void,chr);
+b.append('a');
+b.access(BAT_READ);
+b.[int]().print();
+#-#
+# ht # name
+# void int # type
+#-#
+[ nil, 97]
+
+# from sht
+b := new(void,sht);
+b.append(sht(1));
+b.append(sht(32767));
+b.access(BAT_READ);
+b.[int]().print();
+#-#
+# ht # name
+# void int # type
+#-#
+[ nil, 1 ]
+[ nil, 32767 ]
+
+# from int
+b := new(void,int);
+b.append(1);
+b.append(32767);
+b.append(32768);
+b.append(2147483647);
+b.append(-2147483647);
+b.append(2147483647+1);
+b.append(-2147483647 - 1);
+# should this produce nil (overflow)?
+b.append(2147483647+2);
+# should this produce nil (overflow)?
+b.append(-2147483647 - 2);
+b.access(BAT_READ);
+b.[int]().print();
+#-#
+# ht # name
+# void int # type
+#-#
+[ nil, 1 ]
+[ nil, 32767 ]
+[ nil, 32768 ]
+[ nil, 2147483647]
+[ nil, -2147483647 ]
+[ nil, nil ]
+[ nil, nil ]
+[ nil, -2147483647 ]
+[ nil, 2147483647]
+
+# from lng
+b := new(void,lng);
+b.append(1LL);
+b.append(2147483647LL);
+b.append(2147483648LL);
+b.append(2147483649LL);
+b.append(-2147483647LL);
+b.append(-2147483648LL);
+b.append(-2147483649LL);
+b.access(BAT_READ);
+b.[int]().print();
+#-#
+# ht # name
+# void int # type
+#-#
+[ nil, 1 ]
+[ nil, 2147483647]
+[ nil, nil ]
+[ nil, nil ]
+[ nil, -2147483647 ]
+[ nil, nil ]
+[ nil, nil ]
+
+# from flt
+b := new(void,flt);
+b.append(0.0);
+b.append(0.1);
+b.append(0.5);
+b.append(0.9);
+b.append(1.0);
+b.append(-0.1);
+b.append(-0.5);
+b.append(-0.9);
+b.append(-1.0);
+b.append(2147483647.0);
+b.append(2147483648.0);
+b.append(2147483649.0);
+b.append(-2147483647.0);
+b.append(-2147483648.0);
+b.append(-2147483649.0);
+b.access(BAT_READ);
+b.[int]().print();
+#-#
+# ht # name
+# void int # type
+#-#
+[ nil, 0 ]
+[ nil, 0 ]
+[ nil, 0 ]
+[ nil, 0 ]
+[ nil, 1 ]
+[ nil, 0 ]
+[ nil, 0 ]
+[ nil, 0 ]
+[ nil, -1]
+[ nil, nil ]
+[ nil, nil ]
+[ nil, nil ]
MonetDB: Jun2010 - We're moving the download area.
Changeset: 9665844e6545 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9665844e6545 Modified Files: MonetDB/HowToStart.rst Branch: Jun2010 Log Message: We're moving the download area. diffs (30 lines): diff -r 1518b13bbac5 -r 9665844e6545 MonetDB/HowToStart.rst --- a/MonetDB/HowToStart.rstMon Jun 28 20:29:29 2010 +0200 +++ b/MonetDB/HowToStart.rstWed Jun 30 10:22:29 2010 +0200 @@ -20,7 +20,7 @@ a native Windows system (NT, 2000, XP) see the instructions in the file `../buildtools/doc/windowsbuild.rst`__. -__ http://monetdb.cwi.nl/downloads/ +__ http://dev.monetdb.org/downloads/ __ Windows-Installation.html The Suite @@ -137,7 +137,7 @@ document loader will not be compiled at all in that case. Current Linux distributions all come with libxml2. -__ http://monetdb.cwi.nl/downloads/sources/ +__ http://dev.monetdb.org/downloads/sources/ __ http://www.gnu.org/software/autoconf/ __ http://www.gnu.org/software/automake/ __ http://www.gnu.org/software/libtool/ @@ -178,7 +178,7 @@ the pre-packaged source distribution, you can skip this section and proceed to `Bootstrap, Configure and Make`_. -__ http://monetdb.cwi.nl/downloads/ +__ http://dev.monetdb.org/downloads/ Mercurial clone ~~~ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merge heads.
Changeset: 40594bfd57a5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40594bfd57a5
Modified Files:
Branch: Jun2010
Log Message:
Merge heads.
diffs (35 lines):
diff -r 9665844e6545 -r 40594bfd57a5 MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 10:22:29 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 10:27:35 2010 +0200
@@ -372,22 +372,20 @@
# if defined(HAVE_SYSCONF) defined(_SC_PHYS_PAGES)
_MT_npages = sysconf(_SC_PHYS_PAGES);
# else
-# if defined(HAVE_GETRLIMIT) defined(RLIMIT_RSS)
+# if defined(HAVE_SYS_SYSCTL_H) defined(HW_MEMSIZE)
{
- struct rlimit rl;
+ int mib[2] = { CTL_HW, HW_MEMSIZE };
+ unsigned int namelen = sizeof(mib) / sizeof(mib[0]);
+ uint64_t size;
+ size_t len = sizeof(size);
- /* Specifies the limit (in pages) of the process's resident set
-* (the number of virtual pages resident in RAM). This limit
-* only has effect in Linux 2.4.x, x 30, and there only
-* affects calls to madvise() specifying MADV_WILLNEED */
- /* FIXME: this looks like a total wrong thing to check in any
-* case to me */
- getrlimit(RLIMIT_RSS, rl);
- _MT_npages = rl.rlim_cur / _MT_pagesize;
+ if (sysctl(mib, namelen, size, len, NULL, 0) = 0) {
+ _MT_npages = size / _MT_pagesize;
+ }
}
# else
#error don't know how to get the amount of physical memory for your OS
-# endif /* getrlimit */
+# endif /* sysctl */
# endif /* sysconf */
# endif/* GlobalMemoryStatus */
#endif /* GlobalMemoryStatusEx */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: e034e2d4a3c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e034e2d4a3c3
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (65 lines):
diff -r bd33590d3ab8 -r e034e2d4a3c3 MonetDB/HowToStart.rst
--- a/MonetDB/HowToStart.rstMon Jun 28 20:30:10 2010 +0200
+++ b/MonetDB/HowToStart.rstWed Jun 30 10:28:21 2010 +0200
@@ -20,7 +20,7 @@
a native Windows system (NT, 2000, XP) see the instructions in the
file `../buildtools/doc/windowsbuild.rst`__.
-__ http://monetdb.cwi.nl/downloads/
+__ http://dev.monetdb.org/downloads/
__ Windows-Installation.html
The Suite
@@ -137,7 +137,7 @@
document loader will not be compiled at all in that case.
Current Linux distributions all come with libxml2.
-__ http://monetdb.cwi.nl/downloads/sources/
+__ http://dev.monetdb.org/downloads/sources/
__ http://www.gnu.org/software/autoconf/
__ http://www.gnu.org/software/automake/
__ http://www.gnu.org/software/libtool/
@@ -178,7 +178,7 @@
the pre-packaged source distribution, you can skip this section and
proceed to `Bootstrap, Configure and Make`_.
-__ http://monetdb.cwi.nl/downloads/
+__ http://dev.monetdb.org/downloads/
Mercurial clone
~~~
diff -r bd33590d3ab8 -r e034e2d4a3c3 MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Mon Jun 28 20:30:10 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 10:28:21 2010 +0200
@@ -372,22 +372,20 @@
# if defined(HAVE_SYSCONF) defined(_SC_PHYS_PAGES)
_MT_npages = sysconf(_SC_PHYS_PAGES);
# else
-# if defined(HAVE_GETRLIMIT) defined(RLIMIT_RSS)
+# if defined(HAVE_SYS_SYSCTL_H) defined(HW_MEMSIZE)
{
- struct rlimit rl;
+ int mib[2] = { CTL_HW, HW_MEMSIZE };
+ unsigned int namelen = sizeof(mib) / sizeof(mib[0]);
+ uint64_t size;
+ size_t len = sizeof(size);
- /* Specifies the limit (in pages) of the process's resident set
-* (the number of virtual pages resident in RAM). This limit
-* only has effect in Linux 2.4.x, x 30, and there only
-* affects calls to madvise() specifying MADV_WILLNEED */
- /* FIXME: this looks like a total wrong thing to check in any
-* case to me */
- getrlimit(RLIMIT_RSS, rl);
- _MT_npages = rl.rlim_cur / _MT_pagesize;
+ if (sysctl(mib, namelen, size, len, NULL, 0) = 0) {
+ _MT_npages = size / _MT_pagesize;
+ }
}
# else
#error don't know how to get the amount of physical memory for your OS
-# endif /* getrlimit */
+# endif /* sysctl */
# endif /* sysconf */
# endif/* GlobalMemoryStatus */
#endif /* GlobalMemoryStatusEx */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merged heads.
Changeset: 1ed86465f0ee for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ed86465f0ee Modified Files: MonetDB/src/gdk/gdk_system.mx Branch: Jun2010 Log Message: Merged heads. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - More efficient internal TMsubcommit.
Changeset: 3d55f64b5d3b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d55f64b5d3b
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_logger.mx
MonetDB/src/gdk/gdk_tm.mx
MonetDB4/src/monet/monet_interpreter.mx
MonetDB5/src/mal/mal_authorize.mx
MonetDB5/src/modules/mal/bpm.mx
MonetDB5/src/modules/mal/statistics.mx
MonetDB5/src/optimizer/opt_dictionary.mx
MonetDB5/src/optimizer/opt_statistics.mx
Branch: default
Log Message:
More efficient internal TMsubcommit.
Internally, TMsubcommit is usually called between creating and filling
a new BAT and destroying that BAT. That BAT is filled with names
which are looked up given a BAT ID, and then TMsubcommit converts
those names back to the selfsame BAT IDs. This can be done more
efficiently.
We introduce a new function TMsubcommit_list with two parameters: an
array of BAT IDs, and a count. Because of BBP-internal reasons, the
first element of the array is unused (and must be 0). The count is
the number of BAT IDs, including the unused 0.
TMsubcommit now does the same as before, looking up BAT IDs and
putting them into an array. Except now, TMsubcommit calls the new
function to do the real work. This function can also be called from
other parts of the code.
By calling TMsubcommit_list, we now save on the creation and
destruction of temporary string BATs and concomitant locking, and we
save on the lookup of BAT names to find BAT IDs.
Note that this change only affects C code. The MIL and MAL interfaces
remain identical.
diffs (truncated from 387 to 300 lines):
diff -r d9b987956b70 -r 3d55f64b5d3b MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxFri Jul 02 13:23:44 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxFri Jul 02 14:17:05 2010 +0200
@@ -2875,6 +2875,7 @@
gdk_export int TMcommit(void);
gdk_export int TMabort(void);
gdk_export int TMsubcommit(BAT *bl);
+gdk_export int TMsubcommit_list(bat *subcommit, int cnt);
@
@}
diff -r d9b987956b70 -r 3d55f64b5d3b MonetDB/src/gdk/gdk_logger.mx
--- a/MonetDB/src/gdk/gdk_logger.mx Fri Jul 02 13:23:44 2010 +0200
+++ b/MonetDB/src/gdk/gdk_logger.mx Fri Jul 02 14:17:05 2010 +0200
@@ -1006,33 +1006,34 @@
bm_subcommit(BAT *list, BAT *catalog, BAT *extra, int debug)
{
BUN p, q;
- BAT *n = logbat_new(TYPE_void, TYPE_str, BATcount(list) * 2 + (extra ?
BATcount(extra) : 0));
+ /* using alloca, since the old TMsubcommit interface also uses
+ alloca */
+ bat *n = alloca(sizeof(bat) * (1 + BATcount(list) * 2 + (extra ?
BATcount(extra) : 0)));
+ int i = 0;
BAT *b = list;
BATiter bi = bat_iterator(b);
int res;
- BATseqbase(n, 0);
+ n[i++] = 0;
/* first loop over deleted then over current and new */
for (p = b-batDeleted; p b-batFirst; p++) {
bat col = *(log_bid *) BUNhead(bi, p);
- str name = BBPname(col);
if (debug 1)
fprintf(stderr, commit deleted %s (%d) %s\n,
- name, col,
+ BBPname(col), col,
(b == catalog) ? BUNtail(bi, p) : snapshot);
- BUNappend(n, name, FALSE);
+ n[i++] = ABS(col);
}
BATloop(b, p, q) {
bat col = *(log_bid *) BUNhead(bi, p);
- str name = BBPname(col);
if (debug 1)
fprintf(stderr, commit new %s (%d) %s\n,
- name, col,
+ BBPname(col), col,
(b == catalog) ? BUNtail(bi, p) : snapshot);
- BUNappend(n, name, FALSE);
+ n[i++] = ABS(col);
}
if (extra) {
bi = bat_iterator(extra);
@@ -1043,14 +1044,13 @@
fprintf(stderr, commit extra %s %s\n,
name,
(b == catalog) ? BUNtail(bi, p) :
snapshot);
- BUNappend(n, name, FALSE);
+ n[i++] = ABS(BBPindex(name));
}
}
/* now commit catalog, so it's also up to date on disk */
- BUNappend(n, BBPname(catalog-batCacheid), FALSE);
+ n[i++] = ABS(catalog-batCacheid);
BATcommit(catalog);
- res = TMsubcommit(n);
- BBPreclaim(n);
+ res = TMsubcommit_list(n, i);
return res;
}
diff -r d9b987956b70 -r 3d55f64b5d3b MonetDB/src/gdk/gdk_tm.mx
--- a/MonetDB/src/gdk/gdk_tm.mx Fri Jul 02 13:23:44 2010 +0200
+++ b/MonetDB/src/gdk/gdk_tm.mx Fri Jul 02 14:17:05 2010 +0200
@@ -168,25 +168,17 @@
ongoing concurrent query and update facilities than a real global TMcommit.
@c
int
-TMsubcommit(BAT *b)
+TMsubcommit_list(bat *subcommit, int cnt)
{
- int xx, ret = -1, cnt = 1; /* BBP artifact: slot 0 in the
MonetDB: default - Merge with Jun2010 branch.
Changeset: adb0111d066c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adb0111d066c
Modified Files:
MonetDB/MonetDB.spec
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
MonetDB/NT/rules.msc
MonetDB/configure.ag
MonetDB/src/gdk/libbat.rc
MonetDB/vertoo.data
MonetDB4/MonetDB-server.spec
MonetDB4/NT/MonetDB.iss
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
MonetDB4/NT/rules.msc
MonetDB4/VERSION
MonetDB4/configure.ag
MonetDB4/src/monet/libmonet.rc
MonetDB4/vertoo.data
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/NT/rules.msc
MonetDB5/VERSION
MonetDB5/configure.ag
MonetDB5/src/mal/libmonetdb5.rc
MonetDB5/vertoo.data
clients/MonetDB-client.spec
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
clients/NT/rules.msc
clients/configure.ag
clients/src/mapilib/Mapi.rc
clients/src/odbc/driver/driver.rc
clients/src/odbc/winsetup/setup.rc
clients/vertoo.data
geom/MonetDB-geom.spec
geom/NT/rules.msc
geom/configure.ag
geom/vertoo.data
java/configure.ag
java/vertoo.data
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/rules.msc
pathfinder/VERSION
pathfinder/configure.ag
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/title.html.in
pathfinder/vertoo.data
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/NT/rules.msc
sql/VERSION
sql/configure.ag
sql/src/storage/store.mx
sql/vertoo.data
template/configure.ag
template/vertoo.data
testing/MonetDB-testing.spec
testing/NT/rules.msc
testing/configure.ag
testing/vertoo.data
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (11 lines):
diff -r 3d55f64b5d3b -r adb0111d066c sql/src/storage/store.mx
--- a/sql/src/storage/store.mx Fri Jul 02 14:17:05 2010 +0200
+++ b/sql/src/storage/store.mx Fri Jul 02 15:54:34 2010 +0200
@@ -846,6 +846,7 @@
GDKfatal(SQL schema missing or incompatible,
rebuild from archive);
}
s = n-data;
+ s-base.id = sid;
} else {
s = ZNEW(sql_schema);
v = table_funcs.column_find_value(tr, find_sql_column(ss,
name), rid);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Merge heads.
Changeset: 1976120a95df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1976120a95df
Modified Files:
Branch: Jun2010
Log Message:
Merge heads.
diffs (144 lines):
diff -r c9fcf41b58f5 -r 1976120a95df MonetDB5/src/modules/kernel/aggr.mx
--- a/MonetDB5/src/modules/kernel/aggr.mx Mon Jul 05 10:19:56 2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr.mx Mon Jul 05 10:44:53 2010 +0200
@@ -196,11 +196,15 @@
@-
In case the head of the group extend (e) is sorted, we assume that also the
-the tail of group map (g) almost sorted --- or at least clustered such
-that group IDs in cluster i are smaller than those in cluster i+1; this is
-the case if the first grouping attribute (column/BAT) is sorted --- and
-resorted to local scanning rather than (inherently random and expensive)
-hash-lookups.
+the tail of the group map (g) is almost sorted or mostly ascending ---
+or at least clustered such that group IDs in cluster i are smaller than
+those in cluster i+1; this is the case if the first grouping attribute
+(column/BAT) is sorted --- and resorted to local scanning rather than
+(inherently random and expensive) hash-lookups.
+Lacking a suitable and efficient way to detect that the tail of the group
+map (g) is almost sorted or mostly ascending, we require that the tail
+of the group map (g) is sorted --- the local scanning performs much worse
+than hash-lookups in case the tail of the group map (g) is in random order.
@h
#define MERGE_aggr_init\
BUN _i = 0, _j = BATcount(bn), _r = BUNfirst(bn); \
diff -r c9fcf41b58f5 -r 1976120a95df MonetDB5/src/modules/kernel/aggr_be_avg.mx
--- a/MonetDB5/src/modules/kernel/aggr_be_avg.mxMon Jul 05 10:19:56
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_be_avg.mxMon Jul 05 10:44:53
2010 +0200
@@ -236,7 +236,7 @@
} else {
@:aggrX3_avg(0,0,SCANfndOID,loc,BUNhloc(bi,p),@1,@2,b...@2(bni,r),r-off)@
}
- } else if (BAThordered(e)1) {
+ } else if (BATtordered(b)BAThordered(e)1) {
/* merge lookup */
MERGE_aggr_init;
if (BAThdense(b)) {
diff -r c9fcf41b58f5 -r 1976120a95df
MonetDB5/src/modules/kernel/aggr_be_count.mx
--- a/MonetDB5/src/modules/kernel/aggr_be_count.mx Mon Jul 05 10:19:56
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_be_count.mx Mon Jul 05 10:44:53
2010 +0200
@@ -232,7 +232,7 @@
} else {
@:aggrX3_count(0,0,SCANfndOID,loc,BUNhloc(bi,p),BUNtloc(bni,r))@
}
- } else if (BAThordered(e)1) {
+ } else if (BATtordered(b)BAThordered(e)1) {
/* merge lookup */
MERGE_aggr_init;
if (BAThdense(b)) {
diff -r c9fcf41b58f5 -r 1976120a95df
MonetDB5/src/modules/kernel/aggr_be_minmax.mx
--- a/MonetDB5/src/modules/kernel/aggr_be_minmax.mx Mon Jul 05 10:19:56
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_be_minmax.mx Mon Jul 05 10:44:53
2010 +0200
@@ -293,7 +293,7 @@
} else {
@:aggrx3_minm...@5(@2,0,SCANfndOID,loc,BUNhloc(bi,p),@3,@4,r-off,@6)@
}
- } else if (BAThordered(e)1) {
+ } else if (BATtordered(b)BAThordered(e)1) {
/* merge lookup */
MERGE_aggr_init;
if (BAThdense(b)) {
diff -r c9fcf41b58f5 -r 1976120a95df MonetDB5/src/modules/kernel/aggr_be_prod.mx
--- a/MonetDB5/src/modules/kernel/aggr_be_prod.mx Mon Jul 05 10:19:56
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_be_prod.mx Mon Jul 05 10:44:53
2010 +0200
@@ -234,7 +234,7 @@
} else {
@:aggrX3_prod(0,0,SCANfndOID,loc,BUNhloc(bi,p),@1,@2,b...@2(bni,r),@3,r-off)@
}
- } else if (BAThordered(e)1) {
+ } else if (BATtordered(b)BAThordered(e)1) {
/* merge lookup */
MERGE_aggr_init;
if (BAThdense(b)) {
diff -r c9fcf41b58f5 -r 1976120a95df MonetDB5/src/modules/kernel/aggr_be_sum.mx
--- a/MonetDB5/src/modules/kernel/aggr_be_sum.mxMon Jul 05 10:19:56
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_be_sum.mxMon Jul 05 10:44:53
2010 +0200
@@ -232,7 +232,7 @@
} else {
@:aggrX3_sum(0,0,SCANfndOID,loc,BUNhloc(bi,p),@1,@2,b...@2(bni,r),@3,r-off)@
}
- } else if (BAThordered(e)1) {
+ } else if (BATtordered(b)BAThordered(e)1) {
/* merge lookup */
MERGE_aggr_init;
if (BAThdense(b)) {
diff -r c9fcf41b58f5 -r 1976120a95df MonetDB5/src/modules/kernel/aggr_bge_avg.mx
--- a/MonetDB5/src/modules/kernel/aggr_bge_avg.mx Mon Jul 05 10:19:56
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_bge_avg.mx Mon Jul 05 10:44:53
2010 +0200
@@ -279,7 +279,7 @@
} else {
MonetDB: default - Merge from Jun2010 branch: If only one thread...
Changeset: f35835c337d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f35835c337d4
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:
Merge from Jun2010 branch: If only one thread, don't reorder work.
This should make that the test sql/src/test/copy/Tests/overflow_error.sql
becomes stable.
diffs (12 lines):
diff -r b76d01a2549b -r f35835c337d4 MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxMon Jul 05 10:45:11 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxMon Jul 05 12:29:45 2010 +0200
@@ -377,7 +377,7 @@
if ( task-rounds 8 )
return;
/* simple round robin the first time */
- if ( task-rounds++ == 0){
+ if ( threads == 1 || task-rounds++ == 0){
for ( i=j=0; i nr_attrs; i++, j++)
ptask[ j % threads].cols[i] = task-cols[i];
return;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Hardening: check for allocation failures and ...
Changeset: d2313b6847a3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2313b6847a3
Modified Files:
MonetDB/src/gdk/gdk_bat.mx
MonetDB5/src/mal/mal_box.mx
MonetDB5/src/mal/mal_function.mx
MonetDB5/src/mal/mal_instruction.mx
MonetDB5/src/mal/mal_profiler.mx
Branch: Jun2010
Log Message:
Hardening: check for allocation failures and stuff like that.
diffs (91 lines):
diff -r b2c8467b4043 -r d2313b6847a3 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:28:45 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:30:48 2010 +0200
@@ -102,6 +102,8 @@
@c
BATstore *bs = (BATstore *) GDKzalloc(sizeof(BATstore));
+ if (bs == NULL)
+ return NULL;
@-
assert needed in the kernel to get symbol eprintf resolved.
Else modules using assert fail to load.
diff -r b2c8467b4043 -r d2313b6847a3 MonetDB5/src/mal/mal_box.mx
--- a/MonetDB5/src/mal/mal_box.mx Mon Jul 05 12:28:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_box.mx Mon Jul 05 12:30:48 2010 +0200
@@ -599,12 +599,13 @@
int i;
b = BATnew(TYPE_int, TYPE_str, (BUN) MAXSPACES);
+ if (b == NULL)
+ throw(MAL, box.getBoxNames, MAL_MALLOC_FAIL);
for (i = 0; i topbox; i++)
if (malbox[i] != NULL) {
BUNins(b, i, malbox[i]-name, FALSE);
}
- BBPincref(*bid = b-batCacheid, TRUE);
- BBPunfix(*bid);
+ BBPkeepref(*bid = b-batCacheid);
return MAL_SUCCEED;
}
diff -r b2c8467b4043 -r d2313b6847a3 MonetDB5/src/mal/mal_function.mx
--- a/MonetDB5/src/mal/mal_function.mx Mon Jul 05 12:28:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_function.mx Mon Jul 05 12:30:48 2010 +0200
@@ -116,7 +116,11 @@
InstrPtr p;
s = newSymbol(nme,kind);
+ if (s == NULL)
+ return NULL;
p = newInstruction(NULL,kind);
+ if (p == NULL)
+ return NULL;
setModuleId(p, mod);
setFunctionId(p, nme);
setDestVar(p, newVariable(s-def,GDKstrdup(nme),TYPE_any));
@@ -126,6 +130,8 @@
InstrPtr newCall(Module scope, str fcnname, int kind){
InstrPtr p;
p= newInstruction(NULL,kind);
+ if (p == NULL)
+ return NULL;
setModuleScope(p, scope);
setFunctionId(p, putName(fcnname,strlen(fcnname)));
return p;
diff -r b2c8467b4043 -r d2313b6847a3 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx Mon Jul 05 12:28:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx Mon Jul 05 12:30:48 2010 +0200
@@ -601,7 +601,7 @@
}
cur = (Symbol) GDKzalloc(sizeof(SymRecord));
if (cur == NULL) {
- GDKerror(@1:MAL_MALLOC_FAIL);
+ GDKerror(newSymbol:MAL_MALLOC_FAIL);
return NULL;
}
cur-name = putName(nme,strlen(nme));
@@ -991,6 +991,8 @@
}
if (p == NULL) {
p = GDKzalloc(MAXARG * sizeof(p-maxarg) + sizeof(InstrRecord));
+ if (p == NULL)
+ return NULL;
p-maxarg = MAXARG;
}
p-typechk = TYPE_UNKNOWN;
diff -r b2c8467b4043 -r d2313b6847a3 MonetDB5/src/mal/mal_profiler.mx
--- a/MonetDB5/src/mal/mal_profiler.mx Mon Jul 05 12:28:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_profiler.mx Mon Jul 05 12:30:48 2010 +0200
@@ -1029,10 +1029,10 @@
}
b = BATnew(TYPE_void, tt, 1 16);
- BATseqbase(b, 0);
if (b == NULL)
return NULL;
+ BATseqbase(b, 0);
BATkey(b, TRUE);
BBPrename(b-batCacheid, buf);
BATmode(b, PERSISTENT);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Hardening: check f...
Changeset: 0db23ac1d990 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0db23ac1d990
Modified Files:
MonetDB/src/gdk/gdk_bat.mx
MonetDB5/src/mal/mal_function.mx
MonetDB5/src/mal/mal_instruction.mx
MonetDB5/src/mal/mal_profiler.mx
Branch: default
Log Message:
Merge from Jun2010 branch: Hardening: check for allocation failures and stuff
like that.
diffs (91 lines):
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:31:17 2010 +0200
@@ -102,6 +102,8 @@
@c
BATstore *bs = (BATstore *) GDKzalloc(sizeof(BATstore));
+ if (bs == NULL)
+ return NULL;
@-
assert needed in the kernel to get symbol eprintf resolved.
Else modules using assert fail to load.
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_box.mx
--- a/MonetDB5/src/mal/mal_box.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_box.mx Mon Jul 05 12:31:17 2010 +0200
@@ -599,12 +599,13 @@
int i;
b = BATnew(TYPE_int, TYPE_str, (BUN) MAXSPACES);
+ if (b == NULL)
+ throw(MAL, box.getBoxNames, MAL_MALLOC_FAIL);
for (i = 0; i topbox; i++)
if (malbox[i] != NULL) {
BUNins(b, i, malbox[i]-name, FALSE);
}
- BBPincref(*bid = b-batCacheid, TRUE);
- BBPunfix(*bid);
+ BBPkeepref(*bid = b-batCacheid);
return MAL_SUCCEED;
}
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_function.mx
--- a/MonetDB5/src/mal/mal_function.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_function.mx Mon Jul 05 12:31:17 2010 +0200
@@ -115,7 +115,11 @@
InstrPtr p;
s = newSymbol(nme,kind);
+ if (s == NULL)
+ return NULL;
p = newInstruction(NULL,kind);
+ if (p == NULL)
+ return NULL;
setModuleId(p, mod);
setFunctionId(p, nme);
setDestVar(p, newVariable(s-def,GDKstrdup(nme),TYPE_any));
@@ -125,6 +129,8 @@
InstrPtr newCall(Module scope, str fcnname, int kind){
InstrPtr p;
p= newInstruction(NULL,kind);
+ if (p == NULL)
+ return NULL;
setModuleScope(p, scope);
setFunctionId(p, putName(fcnname,strlen(fcnname)));
return p;
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx Mon Jul 05 12:31:17 2010 +0200
@@ -600,7 +600,7 @@
}
cur = (Symbol) GDKzalloc(sizeof(SymRecord));
if (cur == NULL) {
- GDKerror(@1:MAL_MALLOC_FAIL);
+ GDKerror(newSymbol:MAL_MALLOC_FAIL);
return NULL;
}
cur-name = putName(nme,strlen(nme));
@@ -990,6 +990,8 @@
}
if (p == NULL) {
p = GDKzalloc(MAXARG * sizeof(p-maxarg) + sizeof(InstrRecord));
+ if (p == NULL)
+ return NULL;
p-maxarg = MAXARG;
}
p-typechk = TYPE_UNKNOWN;
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_profiler.mx
--- a/MonetDB5/src/mal/mal_profiler.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_profiler.mx Mon Jul 05 12:31:17 2010 +0200
@@ -1033,10 +1033,10 @@
}
b = BATnew(TYPE_void, tt, 1 16);
- BATseqbase(b, 0);
if (b == NULL)
return NULL;
+ BATseqbase(b, 0);
BATkey(b, TRUE);
BBPrename(b-batCacheid, buf);
BATmode(b, PERSISTENT);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 1436cc5f795a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1436cc5f795a
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (52 lines):
diff -r 9e20771480ee -r 1436cc5f795a sql/src/server/rel_updates.mx
--- a/sql/src/server/rel_updates.mx Mon Jul 05 14:45:18 2010 +0200
+++ b/sql/src/server/rel_updates.mx Mon Jul 05 16:27:13 2010 +0200
@@ -391,25 +391,37 @@
exp_kind ek = {type_value, card_column, FALSE};
v = rel_value_exp(sql, rel_val, a, sql_sel,
ek);
- if (v) {
- if (rel_val) {
- list *exps =
rel_projections(sql, r, NULL, 0, 1);
- sql_rel *nr =
rel_project(rel_crossproduct(rel_dup(r-l), rel_val, op_join), exps);
- rel_destroy(r);
- r = nr;
- }
- } else {
+
+ if (!v) {
sql-errstr[0] = 0;
sql-session-status = status;
v = rel_value_exp(sql, r, a, sql_sel,
ek);
+ }
+ if (!v || (v = rel_check_type(sql, c-type, v,
type_equal)) == NULL) {
+ if (v)
+ exp_destroy(v);
+ rel_destroy(r);
+ return NULL;
+ }
+ if (rel_val) {
+ sql_rel *nr;
+ list *exps;
+
+ if (!exp_name(v))
+ exp_label(v, ++sql-label);
+ rel_val = rel_project(rel_val,
rel_projections(sql, rel_val, NULL, 0, 1));
+ rel_project_add_exp(sql, rel_val, v);
+ exps = rel_projections(sql, r, NULL, 0,
1);
+ nr =
rel_project(rel_crossproduct(rel_dup(r-l), rel_val, op_join), exps);
+ rel_destroy(r);
+ r = nr;
+ v = exp_column(NULL, exp_name(v),
exp_subtype(v), v-card, has_nil(v), is_intern(v));
}
} else {
v = exp_atom(atom_general(c-type, NULL, 0));
}
- if (!v || (v = rel_check_type(sql, c-type, v,
type_equal)) == NULL) {
- if (v)
- exp_destroy(v);
+ if (!v) {
rel_destroy(r);
return NULL;
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Implemented dumping of GRANTs to columns/tables.
Changeset: 4c2084c2a824 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c2084c2a824
Modified Files:
clients/src/mapiclient/dump.c
Branch: Jun2010
Log Message:
Implemented dumping of GRANTs to columns/tables.
This fixes bug 2574.
diffs (173 lines):
diff -r 5d02f4983b31 -r 4c2084c2a824 clients/src/mapiclient/dump.c
--- a/clients/src/mapiclient/dump.c Mon Jul 05 16:08:26 2010 +0200
+++ b/clients/src/mapiclient/dump.c Mon Jul 05 17:34:13 2010 +0200
@@ -992,6 +992,41 @@
WHERE \a1\.\id\ = \ur\.\login_id\ AND
\a2\.\id\ = \ur\.\role_id\
ORDER BY \a1\.\name\, \a2\.\name\;
+ const char *table_grants = SELECT \s\.\name\, \t\.\name\,
+\a\.\name\,
+CASE WHEN \p\.\privileges\ = 1 THEN 'SELECT'
+ WHEN \p\.\privileges\ = 2 THEN 'UPDATE'
+ WHEN \p\.\privileges\ = 4 THEN 'INSERT'
+ WHEN \p\.\privileges\ = 8 THEN 'DELETE'
+ WHEN \p\.\privileges\ = 16 THEN 'EXECUTE'
+ WHEN \p\.\privileges\ = 32 THEN 'GRANT' END,
+\g\.\name\, \p\.\grantable\
+ FROM \sys\.\schemas\ \s\, \sys\.\tables\ \t\,
+\sys\.\auths\ \a\, \sys\.\privileges\ \p\,
+\sys\.\auths\ \g\
+ WHERE \p\.\obj_id\ = \t\.\id\ AND
+ \p\.\auth_id\ = \a\.\id\ AND
+ \t\.\schema_id\ = \s\.\id\ AND
+ \t\.\system\ = FALSE AND
+ \p\.\grantor\ = \g\.\id\;
+ const char *column_grants = SELECT \s\.\name\, \t\.\name\,
+\c\.\name\, \a\.\name\,
+CASE WHEN \p\.\privileges\ = 1 THEN 'SELECT'
+ WHEN \p\.\privileges\ = 2 THEN 'UPDATE'
+ WHEN \p\.\privileges\ = 4 THEN 'INSERT'
+ WHEN \p\.\privileges\ = 8 THEN 'DELETE'
+ WHEN \p\.\privileges\ = 16 THEN 'EXECUTE'
+ WHEN \p\.\privileges\ = 32 THEN 'GRANT' END,
+\g\.\name\, \p\.\grantable\
+ FROM \sys\.\schemas\ \s\, \sys\.\tables\ \t\,
+\sys\.\columns\ \c\, \sys\.\auths\ \a\,
+\sys\.\privileges\ \p\, \sys\.\auths\ \g\
+ WHERE \p\.\obj_id\ = \c\.\id\ AND
+ \c\.\table_id\ = \t\.\id\ AND
+ \p\.\auth_id\ = \a\.\id\ AND
+ \t\.\schema_id\ = \s\.\id\ AND
+ \t\.\system\ = FALSE AND
+ \p\.\grantor\ = \g\.\id\;
const char *schemas = SELECT \s\.\name\, \a\.\name\
FROM \sys\.\schemas\ \s\,
\sys\.\auths\ \a\
@@ -1252,6 +1287,9 @@
quoted_print(toConsole, rname);
stream_printf(toConsole, TO );
quoted_print(toConsole, uname);
+ /* optional WITH ADMIN OPTION and FROM
+ (CURRENT_USER|CURRENT_ROLE) are ignored by
+ server, so we can't dump them */
stream_printf(toConsole, ;\n);
}
if (mapi_error(mid)) {
@@ -1340,13 +1378,13 @@
stream_printf(toConsole, %s\n, func);
}
if (curschema) {
- if (sname == NULL || strcmp(sname, curschema) != 0) {
+ if (strcmp(sname ? sname : sys, curschema) != 0) {
stream_printf(toConsole, SET SCHEMA );
quoted_print(toConsole, sname ? sname : sys);
stream_printf(toConsole, ;\n);
}
free(curschema);
- curschema = NULL;
+ curschema = strdup(sname ? sname : sys);
}
if (mapi_error(mid)) {
mapi_explain_query(hdl, stderr);
@@ -1408,6 +1446,101 @@
mapi_close_handle(hdl);
}
+ if ((hdl = mapi_query(mid, table_grants)) == NULL || mapi_error(mid)) {
+ if (hdl) {
+ mapi_explain_query(hdl, stderr);
+ mapi_close_handle(hdl);
+ } else
+ mapi_explain(mid, stderr);
+ return 1;
+ }
+
+ while (mapi_fetch_row(hdl) != 0) {
+ char *schema = mapi_fetch_field(hdl, 0);
+ char *tname = mapi_fetch_field(hdl, 1);
+ char *aname = mapi_fetch_field(hdl, 2);
+ char *priv = mapi_fetch_field(hdl, 3);
+ char *grantable = mapi_fetch_field(hdl, 5);
+
+ if (sname != NULL strcmp(schema, sname) != 0)
+ continue;
+ if (curschema == NULL || strcmp(schema, curschema) != 0) {
+ if (curschema)
+
MonetDB: default - Merge with Jun2010 branch.
Changeset: 002d12460c66 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=002d12460c66 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (14 lines): diff -r 3453a035be69 -r 002d12460c66 clients/ChangeLog.Jun2010 --- a/clients/ChangeLog.Jun2010 Mon Jul 05 17:35:28 2010 +0200 +++ b/clients/ChangeLog.Jun2010 Mon Jul 05 18:05:28 2010 +0200 @@ -1,6 +1,10 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Mon Jul 5 2010 Sjoerd Mullender sjo...@acm.org +- Implemented dumping of GRANT statements. + This fixes bug 2574. + * Thr Jul 1 2010 Fabian Groffen fab...@cwi.nl - Fix implementation of mapi_mapiuri to deal with UNIX socket urls properly. This fixes one part of Bug #2567. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Pre-release version number update.
Changeset: a78c48160742 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a78c48160742
Modified Files:
MonetDB/MonetDB.spec
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
MonetDB/NT/rules.msc
MonetDB/configure.ag
MonetDB/src/gdk/libbat.rc
MonetDB/vertoo.data
MonetDB4/MonetDB-server.spec
MonetDB4/NT/MonetDB.iss
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
MonetDB4/NT/rules.msc
MonetDB4/VERSION
MonetDB4/configure.ag
MonetDB4/src/monet/libmonet.rc
MonetDB4/vertoo.data
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/NT/rules.msc
MonetDB5/VERSION
MonetDB5/configure.ag
MonetDB5/src/mal/libmonetdb5.rc
MonetDB5/vertoo.data
clients/MonetDB-client.spec
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
clients/NT/rules.msc
clients/configure.ag
clients/src/mapilib/Mapi.rc
clients/src/odbc/driver/driver.rc
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/setup.rc
clients/vertoo.data
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
geom/NT/rules.msc
geom/configure.ag
geom/vertoo.data
java/configure.ag
java/vertoo.data
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/rules.msc
pathfinder/VERSION
pathfinder/configure.ag
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/title.html.in
pathfinder/vertoo.data
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/NT/rules.msc
sql/VERSION
sql/configure.ag
sql/vertoo.data
template/configure.ag
template/vertoo.data
testing/MonetDB-testing.spec
testing/NT/rules.msc
testing/configure.ag
testing/vertoo.data
Branch: Jun2010
Log Message:
Pre-release version number update.
diffs (truncated from 1170 to 300 lines):
diff -r 81cd1d637c34 -r a78c48160742 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jul 06 08:00:52 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jul 06 09:38:05 2010 +0200
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 1.38.2
+%define version 1.38.3
%{!?buildno: %define buildno %(date +%Y%m%d)}
%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
diff -r 81cd1d637c34 -r a78c48160742
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Tue Jul 06 08:00:52
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Tue Jul 06 09:38:05
2010 +0200
@@ -550,7 +550,7 @@
RemovePreviousVersions = 11:TRUE
DetectNewerInstalledVersion = 11:TRUE
InstallAllUsers = 11:TRUE
-ProductVersion = 8:1.38.2
+ProductVersion = 8:1.38.3
Manufacturer = 8:MonetDB
ARPHELPTELEPHONE = 8:
ARPHELPLINK = 8:http://monetdb.cwi.nl/;
@@ -619,7 +619,7 @@
Condition = 8:
Transitive = 11:FALSE
ValueTypes = 3:1
-Value = 8:1.38.2
+Value = 8:1.38.3
}
}
}
diff -r 81cd1d637c34 -r a78c48160742
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Tue Jul 06 08:00:52
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Tue Jul 06 09:38:05
2010 +0200
@@ -550,7 +550,7 @@
RemovePreviousVersions = 11:TRUE
DetectNewerInstalledVersion = 11:TRUE
InstallAllUsers = 11:TRUE
-ProductVersion = 8:1.38.2
+ProductVersion = 8:1.38.3
Manufacturer = 8:MonetDB
ARPHELPTELEPHONE = 8:
MonetDB: default - Merge with Jun2010 branch.
Changeset: 650139cd67ea for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=650139cd67ea Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: Merge with Jun2010 branch. diffs (16 lines): diff -r a9513b8ec372 -r 650139cd67ea sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Tue Jul 06 10:08:08 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Tue Jul 06 12:29:05 2010 +0200 @@ -1,6 +1,12 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Mon Jul 5 2010 Niels Nes ni...@cwi.nl +- Fixed bug in zero_or_one +- Fixed bug in dead code elimination for projections with distinct +- Fixed bug handling join with constant values on both sides (like group results and constants) +- fixed bug in UPDATE TABLE when updating multiple rows + * Wed Jun 30 2010 Stefan Manegold stefan.maneg...@cwi.nl - fixed bug 2564: in case group by column is not found as alias in projection list, ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Fix changelogs.
Changeset: d4ea487a3f1c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4ea487a3f1c Modified Files: MonetDB5/MonetDB-server.spec MonetDB5/debian/changelog Branch: Jun2010 Log Message: Fix changelogs. diffs (66 lines): diff -r 51fd3970103a -r d4ea487a3f1c MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Tue Jul 06 14:06:21 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Tue Jul 06 14:32:12 2010 +0200 @@ -217,18 +217,18 @@ * Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100706 - Rebuilt. -* Thr 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. --- +* 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; --- +- 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. diff -r 51fd3970103a -r d4ea487a3f1c MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Tue Jul 06 14:06:21 2010 +0200 +++ b/MonetDB5/debian/changelog Tue Jul 06 14:32:12 2010 +0200 @@ -6,19 +6,19 @@ 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 Thr, 01 Jul 2010 14:06:18 +0200 + * 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; + * 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 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Preparations for building the Jun2010-SP1 rel...
Changeset: 700a31b47b8a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=700a31b47b8a Modified Files: MonetDB/MonetDB.spec MonetDB/debian/changelog MonetDB4/MonetDB-server.spec MonetDB4/debian/changelog MonetDB5/MonetDB-server.spec MonetDB5/debian/changelog clients/MonetDB-client.spec clients/debian/changelog geom/MonetDB-geom.spec geom/debian/changelog pathfinder/MonetDB-XQuery.spec pathfinder/debian/changelog sql/MonetDB-SQL.spec sql/debian/changelog testing/MonetDB-testing.spec testing/debian/changelog Branch: Jun2010 Log Message: Preparations for building the Jun2010-SP1 release. Moved contents of ChangeLog.Jun2010 to .spec file and debian/changelog. diffs (208 lines): diff -r d4ea487a3f1c -r 700a31b47b8a MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Tue Jul 06 14:32:12 2010 +0200 +++ b/MonetDB/MonetDB.spec Tue Jul 06 14:53:46 2010 +0200 @@ -109,6 +109,9 @@ * Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706 - Rebuilt. +* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706 +- Rebuilt. + * Wed Jun 30 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100630 - Rebuilt. diff -r d4ea487a3f1c -r 700a31b47b8a MonetDB/debian/changelog --- a/MonetDB/debian/changelog Tue Jul 06 14:32:12 2010 +0200 +++ b/MonetDB/debian/changelog Tue Jul 06 14:53:46 2010 +0200 @@ -1,3 +1,9 @@ +monetdb (1.38.3-20100706) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:53:45 +0200 + monetdb (1.38.3-20100706) unstable; urgency=low * Rebuilt. diff -r d4ea487a3f1c -r 700a31b47b8a MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Tue Jul 06 14:32:12 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Tue Jul 06 14:53:46 2010 +0200 @@ -219,6 +219,9 @@ * Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100706 - Rebuilt. +* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100706 +- Rebuilt. + * Wed Jun 30 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100630 - Rebuilt. diff -r d4ea487a3f1c -r 700a31b47b8a MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Tue Jul 06 14:32:12 2010 +0200 +++ b/MonetDB4/debian/changelog Tue Jul 06 14:53:46 2010 +0200 @@ -1,3 +1,9 @@ +monetdb4-server (4.38.3-20100706) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:53:45 +0200 + monetdb4-server (4.38.3-20100706) unstable; urgency=low * Rebuilt. diff -r d4ea487a3f1c -r 700a31b47b8a MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Tue Jul 06 14:32:12 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Tue Jul 06 14:53:46 2010 +0200 @@ -217,6 +217,9 @@ * Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100706 - Rebuilt. +* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100706 +- Rebuilt. + * 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. diff -r d4ea487a3f1c -r 700a31b47b8a MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Tue Jul 06 14:32:12 2010 +0200 +++ b/MonetDB5/debian/changelog Tue Jul 06 14:53:46 2010 +0200 @@ -1,3 +1,9 @@ +monetdb5-server (5.20.3-20100706) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:53:45 +0200 + monetdb5-server (5.20.3-20100706) unstable; urgency=low * Rebuilt. diff -r d4ea487a3f1c -r 700a31b47b8a clients/MonetDB-client.spec --- a/clients/MonetDB-client.spec Tue Jul 06 14:32:12 2010 +0200 +++ b/clients/MonetDB-client.spec Tue Jul 06 14:53:46 2010 +0200 @@ -336,6 +336,9 @@ * Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706 - Rebuilt. +* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706 +- Rebuilt. + * Mon Jul 5 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706 -- - Implemented dumping of GRANT statements. -- This fixes bug 2574. diff -r d4ea487a3f1c -r 700a31b47b8a clients/debian/changelog --- a/clients/debian/changelog Tue Jul 06 14:32:12 2010 +0200 +++ b/clients/debian/changelog Tue Jul 06 14:53:46 2010 +0200 @@ -1,3 +1,9 @@ +monetdb-client (1.38.3-20100706) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:53:45 +0200 + monetdb-client (1.38.3-20100706) unstable; urgency=low * Rebuilt. diff -r d4ea487a3f1c -r 700a31b47b8a geom/MonetDB-geom.spec --- a/geom/MonetDB-geom.specTue Jul 06 14:32:12 2010 +0200 +++ b/geom/MonetDB-geom.specTue Jul 06 14:53:46 2010 +0200 @@ -175,6 +175,9 @@ * Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 0.18.3-20100706 - Rebuilt. +* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 0.18.3-20100706 +- Rebuilt. + * Wed Jun 30 2010 Sjoerd Mullender sjo...@acm.org
MonetDB: Jun2010 - Preparations for building the Jun2010-SP1 rel...
Changeset: 2077db505b7c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2077db505b7c
Modified Files:
MonetDB/MonetDB.spec
MonetDB/debian/changelog
MonetDB4/MonetDB-server.spec
MonetDB4/debian/changelog
MonetDB5/ChangeLog.Jun2010
MonetDB5/MonetDB-server.spec
MonetDB5/debian/changelog
clients/ChangeLog.Jun2010
clients/MonetDB-client.spec
clients/debian/changelog
geom/MonetDB-geom.spec
geom/debian/changelog
pathfinder/MonetDB-XQuery.spec
pathfinder/debian/changelog
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/debian/changelog
testing/MonetDB-testing.spec
testing/debian/changelog
Branch: Jun2010
Log Message:
Preparations for building the Jun2010-SP1 release.
Moved contents of ChangeLog.Jun2010 to .spec file and debian/changelog.
diffs (truncated from 412 to 300 lines):
diff -r 9b0d1d51dd52 -r 2077db505b7c MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jul 06 13:33:27 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jul 06 14:06:19 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}-XX)
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100630
- Rebuilt.
diff -r 9b0d1d51dd52 -r 2077db505b7c MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Jul 06 13:33:27 2010 +0200
+++ b/MonetDB/debian/changelog Tue Jul 06 14:06:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.3-20100706) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:06:18 +0200
+
monetdb (1.38.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r 9b0d1d51dd52 -r 2077db505b7c MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Jul 06 13:33:27 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Jul 06 14:06:19 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}-XX)
Requires(pre): shadow-utils
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100706
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100630
- Rebuilt.
diff -r 9b0d1d51dd52 -r 2077db505b7c MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jul 06 13:33:27 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jul 06 14:06:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.3-20100706) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:06:18 +0200
+
monetdb4-server (4.38.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r 9b0d1d51dd52 -r 2077db505b7c MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Tue Jul 06 13:33:27 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Tue Jul 06 14:06:19 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 9b0d1d51dd52 -r 2077db505b7c MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Jul 06 13:33:27 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Tue Jul 06 14:06:19 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
MonetDB: Jun2010 - Setting tag Jun2010_3 for the release build.
Changeset: 0fe0af0bbce2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0fe0af0bbce2 Modified Files: .hgtags Branch: Jun2010 Log Message: Setting tag Jun2010_3 for the release build. diffs (9 lines): diff -r 700a31b47b8a -r 0fe0af0bbce2 .hgtags --- a/.hgtags Tue Jul 06 14:53:46 2010 +0200 +++ b/.hgtags Tue Jul 06 14:53:47 2010 +0200 @@ -413,3 +413,5 @@ c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1 e042ecc2e895b1bb5f06da65d0db6a8756cdb6d3 Jun2010_1 2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3 +2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3 +700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Fix changelogs.
Changeset: c14958692d3b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c14958692d3b
Modified Files:
MonetDB/MonetDB.spec
MonetDB/debian/changelog
MonetDB4/MonetDB-server.spec
MonetDB4/debian/changelog
MonetDB5/MonetDB-server.spec
MonetDB5/debian/changelog
clients/MonetDB-client.spec
clients/debian/changelog
geom/MonetDB-geom.spec
geom/debian/changelog
pathfinder/MonetDB-XQuery.spec
pathfinder/debian/changelog
sql/MonetDB-SQL.spec
sql/debian/changelog
testing/MonetDB-testing.spec
testing/debian/changelog
Branch: Jun2010
Log Message:
Fix changelogs.
diffs (truncated from 354 to 300 lines):
diff -r 0fe0af0bbce2 -r c14958692d3b MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jul 06 14:53:47 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jul 06 17:11:00 2010 +0200
@@ -106,12 +106,6 @@
%{_libdir}/libbat.so
%changelog
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706
-- Rebuilt.
-
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706
-- Rebuilt.
-
* Wed Jun 30 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100630
- Rebuilt.
diff -r 0fe0af0bbce2 -r c14958692d3b MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Jul 06 14:53:47 2010 +0200
+++ b/MonetDB/debian/changelog Tue Jul 06 17:11:00 2010 +0200
@@ -1,15 +1,3 @@
-monetdb (1.38.3-20100706) unstable; urgency=low
-
- * Rebuilt.
-
- -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:53:45 +0200
-
-monetdb (1.38.3-20100706) unstable; urgency=low
-
- * Rebuilt.
-
- -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:06:18 +0200
-
monetdb (1.38.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r 0fe0af0bbce2 -r c14958692d3b MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Jul 06 14:53:47 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Jul 06 17:11:00 2010 +0200
@@ -216,12 +216,6 @@
%{_libdir}/libembeddedmil.so
%changelog
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100706
-- Rebuilt.
-
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100706
-- Rebuilt.
-
* Wed Jun 30 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100630
- Rebuilt.
diff -r 0fe0af0bbce2 -r c14958692d3b MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jul 06 14:53:47 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jul 06 17:11:00 2010 +0200
@@ -1,15 +1,3 @@
-monetdb4-server (4.38.3-20100706) unstable; urgency=low
-
- * Rebuilt.
-
- -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:53:45 +0200
-
-monetdb4-server (4.38.3-20100706) unstable; urgency=low
-
- * Rebuilt.
-
- -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:06:18 +0200
-
monetdb4-server (4.38.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r 0fe0af0bbce2 -r c14958692d3b MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Jul 06 14:53:47 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Tue Jul 06 17:11:00 2010 +0200
@@ -214,12 +214,6 @@
%{_libdir}/*.so
%changelog
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100706
-- Rebuilt.
-
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100706
-- Rebuilt.
-
* 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.
diff -r 0fe0af0bbce2 -r c14958692d3b MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jul 06 14:53:47 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jul 06 17:11:00 2010 +0200
@@ -1,15 +1,3 @@
-monetdb5-server (5.20.3-20100706) unstable; urgency=low
-
- * Rebuilt.
-
- -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:53:45 +0200
-
-monetdb5-server (5.20.3-20100706) unstable; urgency=low
-
- * Rebuilt.
-
- -- Sjoerd Mullender sjo...@acm.org Tue, 06 Jul 2010 14:06:18 +0200
-
monetdb5-server (5.20.3-20100706) unstable; urgency=low
* Return a correct URI for local connection from Sabaoth when the
diff -r 0fe0af0bbce2 -r c14958692d3b clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Tue Jul 06 14:53:47 2010 +0200
+++ b/clients/MonetDB-client.spec Tue Jul 06 17:11:00 2010 +0200
@@ -333,19 +333,14 @@
%{_libdir}/MonetDB/Tests/*
%changelog
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706
-- Rebuilt.
+* Mon Jul 5 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706
+- Implemented dumping of GRANT statements.
+ This fixes bug 2574.
-* Tue Jul 06 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706
-- Rebuilt.
+* Thu Jul 1 2010 Fabian Groffen fab...@cwi.nl - 1.38.3-20100706
+- Fix implementation of mapi_mapiuri to deal with UNIX socket urls
+ properly. This fixes one part of Bug #2567.
-* Mon Jul 5 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100706
--- - Implemented dumping of GRANT
MonetDB: Jun2010 - Merge.
Changeset: 8b0a5fc397e4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b0a5fc397e4 Modified Files: Branch: Jun2010 Log Message: Merge. diffs (172 lines): diff -r c14958692d3b -r 8b0a5fc397e4 MonetDB5/src/modules/kernel/calc.mx --- a/MonetDB5/src/modules/kernel/calc.mx Tue Jul 06 17:11:00 2010 +0200 +++ b/MonetDB5/src/modules/kernel/calc.mx Tue Jul 06 17:17:16 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 c14958692d3b -r 8b0a5fc397e4 MonetDB5/src/modules/mal/Tests/inspect05.stable.out --- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Tue Jul 06 17:11:00 2010 +0200 +++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Tue Jul 06 17:17:16 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,
MonetDB: Jun2010 - Change default behavior of Maddlog.
Changeset: f34be2082de4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f34be2082de4
Modified Files:
buildtools/conf/Maddlog
Branch: Jun2010
Log Message:
Change default behavior of Maddlog.
By default, don't commit, but remind people that they have to commit.
Also remind people that the have to push.
diffs (47 lines):
diff -r 8b0a5fc397e4 -r f34be2082de4 buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog Tue Jul 06 17:17:16 2010 +0200
+++ b/buildtools/conf/Maddlog Tue Jul 06 17:36:13 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.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.: Change default be...
Changeset: 94a4f2d07c5a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94a4f2d07c5a
Modified Files:
Branch: default
Log Message:
Merge from Jun2010 branch.: Change default behavior of Maddlog.
By default, don't commit, but remind people that they have to commit.
Also remind people that the have to push.
diffs (47 lines):
diff -r f2c4b449e6fd -r 94a4f2d07c5a buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog Tue Jul 06 17:17:40 2010 +0200
+++ b/buildtools/conf/Maddlog Tue Jul 06 17:36:54 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.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Fix keeping track of line numbers in Mx.
Changeset: e69a9cb8ca3d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e69a9cb8ca3d
Modified Files:
buildtools/Mx/Io.c
Branch: Jun2010
Log Message:
Fix keeping track of line numbers in Mx.
Line numers were off by one after an @include directive.
diffs (20 lines):
diff -r a0555ac4acde -r e69a9cb8ca3d buildtools/Mx/Io.c
--- a/buildtools/Mx/Io.cWed Jul 07 10:21:48 2010 +0200
+++ b/buildtools/Mx/Io.cWed Jul 07 10:26:11 2010 +0200
@@ -410,14 +410,15 @@
char *
NextLine(void)
{
- mx_line++;
if (fullbuf) {
+ mx_line++;
fullbuf = 0;
return linebuf;
} else {
char *s, *t;
do {
+ mx_line++;
s = fgets(linebuf, MAXLINE, ifile);
} while (s == NULL !EofFile());
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: e49ebce55b48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e49ebce55b48
Modified Files:
sql/ChangeLog.Jun2010
sql/src/server/rel_bin.mx
sql/src/server/rel_optimizer.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 529 to 300 lines):
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Code.c Wed Jul 07 10:27:21 2010 +0200
@@ -41,7 +41,8 @@
char *s;
fname = d-d_cmd;
- for (s = fname; *s !isspace((int) (*s)); s++) ;
+ for (s = fname; *s !isspace((int) (*s)); s++)
+ ;
if (isspace((int) (*s)))
*s = 0;
if (s == fname) {
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Def.c Wed Jul 07 10:27:21 2010 +0200
@@ -111,7 +111,8 @@
d = NwDef(Bfile, mod, sec, 0, mx_file);
d-d_cmd = name;
- while ((line = NextLine()) *line != '@') ;
+ while ((line = NextLine()) *line != '@')
+ ;
PrevLine();
while (!EofFile()) {
dir = DefDir();
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Display.c
--- a/buildtools/Mx/Display.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Display.c Wed Jul 07 10:27:21 2010 +0200
@@ -144,7 +144,8 @@
/* find out the full name in 'full', the basename in 's', end in 't' */
strncpy(full, file, sizeof(full));
- for (s = full; s[1]; s++) ;
+ for (s = full; s[1]; s++)
+ ;
while (s = full *s != DIR_SEP
#ifdef WIN32
*s != '/'
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Form.c Wed Jul 07 10:27:21 2010 +0200
@@ -52,7 +52,8 @@
char *getlogin();
char *dstbak = NULL;
- for (d = defs; d defs + ndef (d-d_dir != Bfile); dirbak =
d-d_dir, d++) ;
+ for (d = defs; d defs + ndef (d-d_dir != Bfile); dirbak =
d-d_dir, d++)
+ ;
for (; d defs + ndef; dirbak = d-d_dir, d++) {
codeline = d-d_line;
again:switch (d-d_dir) {
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Io.c
--- a/buildtools/Mx/Io.cWed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Io.cWed Jul 07 10:27:21 2010 +0200
@@ -410,14 +410,15 @@
char *
NextLine(void)
{
- mx_line++;
if (fullbuf) {
+ mx_line++;
fullbuf = 0;
return linebuf;
} else {
char *s, *t;
do {
+ mx_line++;
s = fgets(linebuf, MAXLINE, ifile);
} while (s == NULL !EofFile());
diff -r a087e83ab53e -r e49ebce55b48 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Wed Jul 07 10:27:21 2010 +0200
@@ -1,3 +1,8 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Wed Jul 7 2010 Niels Nes ni...@cwi.nl
+- Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
+- Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
+- Fixed bug 2583 + added test. The assert was incorrect.
+
diff -r a087e83ab53e -r e49ebce55b48 sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/src/server/rel_bin.mx Wed Jul 07 10:27:21 2010 +0200
@@ -182,9 +182,9 @@
are_equality_exps( list *exps )
{
if (list_length(exps) == 1) {
- sql_exp *e = exps-h-data, *re = e-r;
-
- if (e-type == e_cmp e-flag == cmp_equal re-card ==
CARD_ATOM)
+ sql_exp *e = exps-h-data, *le = e-l, *re = e-r;
+
+ if (e-type == e_cmp e-flag == cmp_equal le-card !=
CARD_ATOM re-card == CARD_ATOM)
return 1;
if (e-type == e_cmp e-flag == cmp_or)
return (are_equality_exps(e-l)
diff -r a087e83ab53e -r e49ebce55b48 sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/src/server/rel_optimizer.mx Wed Jul 07 10:27:21 2010 +0200
@@ -3315,7 +3315,6 @@
}
}
}
- assert(list_length(exps) == list_length(es));
/* fix the destroy function */
cols-destroy = NULL;
list_destroy(cols);
diff -r a087e83ab53e -r
MonetDB: default - Merge with Jun2010 branch.
Changeset: cde674e2ec28 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cde674e2ec28 Modified Files: .hgignore Branch: default Log Message: Merge with Jun2010 branch. diffs (18 lines): diff -r e49ebce55b48 -r cde674e2ec28 .hgignore --- a/.hgignore Wed Jul 07 10:27:21 2010 +0200 +++ b/.hgignore Wed Jul 07 10:32:38 2010 +0200 @@ -34,12 +34,14 @@ ^buildtools/burg/gram\.[ch]$ ^buildtools/burg/y\.tab\.h$ ^buildtools/burg/ylwrap$ +^buildtools/depcomp$ ^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/ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Approve after recent fix in msqldump.
Changeset: a5c01de6d739 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5c01de6d739 Modified Files: sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out Branch: Jun2010 Log Message: Approve after recent fix in msqldump. diffs (11 lines): diff -r ed24a794e857 -r a5c01de6d739 sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out --- a/sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out Wed Jul 07 10:32:22 2010 +0200 +++ b/sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out Wed Jul 07 12:44:53 2010 +0200 @@ -115,7 +115,6 @@ CREATE INDEX triples_subject_idx ON sys.triples (subject); CREATE INDEX triples_subject_object_idx ON sys.triples (subject, object); CREATE INDEX triples_subject_predicate_idx ON sys.triples (subject, predicate); -SET SCHEMA sys; ALTER TABLE sys.foreign ADD CONSTRAINT foreign_id_fkey FOREIGN KEY (id) REFERENCES sys.allnewtriples (id); ALTER TABLE sys.foreign ADD CONSTRAINT foreign_subject_predicate_object_fkey FOREIGN KEY (subject, predicate, object) REFERENCES sys.allnewtriples (subject, predicate, object); COMMIT; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - Some updates to buildtools/doc.
Changeset: 3bbc38aeb286 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3bbc38aeb286 Modified Files: .hgignore buildtools/doc/Makefile Branch: Jun2010 Log Message: Some updates to buildtools/doc. Added rules to create .pdf versions from .rst files. Use rst2html instead of rst2htmlpy. Add resulting files to .hgignore. diffs (34 lines): diff -r a5c01de6d739 -r 3bbc38aeb286 .hgignore --- a/.hgignore Wed Jul 07 12:44:53 2010 +0200 +++ b/.hgignore Wed Jul 07 13:26:24 2010 +0200 @@ -34,6 +34,10 @@ ^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$ diff -r a5c01de6d739 -r 3bbc38aeb286 buildtools/doc/Makefile --- a/buildtools/doc/Makefile Wed Jul 07 12:44:53 2010 +0200 +++ b/buildtools/doc/Makefile Wed Jul 07 13:26:24 2010 +0200 @@ -1,7 +1,13 @@ -all: HowToRelease.html windowsbuild.html +all: HowToRelease.html windowsbuild.html HowToRelease.pdf windowsbuild.pdf HowToRelease.html: HowToRelease.rst - rst2html.py HowToRelease.rst HowToRelease.html + rst2html HowToRelease.rst HowToRelease.html windowsbuild.html: windowsbuild.rst - rst2html.py windowsbuild.rst windowsbuild.html + rst2html windowsbuild.rst windowsbuild.html + +HowToRelease.pdf: HowToRelease.rst + rst2pdf HowToRelease.rst + +windowsbuild.pdf: windowsbuild.rst + rst2pdf windowsbuild.rst ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 26e5652ee43a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26e5652ee43a
Modified Files:
.hgignore
sql/ChangeLog.Jun2010
sql/src/server/sql_parser.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (89 lines):
diff -r 4382914beeb2 -r 26e5652ee43a .hgignore
--- a/.hgignore Wed Jul 07 12:45:14 2010 +0200
+++ b/.hgignore Wed Jul 07 13:29:10 2010 +0200
@@ -35,6 +35,10 @@
^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$
diff -r 4382914beeb2 -r 26e5652ee43a buildtools/doc/Makefile
--- a/buildtools/doc/Makefile Wed Jul 07 12:45:14 2010 +0200
+++ b/buildtools/doc/Makefile Wed Jul 07 13:29:10 2010 +0200
@@ -1,7 +1,13 @@
-all: HowToRelease.html windowsbuild.html
+all: HowToRelease.html windowsbuild.html HowToRelease.pdf windowsbuild.pdf
HowToRelease.html: HowToRelease.rst
- rst2html.py HowToRelease.rst HowToRelease.html
+ rst2html HowToRelease.rst HowToRelease.html
windowsbuild.html: windowsbuild.rst
- rst2html.py windowsbuild.rst windowsbuild.html
+ rst2html windowsbuild.rst windowsbuild.html
+
+HowToRelease.pdf: HowToRelease.rst
+ rst2pdf HowToRelease.rst
+
+windowsbuild.pdf: windowsbuild.rst
+ rst2pdf windowsbuild.rst
diff -r 4382914beeb2 -r 26e5652ee43a sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Wed Jul 07 12:45:14 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Wed Jul 07 13:29:10 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Wed Jul 7 2010 Fabian Groffen fab...@cwi.nl
+- Make TEXT a separate keyword, separating it from CLOB, such that we can
sloppily allow TEXT to appear as a column name, since it seems not to be in the
standard as reserved keyword.
+
* Wed Jul 7 2010 Niels Nes ni...@cwi.nl
- Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
- Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
diff -r 4382914beeb2 -r 26e5652ee43a sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx Wed Jul 07 12:45:14 2010 +0200
+++ b/sql/src/server/sql_parser.mx Wed Jul 07 13:29:10 2010 +0200
@@ -642,7 +642,7 @@
IDENT aTYPE ALIAS AGGR RANK sqlINT HEXADECIMAL INTNUM APPROXNUM
USING
ALL ANY SOME GLOBAL CAST CONVERT
- CHARACTER VARYING LARGE OBJECT VARCHAR CLOB BINARY sqlBLOB
+ CHARACTER VARYING LARGE OBJECT VARCHAR CLOB TEXT BINARY sqlBLOB
sqlDECIMAL sqlFLOAT
TINYINT SMALLINT BIGINT sqlINTEGER
sqlDOUBLE sqlREAL PRECISION PARTIAL SIMPLE ACTION CASCADE RESTRICT
@@ -4542,6 +4542,7 @@
clob:
CLOB{ $$ = $1; }
+ | TEXT{ $$ = $1; }
| CHARACTER LARGE OBJECT { $$ = $1; }
;
blob:
@@ -4605,6 +4606,7 @@
| SQL_EXPLAIN { $$ = sa_strdup(SA, explain); }
| SQL_DEBUG { $$ = sa_strdup(SA, debug); }
| SQL_TRACE { $$ = sa_strdup(SA, trace); }
+| TEXT{ $$ = sa_strdup(SA, text); }
| AUTO_COMMIT { $$ = sa_strdup(SA, auto_commit); }
/* SQL/XML non reserved words */
| STRIP { $$ = sa_strdup(SA, strip); }
diff -r 4382914beeb2 -r 26e5652ee43a sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mxWed Jul 07 12:45:14 2010 +0200
+++ b/sql/src/server/sql_scan.mxWed Jul 07 13:29:10 2010 +0200
@@ -119,8 +119,8 @@
keywords_insert(OBJECT, OBJECT);
keywords_insert(CLOB, CLOB);
keywords_insert(BLOB, sqlBLOB);
- keywords_insert(TEXT, CLOB);
- keywords_insert(TINYTEXT, CLOB);
+ keywords_insert(TEXT, TEXT);
+ keywords_insert(TINYTEXT, TEXT);
keywords_insert(STRING, CLOB);/* ? */
keywords_insert(CHECK, CHECK);
keywords_insert(CONSTRAINT, CONSTRAINT);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2010 - If dumping fails (e.g. because of closed pipe...
Changeset: c037e4ad579e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c037e4ad579e
Modified Files:
clients/src/mapiclient/dump.c
Branch: Jun2010
Log Message:
If dumping fails (e.g. because of closed pipe in \|less), rollback our
transaction.
diffs (truncated from 405 to 300 lines):
diff -r ca44e0299890 -r c037e4ad579e clients/src/mapiclient/dump.c
--- a/clients/src/mapiclient/dump.c Wed Jul 07 14:12:50 2010 +0200
+++ b/clients/src/mapiclient/dump.c Wed Jul 07 14:38:33 2010 +0200
@@ -1109,32 +1109,20 @@
if (!describe)
stream_printf(toConsole, START TRANSACTION;\n);
- if ((hdl = mapi_query(mid, start)) == NULL || mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, start)) == NULL || mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
sname = get_schema(mid);
if (sname == NULL)
- return 1;
+ goto bailout2;
if (strcmp(sname, sys) == 0 || strcmp(sname, tmp) == 0) {
free(sname);
sname = NULL;
/* dump roles */
- if ((hdl = mapi_query(mid, roles)) == NULL || mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, roles)) == NULL || mapi_error(mid))
+ goto bailout;
while (mapi_fetch_row(hdl) != 0) {
char *name = mapi_fetch_field(hdl, 0);
@@ -1143,46 +1131,26 @@
quoted_print(toConsole, name);
stream_printf(toConsole, ;\n);
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return 1;
- }
+ if (mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
/* dump users, part 1 */
/* first make sure the password_hash function exists */
- if ((hdl = mapi_query(mid, chkhash)) == NULL ||
mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, chkhash)) == NULL || mapi_error(mid))
+ goto bailout;
create_hash_func = mapi_rows_affected(hdl) == 0;
mapi_close_handle(hdl);
if (create_hash_func) {
- if ((hdl = mapi_query(mid, createhash)) == NULL ||
mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, createhash)) == NULL ||
+ mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
}
- if ((hdl = mapi_query(mid, users1)) == NULL || mapi_error(mid))
{
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, users1)) == NULL || mapi_error(mid))
+ goto bailout;
while (mapi_fetch_row(hdl) != 0) {
char *uname = mapi_fetch_field(hdl, 0);
@@ -1193,35 +1161,22 @@
quoted_print(toConsole, uname);
stream_printf(toConsole, WITH ENCRYPTED PASSWORD '%s'
NAME '%s' SCHEMA \sys\;\n, pwhash, fullname);
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return 1;
- }
+ if (mapi_error(mid))
+ goto
MonetDB: default - Merge with Jun2010 branch.
Changeset: c2fce286eb95 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2fce286eb95
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
If dumping fails (e.g. because of closed pipe in \|less), rollback our
transaction.
diffs (truncated from 405 to 300 lines):
diff -r 5e050ef2e154 -r c2fce286eb95 clients/src/mapiclient/dump.c
--- a/clients/src/mapiclient/dump.c Wed Jul 07 14:13:43 2010 +0200
+++ b/clients/src/mapiclient/dump.c Wed Jul 07 15:09:15 2010 +0200
@@ -1109,32 +1109,20 @@
if (!describe)
stream_printf(toConsole, START TRANSACTION;\n);
- if ((hdl = mapi_query(mid, start)) == NULL || mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, start)) == NULL || mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
sname = get_schema(mid);
if (sname == NULL)
- return 1;
+ goto bailout2;
if (strcmp(sname, sys) == 0 || strcmp(sname, tmp) == 0) {
free(sname);
sname = NULL;
/* dump roles */
- if ((hdl = mapi_query(mid, roles)) == NULL || mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, roles)) == NULL || mapi_error(mid))
+ goto bailout;
while (mapi_fetch_row(hdl) != 0) {
char *name = mapi_fetch_field(hdl, 0);
@@ -1143,46 +1131,26 @@
quoted_print(toConsole, name);
stream_printf(toConsole, ;\n);
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return 1;
- }
+ if (mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
/* dump users, part 1 */
/* first make sure the password_hash function exists */
- if ((hdl = mapi_query(mid, chkhash)) == NULL ||
mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, chkhash)) == NULL || mapi_error(mid))
+ goto bailout;
create_hash_func = mapi_rows_affected(hdl) == 0;
mapi_close_handle(hdl);
if (create_hash_func) {
- if ((hdl = mapi_query(mid, createhash)) == NULL ||
mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, createhash)) == NULL ||
+ mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
}
- if ((hdl = mapi_query(mid, users1)) == NULL || mapi_error(mid))
{
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, users1)) == NULL || mapi_error(mid))
+ goto bailout;
while (mapi_fetch_row(hdl) != 0) {
char *uname = mapi_fetch_field(hdl, 0);
@@ -1193,35 +1161,22 @@
quoted_print(toConsole, uname);
stream_printf(toConsole, WITH ENCRYPTED PASSWORD '%s'
NAME '%s' SCHEMA \sys\;\n, pwhash, fullname);
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return 1;
- }
+ if (mapi_error(mid))
+ goto bailout;
