- developers-list - monetdb.org

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/kernel batcalc.mx, , 1.145, 1.146 batifthen.mx, , 1.10, 1.11 group.mx, , 1.99, 1.100 kprelude.mx, , 1.7, 1.8
by Stefan Manegold 12 Dec '07

12 Dec '07

On Tue, Dec 11, 2007 at 05:32:04PM +0000, Niels Nes wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28347/src/modules/kernel > > Modified Files: > batcalc.mx batifthen.mx group.mx kprelude.mx > Log Message: > batifthen.mx: use (fast) direct assignments instead of bunfastins for > ifthenelse (not for ifthen as it can be small as the input bat) > group.mx: return read only bats. Intel's icc says: ======== icc -no-gcc -DHAVE_CONFIG_H -I. -I/scratch/monet.Int.64.64.d.23892/MonetDB5/src/modules/kernel -I../../.. -I/scratch/monet.Int.64.64.d.23892/MonetDB5/src/modules/kernel -I../atoms -I/scratch/monet.Int.64.64.d.23892/MonetDB5/src/modules/kernel/../ atoms -I../../mal -I/scratch/monet.Int.64.64.d.23892/MonetDB5/src/modules/kernel/../../mal -I/scratch/monet.Int.64.64.d.23892/MonetDB/.Int.64.64.d-Fedora6/include/MonetDB -I/scratch/monet.Int.64.64.d.23892/MonetDB/.Int.64.64.d-Fedora6/include/Mone tDB/common -I/scratch/monet.Int.64.64.d.23892/MonetDB/.Int.64.64.d-Fedora6/include/MonetDB/gdk -DLIBBATIFTHEN -we140 -wd1418 -Wall -w2 -c99 -mp1 -O3 -restrict -unroll -tpp7 -axWP -we266 -Werror -wd1418,1419,279,981,810,193,111,1357,1572,1599 -D_RE ENTRANT -c batifthen.c -KPIC -DPIC -o .libs/lib_batifthen_la-batifthen.o /scratch/monet.Int.64.64.d.23892/MonetDB5/src/modules/kernel/batifthen.mx(430): error #593: variable "bi" was set but never used BATiter bi, tbi; ^ /scratch/monet.Int.64.64.d.23892/MonetDB5/src/modules/kernel/batifthen.mx(430): error #593: variable "bi" was set but never used BATiter bi, tbi; ^ compilation aborted for batifthen.c (code 2) make[7]: *** [lib_batifthen_la-batifthen.lo] Error 1 ======== basic questions: is it correct that the input's heads are no longer used in CMDifThenElseCst2_@1(), while they are (still) used in CMDifThenElseCst_@1(), CMDifThenElse_@1() & CMDifThenElseCst1_@1() ? Stefan [...] > Index: batifthen.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/batifthen.mx,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -d -r1.10 -r1.11 > --- batifthen.mx 14 Nov 2007 12:52:15 -0000 1.10 > +++ batifthen.mx 11 Dec 2007 17:32:02 -0000 1.11 [...] > @@ -289,38 +436,31 @@ > @:getBATdescriptor(bid,b,"batcalc.ifThenElse")@ > @:getBATdescriptor(tid,tb,"batcalc.ifThenElse",BBPreleaseref(b->batCacheid);)@ > @:chkSize(b,tb,ifThenElse)@ > - @:resBAT(@1,"batcalc.ifThenElse")@ > + @:resultBAT(@1,"batcalc.ifThenElse")@ > + bn->tsorted = FALSE; > + BATkey(BATmirror(bn), FALSE); > > - if (ATOMvarsized(TYPE_@1)) > - val = *(@1**)val; > bi = bat_iterator(b); > tbi = bat_iterator(tb); > > t = (bit*) Tloc(b,BUNfirst(b)); > - > + > + if (ATOMvarsized(TYPE_@1)) > + val = *(@1**)val; > BATloop(b, p, q) { > if (*t == bit_nil) > - BUNfastins(bn, BUNhead(bi,p), (ptr) &nilval); > + BUNfastins(bn, NULL, (ptr) &nilval); > else if (*t) > - BUNfastins(bn, BUNhead(bi,p), BUNtail(tbi, p)); > + BUNfastins(bn, NULL, BUNtail(tbi, p)); > else > - BUNfastins(bn, BUNhead(bi,p), val); > + BUNfastins(bn, NULL, val); > t++; > } > BBPreleaseref(tb->batCacheid); > @:wrapup@ > } > +@:ifthenImpl(@1)@ > @c > -#include "mal_config.h" > -#include "batifthen.h" > - > -@:ifthencstImpl(int)@ > -@:ifthencstImpl(sht)@ > -@:ifthencstImpl(lng)@ > -@:ifthencstImpl(oid)@ > -@:ifthencstImpl(flt)@ > -@:ifthencstImpl(dbl)@ > -@:ifthencstImpl(str)@ > -@:ifthencstImpl(chr)@ > -@:ifthencstImpl(bit)@ > +@:ifthenelseDefault(oid)@ > +@:ifthenelseDefault(str)@ > @} > [...] -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

