- developers-list - monetdb.org

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

11 Sep '07

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. as reported. it doesn't

2 1

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/src/sqlhelpers/xmlshred xmlshred.c, , 1.2, 1.3
by Sjoerd Mullender 10 Sep '07

10 Sep '07

When printing a value of type size_t, use SZFMT. When printing a value of type ssize_t, use SSZFMT. The format needed to print these values varies from system to system, so that difference is hidden in a macro. Manuel Mayr wrote: > Update of /cvsroot/monetdb/pathfinder/src/sqlhelpers/xmlshred > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13392 > > Modified Files: > xmlshred.c > Log Message: > > > Thx for noting. > > > Index: xmlshred.c > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/src/sqlhelpers/xmlshred/xmlshred.c,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > --- xmlshred.c 9 Sep 2007 08:27:39 -0000 1.2 > +++ xmlshred.c 10 Sep 2007 06:55:38 -0000 1.3 > @@ -51,8 +51,7 @@ > > #define NAME_ID 0 > > -typedef long unsigned int nat; > -typedef int pre_t; > +typedef ssize_t nat; > > enum kind_t { > elem > @@ -138,8 +137,8 @@ > > typedef struct node_t node_t; > struct node_t { > - pre_t pre; > - pre_t apre; > + nat pre; > + nat apre; > nat post; > nat pre_stretched; > nat post_stretched; > @@ -155,7 +154,7 @@ > static node_t stack[STACK_MAX]; > static int level; > static int max_level; > -static pre_t pre; > +static nat pre; > static nat post; > static nat rank; > static nat att_id; > @@ -346,7 +345,7 @@ > attr_guide_node = insert_guide_node((char*)atts_back[0], > current_guide_node, attr); > > - fprintf (out_attr, "%lu, %i, \"%s\", \"%s\", %lu\n", > + fprintf (out_attr, "%i, %i, \"%s\", \"%s\", %i\n", > att_id++, pre, (char*)atts[0], (char*)atts[1], attr_guide_node->guide); > > atts += 2; > @@ -602,10 +601,10 @@ > case 'e': if(tuple.pre != -1) > fprintf (out, "%i", tuple.pre); > break; > - case 'o': fprintf (out, "%lu", tuple.post); break; > - case 'E': fprintf (out, "%lu", tuple.pre_stretched); break; > - case 'O': fprintf (out, "%lu", tuple.post_stretched); break; > - case 's': fprintf (out, "%lu", tuple.size); break; > + case 'o': fprintf (out, "%i", tuple.post); break; > + case 'E': fprintf (out, "%i", tuple.pre_stretched); break; > + case 'O': fprintf (out, "%i", tuple.post_stretched); break; > + case 's': fprintf (out, "%i", tuple.size); break; > case 'l': fprintf (out, "%u", tuple.level); break; > > case 'p': > @@ -616,7 +615,7 @@ > break; > case 'P': > if (tuple.parent) > - fprintf (out, "%lu",tuple.parent->pre_stretched); > + fprintf (out, "%i",tuple.parent->pre_stretched); > else > fprintf (out, "NULL"); > break; > @@ -653,7 +652,7 @@ > fprintf(out, "NULL"); > } > break; > - case 'g': fprintf (out, "%lu", tuple.guide); break; > + case 'g': fprintf (out, "%i", tuple.guide); break; > > default: putc (format[i], out); break; > } > @@ -966,7 +965,7 @@ > /* print the node self */ > fprintf ( > guide_out, > - "<node guide=\"%lu\" count=\"%lu\" kind=\"", > + "<node guide=\"%i\" count=\"%i\" kind=\"", > root->guide, > root->count); > print_kind (guide_out, root->kind); > > > ------------------------------------------------------------------------- > 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-pf-checkins mailing list > Monetdb-pf-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins -- Sjoerd Mullender

4 5

[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