- developers-list - monetdb.org

[Monetdb-developers] conf.bash still used?
by Stefan Manegold 10 Sep '07

10 Sep '07

Hi, I'm about to remove */conf/conf.bash, the script that "once" was provided to "conveniently" set your environment for building MonetDB, but --- thanks to improved configure setup and system installations --- should not be required any more. Please let me know a.s.a.p. in case there are any objections and/or anybody is still using this script. Thanks, Stefan -- | 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 |

3 2

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/tools merovingian.mx, , 1.46, 1.47
by Martin Kersten 10 Sep '07

10 Sep '07

That creates a deadlock. monetdb can not work without the mero and mero needs the dbfarm. Try testing your system without a dbfarm and var/log Fabian wrote: > Update of /cvsroot/monetdb/MonetDB5/src/tools > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3294 > > Modified Files: > merovingian.mx > Log Message: > Again, Merovingian is not the one to create directories, monetdb does > that. > > > Index: merovingian.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/tools/merovingian.mx,v > retrieving revision 1.46 > retrieving revision 1.47 > diff -u -d -r1.46 -r1.47 > --- merovingian.mx 10 Sep 2007 07:44:09 -0000 1.46 > +++ merovingian.mx 10 Sep 2007 07:46:38 -0000 1.47 > @@ -1099,11 +1099,6 @@ > argp = dup(1); > topdp->fout = fdopen(argp, "w"); > } else { > - /* check the log directory */ > - if (access(msglog,F_OK) == -1 ){ > - GDKcreatedir(msglog); /* it doesn't necessarily create all */ > - fprintf(stderr, "log directory created '%s'\n", msglog); > - } > /* write to the given file */ > topdp->fout = fopen(msglog, "a"); > if (topdp->fout == NULL) { > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2005. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB/src/testing difflib.c, , 1.46, 1.47
by Fabian Groffen 10 Sep '07

10 Sep '07

On 09-09-2007 11:36:26 +0000, Stefan Manegold wrote: > Update of /cvsroot/monetdb/MonetDB/src/testing > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4669 > > Modified Files: > difflib.c > Log Message: > > no need to call "touch" via "system()" to create an empty file; > "fclose(fopen())" should do the job within pure C. Because you use the stream versions here, fclose(fopen()) can crash you tool if fopen() returns NULL, as fclose doesn't grok it. > Index: difflib.c > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB/src/testing/difflib.c,v > retrieving revision 1.46 > retrieving revision 1.47 > diff -u -d -r1.46 -r1.47 > --- difflib.c 5 Sep 2007 17:05:58 -0000 1.46 > +++ difflib.c 9 Sep 2007 11:36:22 -0000 1.47 > @@ -922,7 +922,7 @@ > > if (!u_diff2lwc_diff(mindiff, LWC, u_diff_fn, lwc_diff_fn)) > /* { UNLINK(lwc_diff_fn); ERRHNDL(0,"u_diff2lwc_diff returns 0 in u_diff2html","",1); } */ > - SYSTEM(strconcat("touch ", lwc_diff_fn)); > + fclose(Wfopen(lwc_diff_fn)); Unless Wfopen does something fancy with the pointer, I suggest to check if it's non NULL.

2 1

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/src/sqlhelpers/xmlshred xmlshred.c, , 1.1, 1.2
by Stefan Manegold 10 Sep '07

10 Sep '07

On Sun, Sep 09, 2007 at 08:27:41AM +0000, Manuel Mayr wrote: > Update of /cvsroot/monetdb/pathfinder/src/sqlhelpers/xmlshred > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17315 > > Modified Files: > xmlshred.c > Log Message: > > Fixing compiler errors. > > > Index: xmlshred.c > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/src/sqlhelpers/xmlshred/xmlshred.c,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -d -r1.1 -r1.2 > --- xmlshred.c 8 Sep 2007 08:39:59 -0000 1.1 > +++ xmlshred.c 9 Sep 2007 08:27:39 -0000 1.2 > @@ -51,7 +51,8 @@ > > #define NAME_ID 0 > > -typedef long int nat; > +typedef long unsigned int nat; > +typedef int pre_t; What's the reason for introducing yet another type, here? Should "nat" be 32-bit on 32-bit systems and 64-bit on 64-bit systems? Well, that won't work for Windows: x64 Windows uses the P64 model, i.e., "int" and "long int" are 32 bits long, but pointers are 64 bits long. x86-64 Linux uses the LP64 model, when "long int" is also 64 bits while "int" remains 32 bits. In contrast, 32-bit Windows and Linux are both ILP32, meaning that "int", "long int" and pointers are all 32 bits. Hence, "long int" is a considered "evil" and a "portability killer". Why not use standard types "size_t" (unsigned) and "ssize_t" (signed) if you need a system word-size integer? In fact, "*pre*" and "*post*" --- assuming the names suggest that they represent pre- & post-orders --- are actually of type "oid" in the remainder of the pathfinder (MonetDB/XQUuery) code base (enabling 32-bit space-saving pre/post storage also on 64-bit systems); likiwise, "size" is "int" and "level" is "chr". Is there any reason not to use the same, here? Stefan > enum kind_t { > elem > @@ -133,17 +134,17 @@ > void free_hash(bucket_t **hash_table); > > /* return a brand new name_id */ > -int new_nameid(); > +int new_nameid(void); > > typedef struct node_t node_t; > struct node_t { > - nat pre; > - nat apre; > + pre_t pre; > + pre_t apre; > nat post; > nat pre_stretched; > nat post_stretched; > nat size; > - int level; > + unsigned int level; > int name_id; > node_t *parent; > kind_t kind; -- | 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-pf-checkins] pathfinder/runtime/Tests serialization.milS, , 1.9, 1.10 serialization.stable.out, , 1.13, 1.14
by Stefan Manegold 09 Sep '07

09 Sep '07

Jan (R.), could you please check whether the output of the "text" serialization mode at http://monetdb.cwi.nl/testing/projects/monetdb/Current/pathfinder/.mTests10… http://monetdb.cwi.nl/testing/projects/monetdb/Current/pathfinder/.mTests10… http://monetdb.cwi.nl/testing/projects/monetdb/Current/pathfinder/.mTests10… --- in particular the error message with top-level (root-node) attributes and the lack of whitespace(s) --- is correct / as desired? Thanks in advance! Stefan > Update of /cvsroot/monetdb/pathfinder/runtime/Tests > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10673 > > Modified Files: > serialization.milS serialization.stable.out > Log Message: > > Extended serialization test with (not that) new "text" mode. > > Correct/desired output still needs to be verified by Jan Rittinger. > > > Index: serialization.stable.out > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/runtime/Tests/serialization.stable.out,v > retrieving revision 1.13 > retrieving revision 1.14 > diff -u -d -r1.13 -r1.14 > --- serialization.stable.out 1 Sep 2007 17:06:53 -0000 1.13 > +++ serialization.stable.out 1 Sep 2007 17:28:05 -0000 1.14 > @@ -13,6 +13,7 @@ > > # query for all output modes (contains all different kinds) > var query := "(1, 2.3, attribute attr { \"val\" }, 3E1, \"string\", doc(\"nodekinds.xml\")/descendant-or-self::node())"; > +var query_no_attr := "(1, 2.3, 3E1, \"string\", doc(\"nodekinds.xml\")/descendant-or-self::node())"; > > # current different XML modes > # > @@ -103,6 +104,39 @@ > [ "&1 0 10 1 10\n% xquery.result\t# table_name\n% xml\t# name\n% varchar\t# type\n% 60\t# length\n[ \"1\"\t]\n[ \"2.300000\"\t]\n[ \"attribute attr { \"val\" }\"\t]\n[ \"30.000000\"\t]\n[ \"\\\"string\\\"\"\t]\n[ \"<?xml version=\\\"1.0\\\" encoding=\\\"utf-8\\\"?>\\n<elem attr=\\\"val\\\">text<?pi_tgt pi_data?></elem>\\n\"\t]\n[ \"<elem attr=\\\"val\\\">text<?pi_tgt pi_data?></elem>\"\t]\n[ \"text {\\\"text\\\"}\"\t]\n[ \"\"\t]\n[ \"<?pi_tgt pi_data?>\"\t]\n" ] > > > +# text mode w/ top-level attribute > +# > +xquery("text" ,query , 0).printf(); > += Please remove this line once the below error message has been verified as correct/expected. > +!ERROR: 12.300000!ERROR: serialize_dflt.mx: unable to print top level attribute nodes in text mode > +!ERROR: xquery_print_result_loop: operation failed. > +!ERROR: interpret: no matching MIL operator to 'printf(void)'. > +!MAYBE YOU MEAN: > +! printf(str, ..any..) : void > += Please remove this line once the above error message has been verified as correct/expected. > + > +xquery("mapi-text" ,query , 0).printf(); > += Please remove this line once the below error message has been verified as correct/expected. > +!ERROR: =12.300000!ERROR: serialize_dflt.mx: unable to print top level attribute nodes in text mode > +!ERROR: xquery_print_result_loop: operation failed. > +!ERROR: interpret: no matching MIL operator to 'printf(void)'. > +!MAYBE YOU MEAN: > +! printf(str, ..any..) : void > += Please remove this line once the above error message has been verified as correct/expected. > + > +# text mode w/o top-level attribute > +# > +xquery("text" ,query_no_attr , 0).printf(); > += Please remove this line once the below text-mode output has been verified as correct/expected. > +12.30000030.000000string<elem attr="val">text<?pi_tgt pi_data?></elem><elem attr="val">text<?pi_tgt pi_data?></elem>text<?pi_tgt pi_data?> > += Please remove this line once the above text-mode output has been verified as correct/expected. > + > +xquery("mapi-text" ,query_no_attr , 0).printf(); > += Please remove this line once the below text-mode output has been verified as correct/expected. > +=12.30000030.000000string<elem attr="val">text<?pi_tgt pi_data?></elem><elem attr="val">text<?pi_tgt pi_data?></elem>text<?pi_tgt pi_data?> > += Please remove this line once the above text-mode output has been verified as correct/expected. > + > + > # default mode is xml mode (it also works with mapi > # -- all other mode arguments are ignored) > # > > Index: serialization.milS > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/runtime/Tests/serialization.milS,v > retrieving revision 1.9 > retrieving revision 1.10 > diff -u -d -r1.9 -r1.10 > --- serialization.milS 1 Sep 2007 17:06:53 -0000 1.9 > +++ serialization.milS 1 Sep 2007 17:28:05 -0000 1.10 > @@ -2,6 +2,7 @@ > > # query for all output modes (contains all different kinds) > var query := "(1, 2.3, attribute attr { \"val\" }, 3E1, \"string\", doc(\"nodekinds.xml\")/descendant-or-self::node())"; > +var query_no_attr := "(1, 2.3, 3E1, \"string\", doc(\"nodekinds.xml\")/descendant-or-self::node())"; > > # current different XML modes > # > @@ -39,6 +40,19 @@ > xquery("seq" ,query , 0).print(); > > > +# text mode w/ top-level attribute > +# > +xquery("text" ,query , 0).printf(); > + > +xquery("mapi-text" ,query , 0).printf(); > + > +# text mode w/o top-level attribute > +# > +xquery("text" ,query_no_attr , 0).printf(); > + > +xquery("mapi-text" ,query_no_attr , 0).printf(); > + > + > # default mode is xml mode (it also works with mapi > # -- all other mode arguments are ignored) > # > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > 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 |

1 0

[Monetdb-developers] Super Source Ball release update
by Martin Kersten 07 Sep '07

07 Sep '07

A glitch in maintaining the monetdb website led to an outdated link for the super source ball on the download page. This tarball is a convenience package containing all source tars and a script (for Linux) to build components. The link has been updated to the latest version: http://downloads.sourceforge.net/monetdb/MonetDB-Mars-SuperBall-SR3.tar.bz2 The MonetDB Development team

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal Makefile.ag, , 1.103, 1.104 batxml.mx, , 1.14, 1.15
by Romulo Goncalves 06 Sep '07

06 Sep '07

Romulo Goncalves wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29918/mal > > Modified Files: > Makefile.ag batxml.mx > Log Message: > Initialize variable to resolve problems on windows (32bit with VS) compilation Add a missing lib (lib_xml.lib) to be able to compile batxml.mx > > > > Index: Makefile.ag > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Makefile.ag,v > retrieving revision 1.103 > retrieving revision 1.104 > diff -u -d -r1.103 -r1.104 > --- Makefile.ag 21 Aug 2007 20:54:59 -0000 1.103 > +++ Makefile.ag 6 Sep 2007 11:04:32 -0000 1.104 > @@ -35,7 +35,7 @@ > #datacell.mx > > HEADERS = h > - LIBS = ../../mal/libmal $(MONETDB_LIBS) -lbat -lstream $(MATH_LIBS) \ > + LIBS = ../../mal/libmal ../atoms/lib_xml $(MONETDB_LIBS) -lbat -lstream $(MATH_LIBS) \ > $(CLIENTS_LIBS) -lMapi \ > $(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) \ > $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) > > Index: batxml.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/batxml.mx,v > retrieving revision 1.14 > retrieving revision 1.15 > diff -u -d -r1.14 -r1.15 > --- batxml.mx 1 Sep 2007 12:11:12 -0000 1.14 > +++ batxml.mx 6 Sep 2007 11:04:32 -0000 1.15 > @@ -729,7 +729,7 @@ > BAT *j, *r, *g, *b, *bn; > BUN p,q; > int xx; > - oid gid,o=0; > + oid gid = 0,o=0; > int first= 1; > str t; > str buf= GDKmalloc(BUFSIZ); > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal batxml.mx, GDK-2, 1.4.2.2, 1.4.2.3
by Romulo Goncalves 06 Sep '07

06 Sep '07

Sjoerd Mullender wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15018/src/modules/mal > > Modified Files: > Tag: GDK-2 > batxml.mx > Log Message: > propagated changes of Friday Aug 24 2007 - Tuesday Aug 28 2007 > from the development trunk to the GDK-2 branch > > There were inexplicable conflicts in src/modules/mal/batxml.mx and > src/modules/mal/Tests/inspect05.stable.out, neither of which had been > changed on the branch. I just copied the HEAD version to the branch > to resolve the conflicts. > ...... > str > -BATXMLagg(MalBlkPtr mb, MalStkPtr stk, InstrPtr p) > +BATXMLagg(int *ret, int *grp,int *bid) > { > - (void) mb; > - (void) stk; > - (void) p; > - throw(MAL,"xml.agg","Not yet implemented"); > + BAT *j, *r, *g, *b, *bn; > + BUN p,q; > + int xx; > + oid gid,o=0; The variable is not initialized. I will take the freedom to initialize it with value 0; Do I have green light or the values should be another one? Note: this is a propagation and the this code comes from the Martin checking on 08/25/2007 9:48 am > + int first= 1; > + str t; > + str buf= GDKmalloc(BUFSIZ); > + int len, size=BUFSIZ,offset; > + > + @:getBATdescriptor(grp,g,"xml.agg")@ > + @:getBATdescriptor(bid,b,"xml.agg",BBPunfix(g->batCacheid))@ > + > + bn= BATnew(g->htype, b->ttype,BATcount(g)); > + if( bn== NULL){ > + BBPunfix(b->batCacheid); > + BBPunfix(g->batCacheid); > + throw(MAL,"xml.agg","Could not create BAT"); > + } > + > + j= BATjoin(g,b,oid_nil); > + r= BATsort(j); > + /* now we can perform a simple scan and emit the group*/ > + > + buf[0]=0; > + offset=0; > + first=1; > + BATloopFast(r,p,q,xx){ > + o= *(oid*) BUNhead(r,p); > + t= (str) BUNtail(r,p); > + if( gid != o && first==0){ It is used here for the first time without being initialized. Regards, Romulo > + /* flush */ > + bunfastins(bn,&gid,buf); > + buf[0]=0; > + offset =0; > + } > + gid=o; > + first=0; .......

2 2

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_client.mx, , 1.156, 1.157 mal_scenario.mx, , 1.111, 1.112
by Romulo Goncalves 06 Sep '07

06 Sep '07

Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18380/mal > > Modified Files: > mal_client.mx mal_scenario.mx > Log Message: > Add a few statistics for tracking client behavior. > > > Index: mal_client.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_client.mx,v > retrieving revision 1.156 > retrieving revision 1.157 > diff -u -d -r1.156 -r1.157 > --- mal_client.mx 30 Aug 2007 07:18:54 -0000 1.156 > +++ mal_client.mx 5 Sep 2007 18:13:16 -0000 1.157 > @@ -89,6 +89,10 @@ > # include <sys/resource.h> > #endif > > +#ifdef HAVE_SYS_TIMES_H > +# include <sys/times.h> > +#endif > + > @- > The prompt structure is designed to simplify recognition > of the language framework for interaction. For direct console > @@ -226,6 +230,18 @@ > Symbol curprg; /* focus of parser */ > Symbol backup; /* save parsing context */ > MalStkPtr glb; /* global variable stack */ > +@- > +Some statistics on client behavior becomes relevant > +for server maintenance. The scenario loop is used as > +a frame of reference. We measure the elapsed time after > +a request has been received and we have to wait for > +the next one. > +@h > + int actions; > + lng totaltime; /* sum of elapsed processing times */ > +#ifdef HAVE_TIMES > + struct tms workload; > +#endif > } *Client, ClientRec; > > mal_export ClientRec mal_clients[MAL_MAXCLIENTS+1]; > @@ -446,6 +462,9 @@ > prompt = !fin? GDKgetenv("monet_prompt"): PROMPT1; > c->prompt= GDKstrdup(prompt); > c->promptlength= strlen(prompt); > + > + c->actions =0; > + c->totaltime= 0; > return c; > } > @- > > Index: mal_scenario.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_scenario.mx,v > retrieving revision 1.111 > retrieving revision 1.112 > diff -u -d -r1.111 -r1.112 > --- mal_scenario.mx 30 Aug 2007 07:18:54 -0000 1.111 > +++ mal_scenario.mx 5 Sep 2007 18:13:16 -0000 1.112 > @@ -183,6 +183,10 @@ > #include "mal_authorize.h" > #include "mal_exception.h" > > +#ifdef HAVE_SYS_TIMES_H > +# include <sys/times.h> > +#endif > + > struct SCENARIO scenarioRec[MAXSCEN] = { > {"mal", "mal", > 0, 0, /* hardwired MALinit*/ > @@ -576,15 +580,31 @@ > runScenarioBody(Client c) > { > str msg= MAL_SUCCEED; > + lng start; > + struct tms t0,t1; I think here you need to do like this: > #ifdef HAVE_TIMES > struct tms t0,t1; > #endif If not the windows compilation does not work. I tried and now it compiles on windows. To checkin I am just waiting for green light because I am not really sure of the impact of my change in your semantics. Regards, Romulo > > while (c->mode > FINISHING) { > msg = MAL_SUCCEED; > @:runPhase(MAL_SCENARIO_READER)@ > c->lastcmd= time(0); > + start= GDKusec(); > +#ifdef HAVE_TIMES > + times(&t0); > +#endif > @:runPhase(MAL_SCENARIO_PARSER)@ > @:runPhase(MAL_SCENARIO_OPTIMIZE)@ > @:runPhase(MAL_SCENARIO_SCHEDULER)@ > @:runPhase(MAL_SCENARIO_ENGINE)@ > + start= GDKusec()-start; > + c->actions++; > + c->totaltime += start; > +#ifdef HAVE_TIMES > + times(&t1); > + c->workload.tms_utime += t1.tms_utime-t0.tms_utime; > + c->workload.tms_cutime += t1.tms_cutime-t0.tms_cutime; > + c->workload.tms_stime += t1.tms_stime-t0.tms_stime; > + c->workload.tms_cstime += t1.tms_cstime-t0.tms_cstime; > +#endif > } > return msg; > } > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

1 0

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/modules/pftijah/Tests procs.stable.out, , 1.29, 1.30
by Stefan Manegold 05 Sep '07

05 Sep '07

Henning, thanks for being aware of stable output and maitaining int accoring to your changes. However, did you change the signatures of PROCs client(), descendant(), descendant_or_self(), ll_child(), ll_descendant(), ll_descendant_or_self(), preceding(), preceding_sibling() in addition to vx_maintain()? I cannot see any comment in your checkin message, nor did I find any hint in the diffs. Hence, why did you change the respective stable output, then? Well, to solve the "riddle" (addressing all of you, not only Henning!): when updating stable output, please make sure that (1) either your code base is indeed up-to-date, or that (2) you change only those parts of stable output which actually relate to your code changes. Stable output is even more important and sensitive than the actual code --- it is used to test the correctness of the actual code. Hence, please treat it with the respective concentration and care. Thanks. Stefan On Wed, Sep 05, 2007 at 03:41:57PM +0000, Henning Rode wrote: > Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12978/Tests > > Modified Files: > procs.stable.out > Log Message: > bug-fix in multiplicative retrieval models > (thanks djoerd for finding it. > in those models, the number a term occurs in a query > becomes an exponent in the score function (not a factor)). > > > Index: procs.stable.out > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/procs.stable.out,v > retrieving revision 1.29 > retrieving revision 1.30 > diff -u -d -r1.29 -r1.30 > --- procs.stable.out 1 Sep 2007 11:34:18 -0000 1.29 > +++ procs.stable.out 5 Sep 2007 15:41:55 -0000 1.30 > @@ -137,7 +137,6 @@ > [ "ceil(flt) : flt" ] > [ "checkpoint_protect(BAT[void,BAT]) : void" ] > [ "checkpoint_unprotect(BAT[void,BAT]) : void" ] > -[ "child(BAT[oid,oid], BAT[oid,oid], BAT[oid,oid], oid, BAT[oid,BAT], int, BAT[void,any], chr) : BAT[void,BAT]" ] > [ "child(BAT[oid,oid], BAT[oid,oid], oid, BAT[oid,BAT], int, BAT[void,any], chr) : BAT[void,BAT]" ] > [ "clear(BAT[any::1,any::2]) : BAT[any::1,any::2]" ] > [ "clients() : void" ] > @@ -173,9 +172,7 @@ > [ "delete_doc(BAT[void,str]) : void" ] > [ "delete_doc(str) : void" ] > [ "delete_pfc_fti(str) : void" ] > -[ "descendant(BAT[oid,oid], BAT[oid,oid], BAT[oid,oid], oid, BAT[oid,BAT], int, BAT[void,any], chr) : BAT[void,BAT]" ] > [ "descendant(BAT[oid,oid], BAT[oid,oid], oid, BAT[oid,BAT], int, BAT[void,any], chr) : BAT[void,BAT]" ] > -[ "descendant_or_self(BAT[oid,oid], BAT[oid,oid], BAT[oid,oid], oid, BAT[oid,BAT], int, BAT[void,any], chr) : BAT[void,BAT]" ] > [ "descendant_or_self(BAT[oid,oid], BAT[oid,oid], oid, BAT[oid,BAT], int, BAT[void,any], chr) : BAT[void,BAT]" ] > [ "destroy(BAT[any,any]) : bit" ] > [ "diff(BAT[any::1,any::2], BAT[any::1,any::2]) : BAT[any::1,any::2]" ] > @@ -271,9 +268,6 @@ > [ "listen(int, int) : void" ] > [ "listen(int, int, bit) : void" ] > [ "listen(int, str, int) : void" ] > -[ "ll_child(BAT[oid,oid], BAT[oid,oid], BAT[oid,int], BAT[void,any], bit, bit, oid, oid, bit, chr) : BAT[oid,oid]" ] > -[ "ll_descendant(BAT[oid,oid], BAT[oid,oid], BAT[oid,int], BAT[void,any], bit, bit, oid, oid, bit, chr) : BAT[oid,oid]" ] > -[ "ll_descendant_or_self(BAT[oid,oid], BAT[oid,oid], BAT[oid,int], BAT[void,any], bit, bit, oid, oid, bit, chr) : BAT[oid,oid]" ] > [ "ll_htordered_unique_thetajoin(int, BAT[oid,any::2], BAT[oid,any::2], BAT[void,oid], BAT[void,oid], any, any) : BAT[any,any]" ] > [ "ll_standoff_select_narrow(BAT[void,oid], BAT[oid,oid], BAT[oid,oid], BAT[oid,oid], BAT[oid,any], BAT[oid,any]) : BAT[oid,oid]" ] > [ "ll_standoff_select_wide(BAT[void,oid], BAT[oid,oid], BAT[oid,oid], BAT[oid,oid], BAT[oid,any], BAT[oid,any]) : BAT[oid,oid]" ] > @@ -490,8 +484,9 @@ > [ "pi() : dbl" ] > [ "play_doc_tape(BAT[void,BAT], BAT[void,oid], BAT[void,int], BAT[void,lng], BAT[void,str]) : void" ] > [ "play_update_tape(BAT[void,BAT], BAT[void,oid], BAT[void,int], BAT[void,lng], BAT[void,str]) : void" ] > +[ "preceding(BAT[void,oid], BAT[void,oid], oid, BAT[void,BAT], int) : BAT[void,BAT]" ] > [ "preceding(BAT[void,oid], BAT[void,oid], oid, BAT[void,BAT], int, chr) : BAT[void,BAT]" ] > -[ "preceding_sibling(BAT[void,oid], BAT[void,oid], oid, BAT[void,BAT], int, chr) : BAT[void,BAT]" ] > +[ "preceding_sibling(BAT[void,oid], BAT[void,oid], oid, BAT[void,BAT], int) : BAT[void,BAT]" ] > [ "print(str, BAT[any::1,any], ..BAT[any::1,any]..) : void" ] > [ "prior_logls(BAT[any,any], int, BAT[oid,str]) : BAT[any,any]" ] > [ "prior_ls(BAT[any,any], int, BAT[oid,str]) : BAT[any,any]" ] > @@ -652,7 +647,7 @@ > [ "vm_usage(int) : BAT[str,lng]" ] > [ "vx_lookup(BAT[void,BAT], BAT[void,oid], BAT[void,int], BAT[void,str], str, str, bit) : BAT[oid,oid]" ] > [ "vx_lookup(BAT[void,BAT], oid, BAT[void,str], str, str, bit) : BAT[oid,oid]" ] > -[ "vx_maintain(BAT[oid,oid], BAT[oid,oid], BAT[oid,oid], BAT[oid,str]) : BAT[int,oid]" ] > +[ "vx_maintain(BAT[oid,oid], BAT[oid,oid], BAT[oid,str]) : BAT[int,oid]" ] > [ "vx_maintain(BAT[oid,oid], BAT[oid,str]) : BAT[int,oid]" ] > [ "vx_reduce(BAT[oid,int], BAT[void,oid]) : BAT[oid,oid]" ] > [ "ws_collection(BAT[void,BAT], BAT[oid,str], BAT[void,oid]) : BAT[oid,oid]" ] > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > 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