Changeset: 32e2fd652698 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32e2fd652698 Modified Files: sql/src/backends/monet5/sql.mx sql/src/sql/admin.sql sql/src/sql/bbp.sql sql/src/sql/stats.sql sql/src/test/Skyserver/Skyserver_dropCache.sql Branch: default Log Message:
merged diffs (truncated from 784 to 300 lines): diff -r 48c4879cc71d -r 32e2fd652698 MonetDB/ChangeLog.Feb2010 --- a/MonetDB/ChangeLog.Feb2010 Fri May 07 15:40:27 2010 +0200 +++ b/MonetDB/ChangeLog.Feb2010 Fri May 07 15:41:32 2010 +0200 @@ -1,3 +1,6 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Fri May 7 2010 Fabian Groffen <fab...@cwi.nl> +- Updated HowToStart.rst for our move from SourceForge for sources, + trackers and downloads. diff -r 48c4879cc71d -r 32e2fd652698 MonetDB/HowToStart.rst --- a/MonetDB/HowToStart.rst Fri May 07 15:40:27 2010 +0200 +++ b/MonetDB/HowToStart.rst Fri May 07 15:41:32 2010 +0200 @@ -20,7 +20,7 @@ a native Windows system (NT, 2000, XP) see the instructions in the file `../buildtools/doc/windowsbuild.rst`__. -__ http://sourceforge.net/project/showfiles.php?group_id=56967 +__ http://monetdb.cwi.nl/downloads/ __ Windows-Installation.html The Suite @@ -70,25 +70,24 @@ Prerequisites ------------- -CVS - You only need this if you are building from CVS. If you start - with the source distribution from `SourceForge`__ you don't - need CVS. +Mercurial + You only need this if you are building directly from our version + control system. If you start with the source distribution from `our + download page`__ you don't need Mercurial. - You need to have a working CVS. For instructions, see `the - SourceForge documentation`__ and look under the heading CVS - Instructions. + You need to have a working Mercurial (hg) and clone the main + repository from: http://dev.monetdb.org/hg Python MonetDB uses Python (version 2.0.0 or better) during configuration of the software. See http://www.python.org/ for more information. (It must be admitted, version 2.0.0 is ancient and has not recently been tested, we currently use - 2.4 and newer.) + 2.6 and newer.) autoconf/automake/libtool - MonetDB uses GNU autoconf__ (>= 2.57) and automake__ (>= 1.5) - during the Bootstrap_ phase, and libtool__ (>= 1.4) during the + MonetDB uses GNU autoconf__ (>= 2.60) and automake__ (>= 1.10) + during the Bootstrap_ phase, and libtool__ (>= 1.5) during the Make_ phase. autoconf and automake are not needed when you start with the source distribution. @@ -120,16 +119,11 @@ These tools are not needed when you start with the source distribution. - Before building any of the other packages from the CVS + Before building any of the other packages from the Mercurial sources, you first need to build and install the buildtools. - Check out buildtools with - - :: - - cvs -d:pserver:anonym...@monetdb.cvs.sourceforge.net:/cvsroot/monetdb checkout buildtools - - and follow the instructions in the README file, then proceed - with MonetDB. For this step only you need the C++ compiler. + You can find them in the directory `buildtools`. + Follow the instructions in the README file, then proceed + with MonetDB. Only for this step you need the C++ compiler. libxml2 The XML parsing library `libxml2`__ is only used by @@ -143,8 +137,7 @@ document loader will not be compiled at all in that case. Current Linux distributions all come with libxml2. -__ http://sourceforge.net/project/showfiles.php?group_id=56967 -__ http://sourceforge.net/docman/?group_id=1 +__ http://monetdb.cwi.nl/downloads/sources/ __ http://www.gnu.org/software/autoconf/ __ http://www.gnu.org/software/automake/ __ http://www.gnu.org/software/libtool/ @@ -178,41 +171,29 @@ (1) checking it out from the CVS repository on SourceForge; (2) downloading the pre-packaged source distribution from - SourceForge__. + `our download page`__. The following instructions first describe how to check out the source code from the CVS repository on SourceForge; in case you downloaded the pre-packaged source distribution, you can skip this section and proceed to `Bootstrap, Configure and Make`_. -__ http://sourceforge.net/project/showfiles.php?group_id=56967 +__ http://monetdb.cwi.nl/downloads/ -CVS checkout -~~~~~~~~~~~~ +Mercurial clone +~~~~~~~~~~~~~~~ -This command should be done once. It records a password on the local -machine to be used for all subsequent CVS accesses with this server. +This command should be done once. It makes an initial copy of the +development sources on your computer. :: - cvs -d:pserver:anonym...@monetdb.cvs.sourceforge.net:/cvsroot/monetdb login + hg clone http://dev.monetdb.org/hg/MonetDB -Just type RETURN when asked for the password. +This will create the directory MonetDB in your current working directory +with underneath all subcomponents. Then first follow the instructions +in ``buildtools/README`` before continuing with the others. -Then get the software by using the command:: - - cvs -d:pserver:anonym...@monetdb.cvs.sourceforge.net:/cvsroot/monetdb checkout \ - buildtools MonetDB clients MonetDB4 MonetDB5 pathfinder sql - -This will create the named directories in your current working -directory. Then first follow the instructions in -``buildtools/README`` before continuing with the others. Naturally, -you don't need to check out packages you're not going to use. - -Also see `the SourceForge documentation`__ for more information about -using CVS. - -__ http://sourceforge.net/cvs/?group_id=56967 Bootstrap, Configure and Make ----------------------------- @@ -277,24 +258,12 @@ --enable-assert enable assertions in the code default=[see `Configure defaults and recommendations`_ below] --enable-strict enable strict compiler flags default=[see `Configure defaults and recommendations`_ below] --enable-warning enable extended compiler warnings default=off ---enable-profile enable profiling default=off ---enable-instrument enable instrument default=off ---with-mx=<Mx> which Mx binary to use (default: whichever - Mx is found in your PATH) ---with-mel=<mel> which mel binary to use (default: whichever - mel is found in your PATH) ---enable-bits=<#bits> specify number of bits (32 or 64) - default is compiler default ---enable-oid32 use 32-bit OIDs on 64-bit systems default=off You can also add options such as ``CC=<compiler>`` to specify the compiler and compiler flags to use. Use ``configure --help`` to find out more about ``configure`` options. -The ``--with-mx`` and ``--with-mel`` options are only used when -configuring the sources as retrieved through CVS. - Configure defaults and recommendations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -548,20 +517,10 @@ <DIR>/include, and for the libraries in <DIR>/lib. In case one of ``bootstrap``, ``configure``, or ``make`` fails --- -especially after a ``cvs update``, or after you changed some code +especially after a ``hg pull -u``, or after you changed some code yourself --- try the following steps (in this order; if you are using the pre-packaged source distribution, you can skip steps 2 and 3): -(In case you experience problems after a ``cvs update``, first make -sure that you used ``cvs update -dP`` (or have a line ``update -dP`` -in your ``~/.cvsrc``); ``-d`` ensures that cvs checks out directories -that have been added since your last ``cvs update``; ``-P`` removes -directories that have become empty, because all their file have been -removed from the cvs repository. In case you did not use ``cvs update --dP``, re-run ``cvs update -dP``, and remember to always use ``cvs -update -dP`` from now on (or simply add a line ``update -dP`` to your -``~/.cvsrc``)!) - 0) In case only ``make`` fails, you can try running:: make clean @@ -589,7 +548,7 @@ Only do this with sources obtained through CVS. 4) In the build-directory, re-run:: - configure + /path/to/configure as described above. 5) In the build-directory, re-run:: @@ -605,9 +564,8 @@ ------------------ Bugs and other problems with compiling or running MonetDB should be -reported using the bug tracking system at SourceForge__ (preferred) or -emailed to mo...@cwi.nl; see also -http://monetdb.cwi.nl/Development/Bugtracker/index.html. Please make -sure that you give a *detailed* description of your problem! +reported using our `bug tracking system`__ (preferred) or +emailed to mo...@cwi.nl. Please make sure that you give a *detailed* +description of your problem! -__ https://sourceforge.net/tracker/?group_id=56967&atid=482468 +__ http://bugs.monetdb.org/ diff -r 48c4879cc71d -r 32e2fd652698 MonetDB5/src/mal/Tests/tst120.stable.out --- a/MonetDB5/src/mal/Tests/tst120.stable.out Fri May 07 15:40:27 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst120.stable.out Fri May 07 15:41:32 2010 +0200 @@ -1,32 +1,23 @@ stdout of test 'tst120` in directory 'src/mal` itself: -# 07:59:00 > -# 07:59:00 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.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/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst120.mal </dev/null -# 07:59:00 > +# 14:40:25 > +# 14:40:25 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=37254 --set xrpc_port=40461 --set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_mal tst120.mal +# 14:40:25 > -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -##define 2 modules and check location of routines -# -#include tst120a; # lookup DBHOME/mal/tst120a.mal -!MALException:malInclude:could not open file: tst120a -#include tst120b; -!MALException:malInclude:could not open file: tst120b -#include tst120a; # does not do anything -!MALException:malInclude:could not open file: tst120a -# -#a:= bottom.second("hh"); -#b:= top.first(1); -#c:= top.first(1:sht); -#d:= bottom.first("hello world"); -#e:= top.first(2:sht); -# +# MonetDB server v5.21.0, based on kernel v1.39.0 +# Serving database 'mTests_src_mal', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.751 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved +# Visit http://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37254/ +# MonetDB/SQL module v2.39.0 loaded +# MonetDB/GIS module v0.19.0 loaded +#WARNING: MALException:malInclude:could not open file: tst120a +#WARNING: MALException:malInclude:could not open file: tst120b +#WARNING: MALException:malInclude:could not open file: tst120a !TypeException:user.main[4]:'bottom.second' undefined in: a:any := bottom.second(_5:str) !TypeException:user.main[5]:'top.first' undefined in: b:any := top.first(_7:int) diff -r 48c4879cc71d -r 32e2fd652698 MonetDB5/src/mal/mal_import.mx --- a/MonetDB5/src/mal/mal_import.mx Fri May 07 15:40:27 2010 +0200 +++ b/MonetDB5/src/mal/mal_import.mx Fri May 07 15:41:32 2010 +0200 @@ -34,6 +34,7 @@ #include "mal_utils.h" mal_export void slash_2_dir_sep(str fname); +mal_export stream *openSourceFile(str fname); @- The import context is located. If the module already exists, we should silently skip parsing the file. This is handled at the parser level. @@ -61,8 +62,8 @@ *s = DIR_SEP; } -static stream * -malOpenSource(str fname) +stream * +openSourceFile(str fname) { stream *fd = NULL; char path[PATHLENGTH]; @@ -96,7 +97,7 @@ { stream *fd; - fd = malOpenSource(name); + fd = openSourceFile(name); if (stream_errnr(fd) == OPEN_ERROR) { stream_destroy(fd); throw(MAL, "malInclude", "could not open file: %s", name); @@ -237,7 +238,7 @@ c->fdin = NULL; c->srcFile= fname; - fd = malOpenSource(fname); + fd = openSourceFile(fname); if (stream_errnr(fd) == OPEN_ERROR) { _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