2 1

Re: [Monetdb-developers] [Monetdb-sql-checkins] sql/src/backends/monet5 merovingian.mx, , 1.20, 1.21
by Sjoerd Mullender 11 Dec '07

11 Dec '07

On 2007-12-11 20:16, Fabian wrote: > Update of /cvsroot/monetdb/sql/src/backends/monet5 > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7608 > > Modified Files: > merovingian.mx > Log Message: > FreeBSD is kind of b0rkened, or my code is completely wrong. It appears > that FreeBSD doesn't set the pid of the child that sends the SIGCHLD to > its parent, leaving merovingian clueless when it receives such signal. > This "bug" is kind of limiting merovingian's abilities on FreeBSD in a way. In the signal handler for SIGCHILD, you're supposed to call one of the variants of wait to get the PID of the child that caused the signal to happen. In certain older systems (System V), you would keep getting the signal when the signal handler returned if you didn't. -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-checkins] java/scripts/Tests All, , 1.1.1.1, 1.2
by Stefan Manegold 11 Dec '07

11 Dec '07

On Tue, Dec 11, 2007 at 01:36:50PM +0000, Fabian wrote: > Update of /cvsroot/monetdb/java/scripts/Tests > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22088 > > Modified Files: > All > Log Message: > Don't run an absolutely pointless test What is "pointless" in testing the minimal functionality of a tool that we build? Stefan > Index: All > =================================================================== > RCS file: /cvsroot/monetdb/java/scripts/Tests/All,v > retrieving revision 1.1.1.1 > retrieving revision 1.2 > diff -u -d -r1.1.1.1 -r1.2 > --- All 28 Nov 2007 14:54:05 -0000 1.1.1.1 > +++ All 11 Dec 2007 13:36:48 -0000 1.2 > @@ -1 +1 @@ > -HAVE_JAVA?mjclient--help > +#HAVE_JAVA?mjclient--help > > > ------------------------------------------------------------------------- > SF.Net email is sponsored by: > Check out the new SourceForge.net Marketplace. > It's the best place to buy or sell services for > just about anything Open Source. > http://sourceforge.net/services/buy/index.php > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins > -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

4 12

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB/src/common monet_options.mx, , 1.20, 1.21 monet_utils.mx, , 1.33, 1.34
by Sjoerd Mullender 11 Dec '07

11 Dec '07

Fabian wrote: > Update of /cvsroot/monetdb/MonetDB/src/common > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26515 > > Modified Files: > monet_options.mx monet_utils.mx > Log Message: > GCC on FreeBSD chokes on #if without a comparison, so use #ifdef/#ifndef instead > > Index: monet_options.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB/src/common/monet_options.mx,v > retrieving revision 1.20 > retrieving revision 1.21 > diff -u -d -r1.20 -r1.21 > --- monet_options.mx 29 Oct 2007 20:09:08 -0000 1.20 > +++ monet_options.mx 11 Dec 2007 12:30:25 -0000 1.21 > @@ -95,7 +95,7 @@ > #include <string.h> > #include <ctype.h> > > -#if HAVE_UNISTD_H > +#ifdef HAVE_UNISTD_H > #include <unistd.h> > #endif > > @@ -104,7 +104,7 @@ > # include "getopt1.c" > #endif > > -#if !HAVE_DECL_STRDUP > +#ifndef HAVE_DECL_STRDUP This is incorrect. Please revert. (And read the manual.) > #ifdef HAVE_STRDUP > extern char *strdup(const char *); > #else > > Index: monet_utils.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB/src/common/monet_utils.mx,v > retrieving revision 1.33 > retrieving revision 1.34 > diff -u -d -r1.33 -r1.34 > --- monet_utils.mx 3 Apr 2007 08:54:37 -0000 1.33 > +++ monet_utils.mx 11 Dec 2007 12:30:25 -0000 1.34 > @@ -49,7 +49,7 @@ > #include <stdarg.h> /* va_alist.. */ > > /* AIX requires this to be the first thing in the file. */ > -#if HAVE_ALLOCA_H > +#ifdef HAVE_ALLOCA_H > # include <alloca.h> > #else > # ifdef _AIX > > > ------------------------------------------------------------------------- > SF.Net email is sponsored by: > Check out the new SourceForge.net Marketplace. > It's the best place to buy or sell services for > just about anything Open Source. > http://sourceforge.net/services/buy/index.php > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Sjoerd Mullender

2 1

[Monetdb-developers] MonetDB/XQuery on FreeBSD
by Djoerd Hiemstra 11 Dec '07

11 Dec '07

Here are some remarks from Tristan Pothoven here in Twente for installing the stable MonetDB/XQuery on FreeBSD (FreeBSD 6.2-RELEASE-p7). He did the following: 1. 'make' on FreeBSD cannot cope with the wildcards in some of the Makefiles. No problem if you use gmake instead. 2. Changes in sourcefiles: Package MonetDB: file: monet_utils.h original: #if HAVE_ALLOCA_H changed to: #ifdef HAVE_ALLOCA_H Package Pathfinder: file: pathfinder.h original: #if HAVE_ALLOCA_H changed to: #ifdef HAVE_ALLOCA_H 3. Furthermore, it seems that the files parser.tab.h and parser.tab.c, are not generated (are they generated?) correctly. Tristan took them from the tarball on the monetdb cwi site. Similarly, in the pftijah module with nexi.tab.c and nexi.tab.h. Best, Djoerd. -------- Original Message -------- Subject: Re: [IR] Vraag met betrekking tot PFTijah / MonetDB Date: Fri, 23 Nov 2007 17:06:05 +0100 From: Tristan Pothoven <t.pothoven(a)student.utwente.nl> To: Djoerd Hiemstra <hiemstra(a)cs.utwente.nl> CC: Vliet,W.M.van(stud-INF) <w.m.vanvliet(a)student.utwente.nl> Hallo Djoerd (en Marijn, de jongen van de grote xml), Over de installatie van de stable release (zoals op de dbapps site, onder CVS) op FreeBSD (FreeBSD 6.2-RELEASE-p7) heb ik het volgende te melden: Je moet per definitie gmake gebruiken ipv make. De make op FreeBSD kan niet overweg met de wildcards die in sommige Makefile's staan. Gmake kan dit wel. Wijzigingen in de sourcefiles: Package MonetDB: file: monet_utils.h origineel: #if HAVE_ALLOCA_H vervanging: #ifdef HAVE_ALLOCA_H Package Pathfinder: file: pathfinder.h origineel: #if HAVE_ALLOCA_H vervanging: #ifdef HAVE_ALLOCA_H Verder heb ik geen wijzigingen in de code moeten aanbrengen. Wel misten er nog wat files in de pathfinder module. Ergens in de parser (vergeef me dat ik de exacte locatie niet meer weet) missen de files parser.tab.h en parser.tab.c, deze heb ik gehaald uit de tarball beschikbaar op de monetdb cwi site. In de pftijah module missen nexi.tab.c en nexi.tab.h. (Op dezelfde manier achterhaald en gekopieerd). Ik geef toe, het was nachtwerk voor mij, dus mogelijke fouten die ik per ongeluk verzonnen heb: mijn excuses daarvoor, maar iig doet hij het nu. :) Groeten, Tristan

6 8

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/modules/pftijah pftijah.mx, , 1.157, 1.158
by Stefan Manegold 11 Dec '07

11 Dec '07

Roberto, does this fix your problem? Stefan On Tue, Dec 11, 2007 at 10:08:13AM +0000, Jan Flokstra wrote: > Update of /cvsroot/monetdb/pathfinder/modules/pftijah > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18823 > > Modified Files: > pftijah.mx > Log Message: > - add an optional extra commit after document indexing to survey a bug > where a server restart leads to a zero filled index bat. > > > > Index: pftijah.mx > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v > retrieving revision 1.157 > retrieving revision 1.158 > diff -u -d -r1.157 -r1.158 > --- pftijah.mx 4 Oct 2007 10:41:12 -0000 1.157 > +++ pftijah.mx 11 Dec 2007 10:08:09 -0000 1.158 > @@ -315,7 +315,9 @@ > # # > ##################################################################### > > -var verbose := false; > +var verbose := false; > + > +var extra_commit := false; > > const dflt_ft_index := "DFLT_FT_INDEX"; > const dflt_bg_index := "DFLT_FT_INDEX"; > @@ -997,6 +999,7 @@ > _tj_add2collection(ftiName, collBat, uri_loc, uri_name, store); > _tj_finalize_collection(ftiName, collBat, FALSE); > _tj_commit(collBat); > + if ( extra_commit ) subcommit(_tj_collection_str(ftiName)); > if ( timing ) { > var ms := (usec()-t_start)/1000; > printf("#C[%s]:tj_add2collection(): + aggregate time = %lld.%03llds.\n",ftiName,/(ms,1000),%(ms,1000)); > @@ -1038,6 +1041,7 @@ > printf("#C[%s]:tj_add2collection(BAT): + aggregate time = %lld.%03llds.\n",ftiName,/(ms,1000),%(ms,1000)); > } > _tj_commit(collBat); > + if ( extra_commit ) subcommit(_tj_collection_str(ftiName)); > }); > lock_unset(coll_lock); > if (not(isnil(err))) ERROR(err); > > > ------------------------------------------------------------------------- > SF.Net email is sponsored by: > Check out the new SourceForge.net Marketplace. > It's the best place to buy or sell services for > just about anything Open Source. > http://sourceforge.net/services/buy/index.php > _______________________________________________ > Monetdb-pf-checkins mailing list > Monetdb-pf-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins > -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

2 2

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/runtime pf_support.mx, XQuery_0-20, 1.267.2.3, 1.267.2.4
by Lefteris 11 Dec '07

11 Dec '07

Join the Group, they said. See the Code, they said... On Dec 11, 2007 2:54 PM, Sjoerd Mullender <sjoerd(a)users.sourceforge.net> wrote: > Update of /cvsroot/monetdb/pathfinder/runtime > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30198 > > Modified Files: > Tag: XQuery_0-20 > pf_support.mx > Log Message: > Added an appropriate comment. > This comment actully comes from the display code of Gosling Emacs > ca. 1981, but is also very appropriate here. > > > Index: pf_support.mx > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v > retrieving revision 1.267.2.3 > retrieving revision 1.267.2.4 > diff -u -d -r1.267.2.3 -r1.267.2.4 > --- pf_support.mx 7 Dec 2007 14:16:29 -0000 1.267.2.3 > +++ pf_support.mx 11 Dec 2007 13:54:20 -0000 1.267.2.4 > @@ -2060,6 +2060,53 @@ > @- update primitives > @mil > > +################################################################# > +# > +# > +# > +# /-------------\ > +# / \ > +# / \ > +# / \ > +# | XXXX XXXX | > +# | XXXX XXXX | > +# | XXX XXX | > +# \ X / > +# --\ XXX /-- > +# | | XXX | | > +# | | | | > +# | I I I I I I I | > +# | I I I I I I | > +# \ / > +# -- -- > +# \-------/ > +# XXX XXX > +# XXXXX XXXXX > +# XXXXXXXXX XXXXXXXXXX > +# XXXXX XXXXX > +# XXXXXXX > +# XXXXX XXXXX > +# XXXXXXXXX XXXXXXXXXX > +# XXXXX XXXXX > +# XXX XXX > +# > +# ************** > +# * BEWARE!! * > +# ************** > +# > +# All ye who enter here: > +# Most of the code in this module > +# is twisted beyond belief! > +# > +# Tread carefully. > +# > +# If you think you understand it, > +# You Don't, > +# So Look Again. > +# > +################################################################# > + > +# > # the UPDATE_INSERT_*, UPDATE_REPLACENODE and UPDATE_REPLACECONTENT commands MUST be > # consecutive, the UPDATE_INSERT_LAST and UPDATE_INSERT_BEFORE > # commands also MUST be consecutive > > > ------------------------------------------------------------------------- > SF.Net email is sponsored by: > Check out the new SourceForge.net Marketplace. > It's the best place to buy or sell services for > just about anything Open Source. > http://sourceforge.net/services/buy/index.php > _______________________________________________ > Monetdb-pf-checkins mailing list > Monetdb-pf-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins >

1 0

Re: [Monetdb-developers] [Monetdb-sql-checkins] sql/src/backends/monet4 sql_result.mx, , 1.70, 1.71
by Fabian Groffen 09 Dec '07

09 Dec '07

On 09-12-2007 13:14:22 +0000, Niels Nes wrote: > Update of /cvsroot/monetdb/sql/src/backends/monet4 > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1301/src/backends/monet4 > > Modified Files: > sql_result.mx > Log Message: > output the last_id (the last inserted value in a auto_increment column) Shouldn't we upgrade the protocol version for this? If I "fix" JDBC to use it now, it will crash on a server not sending this extra value... > Index: sql_result.mx > =================================================================== > RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_result.mx,v > retrieving revision 1.70 > retrieving revision 1.71 > diff -u -d -r1.70 -r1.71 > --- sql_result.mx 3 Dec 2007 08:51:13 -0000 1.70 > +++ sql_result.mx 9 Dec 2007 13:14:20 -0000 1.71 > @@ -956,12 +956,12 @@ > */ > if (!s) return 0; > > -#ifdef NDEBUG > - (void) m; /* pacify compiler in case asserts are disabled */ > -#endif > assert(m->type == Q_UPDATE); > - if (stream_write(s, "&2 ", 3, 1) != 1 || !mvc_send_lng(s, val) || > - stream_write(s, "\n", 1, 1) != 1) > + if (stream_write(s, "&2 ", 3, 1) != 1 || > + !mvc_send_lng(s, val) || > + stream_write(s, " ", 1, 1) != 1 || > + !mvc_send_lng(s, m->last_id) || > + stream_write(s, "\n", 1, 1) != 1) > return -1; > if (mvc_export_warning(s, w) != 1) > return -1; > > > ------------------------------------------------------------------------- > SF.Net email is sponsored by: > Check out the new SourceForge.net Marketplace. > It's the best place to buy or sell services for > just about anything Open Source. > http://sourceforge.net/services/buy/index.php > _______________________________________________ > Monetdb-sql-checkins mailing list > Monetdb-sql-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

2 3

[Monetdb-developers] 7. yum install does not work (John Baxter)
by John Baxter 06 Dec '07

06 Dec '07

3 8

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder configure.ag, , 1.122, 1.123
by Ying Zhang 06 Dec '07

06 Dec '07

On Dec 06, 2007, at 00:55 , Stefan Manegold wrote: > Update of /cvsroot/monetdb/pathfinder > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18880 > > Modified Files: > configure.ag > Log Message: > > Since Jennie 'Moved the XRPC Wrapper to the new "java" module', > Pathfinder does not require Java any more. So I still missed several files. Thanks for the final clean up! > > Index: configure.ag > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v > retrieving revision 1.122 > retrieving revision 1.123 > diff -u -d -r1.122 -r1.123 > --- configure.ag 3 Dec 2007 08:24:54 -0000 1.122 > +++ configure.ag 5 Dec 2007 23:55:05 -0000 1.123 > @@ -78,8 +78,6 @@ > AC_MSG_ERROR([Pathfinder requires a C99 compliant C compiler, but > your C compiler does not seem to be C99 compliant.]) > fi > > -req_java_ver_min=1.5 # >= $req_java_ver_min required > -AM_MONETDB_ANT_JAVA($req_java_ver_min) > req_monetdb_java_ver='1.7.0' > # ^^^^^^ > # Maintained via vertoo. Please don't modify by hand! > > > ------------------------------------------------------------------------- > SF.Net email is sponsored by: The Future of Linux Business White Paper > from Novell. From the desktop to the data center, Linux is going > mainstream. Let it simplify your IT future. > http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 > _______________________________________________ > Monetdb-pf-checkins mailing list > Monetdb-pf-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

1 0