- developers-list - monetdb.org

[Monetdb-developers] Oops
by Sjoerd Mullender 30 Jul '07

30 Jul '07

I forgot to add a file to the list of files to be checked out in the CVSROOT directory when I added a commit test there. This means that it is now impossible to check anything in on Sourceforge. I have already submitted a support request, so we just have to wait until they can handle that. -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal/Tests bpmUpdate.mal, , NONE, 1.1 bpmUpdate.stable.err, , NONE, 1.1 bpmUpdate.stable.out, , NONE, 1.1 All, , 1.36, 1.37 inspect05.stable.out, , 1.318, 1.319 bpt00.mal, , 1.8, NONE bpt00.stable.err, , 1.2, NONE bpt00.stable.out, , 1.21, NONE bpt03.mal, , 1.7, NONE bpt03.stable.err, , 1.2, NONE bpt03.stable.out, , 1.21, NONE bpt04.mal, , 1.7, NONE bpt04.stable.err, , 1.2, NONE bpt04.stable.out, , 1.21, NONE bpt05.mal, , 1.5, NONE bpt05.stable
by Stefan Manegold 28 Jul '07

28 Jul '07

On Sat, Jul 28, 2007 at 01:48:06AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7852 > > Modified Files: > All inspect05.stable.out > Added Files: > bpmUpdate.mal bpmUpdate.stable.err bpmUpdate.stable.out > Removed Files: > bpt00.mal bpt00.stable.err bpt00.stable.out bpt03.mal > bpt03.stable.err bpt03.stable.out bpt04.mal bpt04.stable.err > bpt04.stable.out bpt05.mal bpt05.stable.err bpt05.stable.out > bpt06.mal bpt06.stable.err bpt06.stable.out > Log Message: > Removing old tests that are not relevant anymore. > Added a basic test for bpm [...] > --- NEW FILE: bpmUpdate.stable.err --- > stderr of test 'bpmUpdate` in directory 'src/modules/mal` itself: > > > # 03:37:48 > > # 03:37:48 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set "xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set mapi_open=true --set mapi_port=39694 --set xrpc_port=49963 --set monet_prompt= --trace --dbname=mTests_src_modules_mal bpmUpdate.mal > # 03:37:48 > > > #warning: please don't forget to set your vault key! > #(see /ufs/mk/monet5/Linux/etc/monetdb5.conf) > mserver5: /ufs/mk/monet5//package/MonetDB5/src/modules/mal/bpm.mx:726: newPartition: Assertion `bpmcat[i] == ((void *)0)' failed. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > !Mtimeout: signal 6: mserver5 --config=/ufs/mk/monet5/Linux/etc/monetdb5.conf --debug=10 --set monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin --set gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm --set sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs --set xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs --set mapi_open=true --set mapi_port=39694 --set xrpc_port=49963 --set monet_prompt= --trace --dbname=mTests_src_modules_mal bpmUpdate.mal ^^^^^^^^^^^^^^^^^^^^ Have the above error messages been approved intentionally i.e. is this test supposed to fail like this? Or have they been approved "by accident" (explicitely(!) using `Mapprove -f ...`)? If the latter please fix the stable output. 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 |

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB/src/gdk gdk_system.mx, , 1.103, 1.104
by Stefan Manegold 24 Jul '07

24 Jul '07

On Thu, Jul 19, 2007 at 03:55:14PM +0000, Fabian wrote: > Update of /cvsroot/monetdb/MonetDB/src/gdk > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4085 > > Modified Files: > gdk_system.mx > Log Message: > - added MT_join_thread to wait for a thread to exit > - don't rely on the Apple compiler, but rely on the Mach-O system > instead when trying to get around missing semaphore functionalities OK, but shouldn't it be "__MACH__" instead of "__MACH_O__": ======== monet@horizon::/tmp> uname -a -------- Darwin horizon.cs.umass.edu 8.10.0 Darwin Kernel Version 8.10.0: Wed May 23 16:50:59 PDT 2007; root:xnu-792.21.3~1/RELEASE_PPC Power Macintosh powerpc ======== monet@horizon::/tmp> cat x.c -------- #include <stdlib.h> #include <stdio.h> int main () { #ifdef __APPLE_CC__ printf("__APPLE_CC__ = %d\n", __APPLE_CC__); #endif #ifdef __MACH__ printf("__MACH__ = %d\n", __MACH__); #endif #ifdef __MACH_O__ printf("__MACH_O__ = %d\n", __MACH_O__); #endif return 0; } ======== monet@horizon::/tmp> gcc x.c -o x && ./x -------- __APPLE_CC__ = 1809 __MACH__ = 1 ======== monet@horizon::/tmp> find /usr/include/ -type f | xargs grep --color -w __MACH_O__ ======== monet@horizon::/tmp> find /usr/include/ -type f | xargs grep --color -w __MACH__ -------- /usr/include//com_err.h:#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__)) /usr/include//des.h:#if defined(__MACH__) && defined(__APPLE__) /usr/include//gcc/darwin/3.3/c++/cctype:#if defined(__APPLE__) && defined(__MACH__) Binary file /usr/include//gcc/darwin/4.0/c++/i686-apple-darwin8/bits/stdc++.h.gch/O0g.gch matches Binary file /usr/include//gcc/darwin/4.0/c++/i686-apple-darwin8/bits/stdc++.h.gch/O2g.gch matches Binary file /usr/include//gcc/darwin/4.0/c++/powerpc-apple-darwin8/bits/stdc++.h.gch/O0g.gch matches Binary file /usr/include//gcc/darwin/4.0/c++/powerpc-apple-darwin8/bits/stdc++.h.gch/O2g.gch matches /usr/include//gssapi/gssapi.h:#if defined(__MACH__) && defined(__APPLE__) /usr/include//kerberosIV/des.h:#if defined(__MACH__) && defined(__APPLE__) /usr/include//kerberosIV/krb.h:#if defined(__MACH__) && defined(__APPLE__) /usr/include//krb.h:#if defined(__MACH__) && defined(__APPLE__) /usr/include//krb5.h:#if defined(__MACH__) && defined(__APPLE__) Binary file /usr/include//libc-gcc3.p matches Binary file /usr/include//mach/mach-gcc3.p matches /usr/include//profile.h:#if defined(__MACH__) && defined(__APPLE__) /usr/include//TargetConditionals.h: #ifdef __MACH__ /usr/include//TargetConditionals.h: #ifdef __MACH__ /usr/include//tidy/platform.h:#elif defined(__APPLE__) && defined(__MACH__) Binary file /usr/include//unistd-gcc3.p matches /usr/include//wx-2.5/wx/defs.h: #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T) /usr/include//wx-2.5/wx/filefn.h: #ifdef __MACH__ /usr/include//wx-2.5/wx/filefn.h: #if !defined(__WXMAC__) || defined(__UNIX__) || defined(__MACH__) /usr/include//wx-2.5/wx/filefn.h:#elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__) /usr/include//wx-2.5/wx/platform.h: #if defined(__MACH__) /usr/include//wx-2.5/wx/wxchar.h:#if defined(__MWERKS__) && !defined(__MACH__) /usr/include//wx-2.5/wx/wxchar.h: #elif defined(__MWERKS__) && ( defined(__MSL__) || defined(__MACH__) ) /usr/include//wx-2.5/wx/wxchar.h: #ifdef __MACH__ /usr/include//wx-2.5/wx/wxchar.h: #if defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000) ======== ?? *Maybe*, that would help to get client tests on MacOS X / Darwin (on PowerPC) working, again ... Stefan > > Index: gdk_system.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_system.mx,v > retrieving revision 1.103 > retrieving revision 1.104 > diff -u -d -r1.103 -r1.104 > --- gdk_system.mx 2 May 2007 16:17:00 -0000 1.103 > +++ gdk_system.mx 19 Jul 2007 15:55:11 -0000 1.104 > @@ -143,6 +143,7 @@ > gdk_export void MT_exit_thread(int status); > gdk_export void MT_global_exit(int status); > gdk_export MT_Id MT_getpid(void); > +gdk_export int MT_join_thread(MT_Id t); > gdk_export int MT_kill_thread(MT_Id t); > > #ifdef HAVE_PTHREAD_SIGMASK > @@ -187,7 +188,7 @@ > > @- MT Semaphore API > @h > -#if defined(_AIX) || defined(__APPLE_CC__) > +#if defined(_AIX) || defined(__MACH_O__) > typedef struct { > int cnt; > pthread_mutex_t mutex; > @@ -425,6 +426,12 @@ > pthread_exit(&st); > } > > +int > +MT_join_thread(MT_Id t) > +{ > + return pthread_join((pthread_t)(t - 1), NULL); > +} > + > > int > MT_kill_thread(MT_Id t) > @@ -439,7 +446,7 @@ > #endif > } > > -#if defined(_AIX) || defined(__APPLE_CC__) > +#if defined(_AIX) || defined(__MACH_O__) > void > pthread_sema_init(pthread_sema_t *s, int flag, int nresources) > { > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft 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 -- | 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

[Monetdb-developers] Prepared Statement Error
by Bharani 23 Jul '07

23 Jul '07

Hi, I am trying to execute this sql as prepared statement update reason set failurereason=? where ID=? reason is a table with two columns ID is integer failurereason is a string During the batch execution i see exec 3('whatever',2); in the batch and then i get MALException:(unknown):wrong argument for prepared statement (expected int instead of char) Looks like expected types are getting swapped. Thanks Bharani -- View this message in context: http://www.nabble.com/Prepared-Statement-Error-tf4116290.html#a11705803 Sent from the monetdb-developers mailing list archive at Nabble.com.

2 3

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/runtime pf_support.mx, , 1.250, 1.251
by Jan Rittinger 21 Jul '07

21 Jul '07

Stefan, thanks a lot! Your change speeds up XMark Q10 (on a 100MB sf 1.0 variant) by a second (4958 vs. 3828 -- measured on my laptop; compiled without optimization). If I only look at the times for the multi_merged_union call I can even see an improvement of factor 2.5 (1821 vs. 726 ms). Jan On 07/20/2007 11:12 PM, Stefan Manegold wrote with possible deletions: > Update of /cvsroot/monetdb/pathfinder/runtime > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23220/runtime > > Modified Files: > pf_support.mx > Log Message: > > finally, I managed to fullfil JanR's "small wish": > > replaced > > PROC multi_merged_union (BAT[void, BAT] b) : BAT[void,BAT] > > by > > .COMMAND multi_merged_union (BAT[void, BAT] b) > : BAT[void,BAT] = CMDmulti_merged_union; > "PARAMETERS: > BAT[void,BAT t[void,BAT c[VoID,any]]]: > a void-headed BAT of n void-headed BATs t such that each BAT t represents a > relational table t of m columns c, each represented by a dense-headed BAT c; > the first column of each table must be sorted. > DESCRIPTION: > Merges the n relational tables t according to the value-order as defined by the > first columns of all tables." > > At a slight performance decrease with only 2 or 3 tables, > it yields a performance gain of 25% - 63% with 4-9 tables > (each table has 9 columns and 1000000 tuples): > > # Old New New-Old (N-O)/O > 2 289745 339914 50169 17% > 3 719059 904862 185803 25% > 4 1302676 955985 -346691 -26% > 5 2023403 1082348 -941055 -46% > 6 2922657 1359887 -1562770 -53% > 7 3757045 1597463 -2159582 -57% > 8 5151854 1878731 -3273123 -63% > 9 6028759 2177258 -3851501 -63% > > > Index: pf_support.mx > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v > retrieving revision 1.250 > retrieving revision 1.251 > diff -u -d -r1.250 -r1.251 > --- pf_support.mx 12 Jul 2007 10:23:29 -0000 1.250 > +++ pf_support.mx 20 Jul 2007 21:12:46 -0000 1.251 > @@ -133,6 +133,17 @@ > input." > @) > > +.COMMAND multi_merged_union (BAT[void, BAT] b) > + : BAT[void,BAT] = CMDmulti_merged_union; > +"PARAMETERS: > +BAT[void,BAT t[void,BAT c[VoID,any]]]: > +a void-headed BAT of n void-headed BATs t such that each BAT t represents a > +relational table t of m columns c, each represented by a dense-headed BAT c; > +the first column of each table must be sorted. > +DESCRIPTION: > +Merges the n relational tables t according to the value-order as defined by the > +first columns of all tables." > + > .COMMAND ll_tokenize( BAT[void,str] strs, BAT[void,str] seps ) > : BAT[oid,str] = CMDll_strSplit; > "PARAMETERS: > @@ -5042,266 +5053,353 @@ > } > > static int > -merged_union( BAT** res, int nbats, BAT **b) > +merged_union( BAT** res, int ntabs, int ncols, BAT ***b) > { > - BAT *bn[MAXPARAMS>>1], *BN; > - BUN cur[MAXPARAMS], dst[MAXPARAMS>>1], DST; > - int bs[MAXPARAMS], bns[MAXPARAMS>>1], BS; > - size_t idx[MAXPARAMS], cnt[MAXPARAMS]; > - int npairs = 1, i, j, k, any, b0 = -1, b1 = -1; > - bit concat = FALSE; > - chr *w = NULL; > - size_t sze = 0, h = 0; > + BAT *bn[ncols], *BN, *temp, *tmp[2], *tgt; > + BUN cur[ntabs][ncols], dst[ncols], DST; > + bte bs[ntabs][ncols], bns[ncols], BS; > + bit mat[ntabs]; > + int ttpe[ncols]; /* sht / bte ? */ > + oid hsqb[ntabs]; > + size_t Bcnt[ntabs], inc[2]; > + int t, c, any, non_empty[ntabs+1]; > + bit concat01 = FALSE, concat10 = FALSE; > + bte *w = NULL, *ww[2], *wt, *ws[2]; > + size_t res_count = 0, h = 0; > + > + BAT *src[2]; > + BUN csr[2]; > + bte sze[2]; > + size_t idx[2], cnt[2], hs[2], ht; > > + assert(ncols > 0); > + assert(ntabs > 1); > + assert(ntabs <= GDK_bte_max); /* allows to use type bte for w[] */ > + > *res = NULL; > > /* check arguments */ > - ERRORcheck(BATcount(b[0])>1 && !(BATtordered(b[0])&1), "merged_union: tail of first BAT must be sorted.\n"); > - ERRORcheck(BATcount(b[1])>1 && !(BATtordered(b[1])&1), "merged_union: tail of second BAT must be sorted.\n"); > - if (nbats&1) { > - GDKerror("merged_union: uneven number of BATs: %d.\n", nbats); > - return GDK_FAIL; > - } > - npairs = nbats>>1; > - > - for (i=0; i<nbats; i+=2) { > - bit ci, cj; > - j = i+1; > - ci = !is_fake_project(b[i]); > - cj = !is_fake_project(b[j]); > - if (ci && b0 < 0) { > - b0 = i; > - } > - if (cj && b1 < 0) { > - b1 = j; > - } > - if (ci && !BAThdense(b[i])) { > - GDKerror("merged_union: BAT %d must have a dense head.\n", i+1); > - return GDK_FAIL; > - } > - if (cj && !BAThdense(b[j])) { > - GDKerror("merged_union: BAT %d must have a dense head.\n", j+1); > - return GDK_FAIL; > - } > - if (ATOMtype(b[i]->ttype) != ATOMtype(b[j]->ttype)) { > - GDKerror("merged_union: BATs %d (ttype=%d) & %d (ttype=%d) must have the same tail types.\n", > - i+1, b[i]->ttype, j+1, ATOMtype(b[j]->ttype)); > - return GDK_FAIL; > - } > - if (ci && b0 >= 0 && b[i]->hseqbase != b[b0]->hseqbase) { > - GDKerror("merged_union: BAT %d (hseqbase="OIDFMT") must have the same hseqbase as BAT %d (hseqbase="OIDFMT").\n", > - i+1, b[i]->hseqbase, b0+1, b[b0]->hseqbase); > + for (t=0; t<ntabs; t++) { > + if (BATcount(b[t][0])>1 && !(BATtordered(b[t][0])&1)) { > + GDKerror("merged_union: tail of first BAT/column of table %d must be sorted.\n", t+1); > return GDK_FAIL; > } > - if (cj && b1 >= 0 && b[j]->hseqbase != b[b1]->hseqbase) { > - GDKerror("merged_union: BAT %d (hseqbase="OIDFMT") must have the same hseqbase as BAT %d (hseqbase="OIDFMT").\n", > - j+1, b[j]->hseqbase, b1+1, b[b1]->hseqbase); > - return GDK_FAIL; > + } > + > + for (t=0; t<ntabs; t++) { > + mat[t] = FALSE; > + hsqb[t] = oid_nil; > + Bcnt[t] = (size_t)-1; > + } > + for (c=0; c<ncols; c++) { > + ttpe[c] = int_nil; > + } > + > + non_empty[ntabs] = 0; > + for (t=0; t<ntabs; t++) { > + for (c=0; c<ncols; c++) { > + if (ttpe[c] == int_nil || ( ttpe[c] == TYPE_oid && b[t][c]->ttype == TYPE_void ) ) { > + /* get column type and record whether any OID column was non-materialized (VoID) */ > + ttpe[c] = b[t][c]->ttype; > + } else { > + /* check column type (VoID matches with OID) */ > + if (ATOMtype(ttpe[c]) != ATOMtype(b[t][c]->ttype)) { > + GDKerror("merged_union: BAT/column %d of table %d (ttype=%d) must have the same tail type as BAT/column %d of all other tables (ttype=%d).\n", > + c+1, t+1, b[t][c]->ttype, c+1, ATOMtype(ttpe[c])); > + return GDK_FAIL; > + } > } > - if (ci && b0 >= 0 && BATcount(b[i]) != BATcount(b[b0])) { > - GDKerror("merged_union: BAT %d ("SZFMT" BUNs) must have the same size as BAT %d ("SZFMT" BUNs).\n", > - i+1, BATcount(b[i]), b0+1, BATcount(b[b0])); > - return GDK_FAIL; > + if (!is_fake_project(b[t][c])) { > + mat[t] |= TRUE; > + if (!BAThdense(b[t][c])) { > + GDKerror("merged_union: BAT/column %d of table %d must have a dense head.\n", c+1, t+1); > + return GDK_FAIL; > + } > + if (hsqb[t] == oid_nil) { > + hsqb[t] = b[t][c]->hseqbase; > + } else { > + if (hsqb[t] != b[t][c]->hseqbase) { > + GDKerror("merged_union: BAT/column %d of table %d (hseqbase="OIDFMT") must have the same hseqbase as all other BATs/columns of table %d (hseqbase="OIDFMT").\n", > + c+1, t+1, b[t][c]->hseqbase, t+1, hsqb[t]); > + return GDK_FAIL; > + } > + } > + if (Bcnt[t] == (size_t)-1) { > + Bcnt[t] = BATcount(b[t][c]); > + } else { > + if (Bcnt[t] != BATcount(b[t][c])) { > + GDKerror("merged_union: BAT/column %d of table %d ("SZFMT" BUNs) must have the same size as all other BATs/columns of table %d ("SZFMT" BUNs).\n", > + c+1, t+1, BATcount(b[t][c]), t+1, Bcnt[t]); > + return GDK_FAIL; > + } > + } > } > - if (cj && b1 >= 0 && BATcount(b[j]) != BATcount(b[b1])) { > - GDKerror("merged_union: BAT %d ("SZFMT" BUNs) must have the same size as BAT %d ("SZFMT" BUNs).\n", > - j+1, BATcount(b[j]), b1+1, BATcount(b[b1])); > + } > + if (!mat[t]) { > + GDKerror("merged_union: at least one BAT/column of table %d must be materialized, i.e., no 'fake_project'.\n", t+1); > return GDK_FAIL; > - } > - } > - if (b0 < 0) { > - GDKerror("merged_union: at least one of the 'odd' BATs must be materialized, i.e., no 'fake_project'.\n"); > - return GDK_FAIL; > - } > - if (b1 < 0) { > - GDKerror("merged_union: at least one of the 'even' BATs must be materialized, i.e., no 'fake_project'.\n"); > - return GDK_FAIL; > + } > + res_count += Bcnt[t]; > + non_empty[non_empty[ntabs]] = t; > + non_empty[ntabs] += (Bcnt[t] > 0); > } > > /* create result BATs */ > > - sze = BATcount(b[b0]) + BATcount(b[b1]); > - BN = BATnew(TYPE_void, TYPE_bat, npairs); > + BN = BATnew(TYPE_void, TYPE_bat, ncols); > if (BN == NULL) { > - GDKerror("merged_union: BATnew(TYPE_void, TYPE_bat, %d) failed.\n", npairs); > + GDKerror("merged_union: BATnew(TYPE_void, TYPE_bat, %d) failed.\n", ncols); > return GDK_FAIL; > } > - for (k=0; k<npairs; k++) { > - i = k<<1; > - bn[k] = BATnew(TYPE_void, ATOMtype(b[i]->ttype), sze); > - if (bn[k] == NULL) { > - GDKerror("merged_union: BATnew(TYPE_void, %s, " SZFMT ") failed.\n", ATOMname(ATOMtype(b[i]->ttype)), sze); > - while (k>0) { > - BBPreclaim(bn[--k]); > + temp = BATnew(TYPE_void, ATOMtype(ttpe[0]), res_count); > + if (temp == NULL) { > + GDKerror("merged_union: BATnew(TYPE_void, %s, " SZFMT ") failed.\n", ATOMname(ATOMtype(ttpe[0])), res_count); > + BBPreclaim(BN); > + return GDK_FAIL; > + } > + for (c=0; c<ncols; c++) { > + bn[c] = BATnew(TYPE_void, ATOMtype(ttpe[c]), res_count); > + if (bn[c] == NULL) { > + GDKerror("merged_union: BATnew(TYPE_void, %s, " SZFMT ") failed.\n", ATOMname(ATOMtype(ttpe[c])), res_count); > + while (c>0) { > + BBPreclaim(bn[--c]); > } > + BBPreclaim(temp); > BBPreclaim(BN); > return GDK_FAIL; > } > } > - if (sze > 0) { > - w = (chr*)GDKmalloc(sze); > - if (w == NULL) { > - GDKerror("merged_union: GDKmalloc(" SZFMT ") failed.\n", sze); > - goto cleanup; > - } > + w = (bte*)GDKmalloc(2*res_count + 1); > + if (w == NULL) { > + GDKerror("merged_union: GDKmalloc(" SZFMT ") failed.\n", 2*res_count + 1); > + goto cleanup; > } > > /* do the merged_union */ > > - for (k=0; k<npairs; k++) { > - bns[k] = BUNsize(bn[k]); > - dst[k] = BUNlast(bn[k]); > + for (c=0; c<ncols; c++) { > + bns[c] = (bte)BUNsize(bn[c]); > + dst[c] = BUNlast(bn[c]); > } > - for (i=0; i<nbats; i++) { > - if (is_fake_project(b[i])) { > - bs[i] = 0; > - } else { > - bs[i] = BUNsize(b[i]); > - } > - cur[i] = BUNfirst(b[i]); > - idx[i] = 0; > - if (i&1) { > - cnt[i] = BATcount(b[b1]); > + for (t=0; t<ntabs; t++) { > + for (c=0; c<ncols; c++) { > + if (is_fake_project(b[t][c])) { > + bs[t][c] = (bte)0; > } else { > - cnt[i] = BATcount(b[b0]); > + bs[t][c] = (bte)BUNsize(b[t][c]); > } > + cur[t][c] = BUNfirst(b[t][c]); > + } > } > +@ > @= merged_union_0 > - /* @1: ATOMstorage(b[@3]->ttype) (chr, sht, int, flt, lng, dbl, any=b[@3]->ttype) > + /* @1: ATOMstorage(ttpe[0]) (chr, bte, sht, int, flt, lng, dbl, any=ttpe[0]) > * @2: tloc, tvar, tail > - * @3: 0, 1 > - * @5: tail value comparison, > - e.g., simple_LE(BUN@2(b[0],cur[0]), BUN@2(b[1],cur[1]), @1) > - or atom_GT(BUN@2(b[0],cur[0]), BUN@2(b[1],cur[1]), @1) > + * @3: 0 1 > + * @4: tail value comparison, > + e.g., simple_LE(BUN@2(src[0],csr[0]), BUN@2(src[1],csr[1]), @1) > + or atom_GT(BUN@2(src[0],csr[0]), BUN@2(src[1],csr[1]), @1) > */ > /* copy tails from BAT @3 to the results; > for each BUN, remember in w, whether it came from BAT 0 or BAT 1 */ > while ((idx[@3] < cnt[@3]) && (@4)) { > - void@1_bunfastins_nocheck_noinc(bn[0],dst[0],0,BUN@2(b[@3],cur[@3])); > + void@1_bunfastins_nocheck_noinc(tgt,dst[0],0,BUN@2(src[@3],csr[@3])); > + wt[ht] = ws[@3][hs[@3]]; > idx[@3]++; > - cur[@3] += bs[@3]; > + csr[@3] += sze[@3]; > dst[0] += bns[0]; > - w[h++] = (chr)@3; > + hs[@3] += inc[@3]; > + ht++; > } > + > + /* sucessively pair-wise merge-union the first BAT/column of all tables */ > +@ > @= merged_union_1 > - /* @1: ATOMstorage(b[0]->ttype) (chr, sht, int, flt, lng, dbl, any=b[0]->ttype) > + /* @1: ATOMstorage(ttpe[0]) (chr, bte, sht, int, flt, lng, dbl, any=ttpe[0]) > * @2: tloc, tvar, tail (for BAT 0) > * @3: tloc, tvar, tail (for BAT 1) > * @4: simple, atom > */ > - /* merge-union the first two BATs; regard and preserve tail-order */ > - h = 0; > - concat = (BATcount(b[0])==0 || BATcount(b[1])==0); > - if (!concat) { > - concat = ( BATtordered(b[0])&BATtordered(b[1])&1 && \ > - @4_LE(BUN@2(b[0],BUNlast(b[0])-BUNsize(b[0])),BUN@3(b[1],cur[1]),@1) ); > + /* merge-union the first BATs/columns; regard and preserve tail-order */ > + concat01 = (cnt[0]==0 || cnt[1]==0); > + concat10 = FALSE; > + if (BATtordered(src[0])&BATtordered(src[1])&1 || (BATtordered(src[0])&1 && cnt[1]==1) || (cnt[0]==1 && BATtordered(src[1])&1) ) { > + if (!concat01) { > + concat01 = @4_LE(BUN@2(src[0],BUNlast(src[0])-BUNsize(src[0])),BUN@3(src[1],csr[1]),@1); > + } > + if (!concat01) { > + concat10 = @4_LT(BUN@3(src[1],BUNlast(src[1])-BUNsize(src[1])),BUN@2(src[0],csr[0]),@1); > + } > } > - if (!concat) { > + if (!concat01 && !concat10) { > while ((idx[0] < cnt[0]) && (idx[1] < cnt[1])) { > - @:merged_union_0(@1,@2,0,@4_LE(BUN@2(b[0],cur[0]),BUN@3(b[1],cur[1]),@1))@ > + @:merged_union_0(@1,@2,0,@4_LE(BUN@2(src[0],csr[0]),BUN@3(src[1],csr[1]),@1))@ > if (idx[0] < cnt[0]) { > - @:merged_union_0(@1,@3,1,@4_GT(BUN@2(b[0],cur[0]),BUN@3(b[1],cur[1]),@1))@ > + @:merged_union_0(@1,@3,1,@4_GT(BUN@2(src[0],csr[0]),BUN@3(src[1],csr[1]),@1))@ > } > } > } > /* get remaining BUNs */ > - @:merged_union_0(@1,@2,0,TRUE)@ > + if (!concat10) { > + @:merged_union_0(@1,@2,0,TRUE)@ > + } > @:merged_union_0(@1,@3,1,TRUE)@ > + @:merged_union_0(@1,@2,0,TRUE)@ > +@ > @= merged_union_2 > - /* @1: ATOMstorage(b[0]->ttype) (chr, sht, int, flt, lng, dbl, any=b[0]->ttype) > + /* @1: ATOMstorage(ttpe[0]) (chr, bte, sht, int, flt, lng, dbl, any=ttpe[0]) > * @2: tloc, tvar, tail (for BAT 0) > * @3: simple, atom > */ > @:merged_union_1(@1,@2,@2,@3)@ > break; > +@ > @= merged_union_3 > - /* @1: ATOMstorage(b[@3]->ttype) (chr, sht, int, flt, lng, dbl, any=b[0]->ttype) > - * @2: tloc, tvar, tail > - */ > - /* merge-union each of the remaining BAT-pairs; > - w tell us, from which BAT we need to get the next BUN */ > - for (h=0; h<sze; h++) { > - j = i + (int)w[h]; > - void@1_bunfastins_nocheck_noinc(bn[k],dst[k],0,BUN@2(b[j],cur[j])); > - idx[j]++; > - cur[j] += bs[j]; > - dst[k] += bns[k]; > - } > -@= merged_union_4 > - /* @1: ATOMstorage(b[@3]->ttype) (chr, sht, int, flt, lng, dbl, any=b[0]->ttype) > - * @2: tloc, tvar, tail > - */ > - @:merged_union_3(@1,@2)@ > - break; > -@c > - /* merge-union the first two BATs */ > + sze[0] = BUNsize(src[0]); > + sze[1] = BUNsize(src[1]); > + csr[0] = BUNfirst(src[0]); > + csr[1] = BUNfirst(src[1]); > + cnt[0] = BATcount(src[0]); > + cnt[1] = BATcount(src[1]); > + dst[0] = BUNfirst(tgt); > + idx[0] = idx[1] = 0; > + hs[0] = hs[1] = ht = 0; > + > /* HACK(?): compare [v]oid (unsigned) as int/lng (signed) to get nil's first... */ > #if SIZEOF_OID == SIZEOF_INT > - if (b[0]->ttype==TYPE_void && b[1]->ttype==TYPE_void) { > - @:merged_union_1(int,tvar,tvar,simple)@ > - } else if (b[0]->ttype==TYPE_void && b[1]->ttype==TYPE_oid) { > - @:merged_union_1(int,tvar,tloc,simple)@ > - } else if (b[0]->ttype==TYPE_oid && b[1]->ttype==TYPE_void) { > - @:merged_union_1(int,tloc,tvar,simple)@ > - } else if (b[0]->ttype==TYPE_oid && b[1]->ttype==TYPE_oid) { > - @:merged_union_1(int,tloc,tloc,simple)@ > + if (src[0]->ttype==TYPE_void && src[1]->ttype==TYPE_void) { > + @:merged_union_1(int,tvar,tvar,simple)@ > + } else if (src[0]->ttype==TYPE_void && src[1]->ttype==TYPE_oid) { > + @:merged_union_1(int,tvar,tloc,simple)@ > + } else if (src[0]->ttype==TYPE_oid && src[1]->ttype==TYPE_void) { > + @:merged_union_1(int,tloc,tvar,simple)@ > + } else if (src[0]->ttype==TYPE_oid && src[1]->ttype==TYPE_oid) { > + @:merged_union_1(int,tloc,tloc,simple)@ > #else > - if (b[0]->ttype==TYPE_void && b[1]->ttype==TYPE_void) { > - @:merged_union_1(lng,tvar,tvar,simple)@ > - } else if (b[0]->ttype==TYPE_void && b[1]->ttype==TYPE_oid) { > - @:merged_union_1(lng,tvar,tloc,simple)@ > - } else if (b[0]->ttype==TYPE_oid && b[1]->ttype==TYPE_void) { > - @:merged_union_1(lng,tloc,tvar,simple)@ > - } else if (b[0]->ttype==TYPE_oid && b[1]->ttype==TYPE_oid) { > - @:merged_union_1(lng,tloc,tloc,simple)@ > + if (src[0]->ttype==TYPE_void && src[1]->ttype==TYPE_void) { > + @:merged_union_1(lng,tvar,tvar,simple)@ > + } else if (src[0]->ttype==TYPE_void && src[1]->ttype==TYPE_oid) { > + @:merged_union_1(lng,tvar,tloc,simple)@ > + } else if (src[0]->ttype==TYPE_oid && src[1]->ttype==TYPE_void) { > + @:merged_union_1(lng,tloc,tvar,simple)@ > + } else if (src[0]->ttype==TYPE_oid && src[1]->ttype==TYPE_oid) { > + @:merged_union_1(lng,tloc,tloc,simple)@ > #endif > - } else { > - any = b[0]->ttype; > - switch(ATOMstorage(b[0]->ttype)) { > - case TYPE_chr: @:merged_union_2(chr,tloc,simple)@ > - case TYPE_sht: @:merged_union_2(sht,tloc,simple)@ > - case TYPE_int: @:merged_union_2(int,tloc,simple)@ > - case TYPE_flt: @:merged_union_2(flt,tloc,simple)@ > - case TYPE_lng: @:merged_union_2(lng,tloc,simple)@ > - case TYPE_dbl: @:merged_union_2(dbl,tloc,simple)@ > - default: > - if (b[0]->tvarsized) { > - @:merged_union_2(any,tvar,atom)@ > - } else { > - @:merged_union_2(any,tloc,atom)@ > + } else { > + any = src[0]->ttype; > + switch(ATOMstorage(any)) { > + case TYPE_chr: @:merged_union_2(chr,tloc,simple)@ > + case TYPE_bte: @:merged_union_2(bte,tloc,simple)@ > + case TYPE_sht: @:merged_union_2(sht,tloc,simple)@ > + case TYPE_int: @:merged_union_2(int,tloc,simple)@ > + case TYPE_flt: @:merged_union_2(flt,tloc,simple)@ > + case TYPE_lng: @:merged_union_2(lng,tloc,simple)@ > + case TYPE_dbl: @:merged_union_2(dbl,tloc,simple)@ > + default: > + if (src[0]->tvarsized) { > + @:merged_union_2(any,tvar,atom)@ > + } else { > + @:merged_union_2(any,tloc,atom)@ > + } > } > } > + > + tgt->batBuns->free = dst[0] - tgt->batBuns->base; > + BATsetcount(tgt, tgt->batBuns->free/bns[0]); > + if (!tgt->batDirty) tgt->batDirty = TRUE; > + BATkey(BATmirror(tgt),FALSE); > + tgt->tsorted = GDK_SORTED; > + tgt->tdense = FALSE; > +@ > +@c > + tgt = bn[0]; > + wt = w; > + ws[0] = w + res_count; > + ws[1] = w + res_count + 1; > + inc[0] = inc [1] = 0; > + > + if (non_empty[ntabs] == 1) { > + src[0] = b[non_empty[0]][0]; > + src[1] = b[non_empty[0] == 0][0]; > + ws[0][0] = non_empty[0]; > + ws[1][0] = (non_empty[0] == 0); > + > + @:merged_union_3@ > + } else > + if (non_empty[ntabs] == 2) { > + src[0] = b[non_empty[0]][0]; > + src[1] = b[non_empty[1]][0]; > + ws[0][0] = non_empty[0]; > + ws[1][0] = non_empty[1]; > + > + @:merged_union_3@ > + } else { > + t = ntabs - 1; > + tmp[0] = bn[0]; > + tmp[1] = temp; > + ww[0] = w; > + ww[1] = ws[1]; > + wt = ww[t&1]; > + wt[0] = t; > + tgt = b[t--][0]; > + for (; t >= 0; t--) { > + src[0] = b[t][0]; > + src[1] = tgt; > + tgt = tmp[t&1]; > + ws[0][0] = t; > + ws[1] = wt; > + wt = ww[t&1]; > + > + @:merged_union_3@ > + > + inc[1] = 1; > + } > } > - /* merge-union each of the remaining BAT-pairs */ > - for (k=1; k<npairs; k++) { > - i = (k<<1); > - j = i+1; > -/* HACK(?): compare [v]oid (unsigned) at int/lng (signed) to get nil's first... */ > -#if SIZEOF_OID == SIZEOF_INT > - if (b[i]->ttype==TYPE_void || b[j]->ttype==TYPE_void) { > - @:merged_union_3(int,tail,simple)@ > - } else if (b[i]->ttype==TYPE_oid && b[j]->ttype==TYPE_oid) { > - @:merged_union_3(int,tloc,simple)@ > -#else > - if (b[i]->ttype==TYPE_void || b[j]->ttype==TYPE_void) { > - @:merged_union_3(lng,tail,simple)@ > - } else if (b[i]->ttype==TYPE_oid && b[j]->ttype==TYPE_oid) { > - @:merged_union_3(lng,tloc,simple)@ > -#endif > + > + /* merge-union the remaining BATs/columns of all tables */ > +@ > +@= merged_union_4 > + /* @1: ATOMstorage(ttpe[c]) (chr, bte, sht, int, flt, lng, dbl, any) > + * @2: tloc, tvar, tail > + */ > + /* merge-union the remaining BATs/columns of all tables: > + w tell us, from which table we need to get the next BUN */ > + for (h=0; h<res_count; h++) { > + t = w[h]; > + void@1_bunfastins_nocheck_noinc(bn[c],dst[c],0,BUN@2(b[t][c],cur[t][c])); > + cur[t][c] += bs[t][c]; > + dst[c] += bns[c]; > + } > +@ > +@= merged_union_5 > + /* @1: ATOMstorage(ttpe[c]) (chr, bte, sht, int, flt, lng, dbl, any) > + * @2: tloc, tvar, tail > + */ > + @:merged_union_4(@1,@2)@ > + break; > +@ > +@c > + for (c=1; c<ncols; c++) { > + if (ttpe[c]==TYPE_void) { > + /* at least one OID column is non-materialized (VoID) */ > + @:merged_union_4(oid,tail)@ > + } else if (ttpe[c]==TYPE_oid) { > + /* all OID columns are materialized */ > + @:merged_union_4(oid,tloc)@ > } else { > - any = b[i]->ttype; > - switch(ATOMstorage(b[i]->ttype)) { > - case TYPE_chr: @:merged_union_4(chr,tloc)@ > - case TYPE_sht: @:merged_union_4(sht,tloc)@ > - case TYPE_int: @:merged_union_4(int,tloc)@ > - case TYPE_flt: @:merged_union_4(flt,tloc)@ > - case TYPE_lng: @:merged_union_4(lng,tloc)@ > - case TYPE_dbl: @:merged_union_4(dbl,tloc)@ > + switch(ATOMstorage(ttpe[c])) { > + case TYPE_chr: @:merged_union_5(chr,tloc)@ > + case TYPE_bte: @:merged_union_5(bte,tloc)@ > + case TYPE_sht: @:merged_union_5(sht,tloc)@ > + case TYPE_int: @:merged_union_5(int,tloc)@ > + case TYPE_flt: @:merged_union_5(flt,tloc)@ > + case TYPE_lng: @:merged_union_5(lng,tloc)@ > + case TYPE_dbl: @:merged_union_5(dbl,tloc)@ > default: > - if (b[i]->tvarsized) { > - @:merged_union_4(any,tvar)@ > + if (b[0][c]->tvarsized) { > + @:merged_union_5(any,tvar)@ > } else { > - @:merged_union_4(any,tloc)@ > + @:merged_union_5(any,tloc)@ > } > } > } > @@ -5309,42 +5407,59 @@ > > /* set BAT properties */ > > - for (k=0; k<npairs; k++) { > - BAT *b0 = b[2*k], *b1 = b[(2*k)+1]; > - BATseqbase(bn[k], (oid)0); > - bn[k]->batBuns->free = dst[k] - bn[k]->batBuns->base; > - BATsetcount(bn[k], bn[k]->batBuns->free/BUNsize(bn[k])); > - if (!bn[k]->batDirty) bn[k]->batDirty = TRUE; > - BATkey(bn[k],TRUE); > - BATkey(BATmirror(bn[k]),FALSE); > - bn[k]->hsorted = GDK_SORTED; > - if (k==0 || (BATcount(b0)==0 && BATcount(b1)==0)) { > - bn[k]->tsorted = GDK_SORTED; > +@( > + /* not required as concat01 & concat10 are inherited from above */ > + if (non_empty[ntabs] == 2) { > + BAT *b0 = b[non_empty[0]][0]; > + BAT *b1 = b[non_empty[1]][0]; > + concat01 = concat10 = FALSE; > + if (BATtordered(b0)&BATtordered(b1)&1 || (BATtordered(b0)&1 && BATcount(b1)==1) || (BATcount(b0)==1 && BATtordered(b1)&1) ) { > + concat01 = atom_LE(BUNtail(b0,BUNlast(b0)-BUNsize(b0)),BUNtail(b1,BUNfirst(b1)),ATOMstorage(ATOMtype(ttpe[0]))); > + concat10 = !concat01 && \ > + atom_LT(BUNtail(b1,BUNlast(b1)-BUNsize(b1)),BUNtail(b0,BUNfirst(b0)),ATOMstorage(ATOMtype(ttpe[0]))); > + } > + } > +@) > + for (c=0; c<ncols; c++) { > + BATseqbase(bn[c], (oid)0); > + bn[c]->batBuns->free = dst[c] - bn[c]->batBuns->base; > + BATsetcount(bn[c], bn[c]->batBuns->free/bns[c]); > + assert(BATcount(bn[c]) == res_count); > + if (!bn[c]->batDirty) bn[c]->batDirty = TRUE; > + BATkey(bn[c],TRUE); > + BATkey(BATmirror(bn[c]),(res_count < 2)); > + bn[c]->hsorted = GDK_SORTED; > + if (c == 0 || res_count < 2) { > + bn[c]->tsorted = GDK_SORTED; > } else > - if (BATcount(b0)==0) { > - bn[k]->tsorted = (BATtordered(b1)&1 ? GDK_SORTED : FALSE); > + if (non_empty[ntabs] == 1) { > + bn[c]->tsorted = (BATtordered(b[non_empty[0]][c])&1 ? GDK_SORTED : FALSE); > } else > - if (BATcount(b1)==0) { > - bn[k]->tsorted = (BATtordered(b0)&1 ? GDK_SORTED : FALSE); > + if (non_empty[ntabs] == 2) { > + BAT *b0 = b[non_empty[0]][c]; > + BAT *b1 = b[non_empty[1]][c]; > + if ( ( BATtordered(b0)&BATtordered(b1)&1 || (BATtordered(b0)&1 && BATcount(b1)==1) || (BATcount(b0)==1 && BATtordered(b1)&1) ) && \ > + ( ( concat01 && atom_LE(BUNtail(b0,BUNlast(b0)-BUNsize(b0)),BUNtail(b1,BUNfirst(b1)),ATOMstorage(ATOMtype(ttpe[c]))) ) || \ > + ( concat10 && atom_LE(BUNtail(b1,BUNlast(b1)-BUNsize(b1)),BUNtail(b0,BUNfirst(b0)),ATOMstorage(ATOMtype(ttpe[c]))) ) ) ) { > + bn[c]->tsorted = GDK_SORTED; > + } else { > + bn[c]->tsorted = FALSE; > + } > } else { > - bn[k]->tsorted = ( ( concat && \ > - BATtordered(b0)&BATtordered(b1)&1 && \ > - atom_LE(BUNtail(b0,BUNlast(b0)-BUNsize(b0)),BUNtail(b1,BUNfirst(b1)),b0->ttype) ) \ > - ? GDK_SORTED \ > - : FALSE ); > + bn[c]->tsorted = FALSE; > } > - bn[k]->hdense = TRUE; > - bn[k]->tdense = FALSE; > + bn[c]->hdense = TRUE; > + bn[c]->tdense = FALSE; > } > > /* insert bn[] BATs in BN BAT */ > > DST = BUNlast(BN); > - BS = BUNsize(BN); > + BS = (bte)BUNsize(BN); > BATseqbase(BN, (oid)0); > - for (k=0; k<npairs; k++) { > - voidany_bunfastins_nocheck_noinc(BN,DST,0,&bn[k]->batCacheid); > - BBPunfix(bn[k]->batCacheid); > + for (c=0; c<ncols; c++) { > + voidany_bunfastins_nocheck_noinc(BN,DST,0,&bn[c]->batCacheid); > + BBPunfix(bn[c]->batCacheid); > DST += BS; > } > BN->batBuns->free = DST - BN->batBuns->base; > @@ -5360,34 +5475,67 @@ > *res = BN; > > GDKfree(w); > + BBPreclaim(temp); > > return GDK_SUCCEED; > bunins_failed: > GDKerror("merged_union: bunins failed.\n"); > cleanup: > BBPreclaim(BN); > - for (k=0; k<npairs; k++) { > - BBPreclaim(bn[k]); > + BBPreclaim(temp); > + for (c=0; c<ncols; c++) { > + BBPreclaim(bn[c]); > } > return GDK_FAIL; > } > > int CMDmerged_union( BAT** res, ptr L, int ltpe, ptr R, int rtpe, ... ) > { > - int i, tpe, nbats = 0, ret = GDK_SUCCEED; > - BAT *b[MAXPARAMS]; > + int tpe, nbats, t, ntabs = 2, ncols, ret = GDK_SUCCEED; > + BAT ***b; > va_list ap; > ptr p; > > + nbats = 2; > + va_start(ap,rtpe); > + while((p = va_arg(ap, ptr)) != NULL) { > + tpe = va_arg(ap, int); > + nbats++; > + } > + va_end(ap); > + if (nbats&1) { > + GDKerror("merged_union: uneven number of BATs: %d.\n", nbats); > + return GDK_FAIL; > + } > + ncols = nbats>>1; > + > + b = (BAT***)GDKmalloc(ntabs*sizeof(BAT**)); > + if (b == NULL) { > + GDKerror("merged_union: GDKmalloc(" SZFMT ") failed.\n", ntabs*sizeof(BAT**)); > + return GDK_FAIL; > + } > + for (t=0; t<ntabs; t++) { > + b[t] = (BAT**)GDKmalloc(ncols*sizeof(BAT*)); > + if (b[t] == NULL) { > + GDKerror("merged_union: GDKmalloc(" SZFMT ") failed.\n", ncols*sizeof(BAT*)); > + while (t>0) { > + GDKfree(b[--t]); > + } > + GDKfree(b); > + return GDK_FAIL; > + } > + } > + > + nbats = 0; > /* first convert any constant parameters to fake projects */ > - if (CMDfakeProject(b+nbats, L, ltpe) == GDK_SUCCEED) { > + if (CMDfakeProject(&b[nbats&1][nbats>>1], L, ltpe) == GDK_SUCCEED) { > nbats++; > - if (CMDfakeProject(b+nbats, R, rtpe) == GDK_SUCCEED) { > + if (CMDfakeProject(&b[nbats&1][nbats>>1], R, rtpe) == GDK_SUCCEED) { > nbats++; > va_start(ap,rtpe); > while((p = va_arg(ap, ptr)) != NULL) { > tpe = va_arg(ap, int); > - if (CMDfakeProject(b+nbats, p, tpe) == GDK_SUCCEED) { > + if (CMDfakeProject(&b[nbats&1][nbats>>1], p, tpe) == GDK_SUCCEED) { > nbats++; > } else { > ret = GDK_FAIL; > @@ -5398,11 +5546,104 @@ > } > } > if (ret == GDK_SUCCEED) { > - ret = merged_union(res, nbats, b); > + ret = merged_union(res, ntabs, ncols, b); > } > + > /* unfix all bats; this destroys any created fake projects */ > - for(i=0; i<nbats; i++) > - BBPunfix(b[i]->batCacheid); > + while (--nbats >= 0) { > + BBPunfix(b[nbats&1][nbats>>1]->batCacheid); > + } > + for(t=0; t<ntabs; t++) { > + GDKfree(b[t]); > + } > + GDKfree(b); > + return ret; > +} > + > +int CMDmulti_merged_union( BAT** res, BAT *Bt) > +{ > + int t, ntabs, c, ncols = 0, ret = GDK_SUCCEED; > + BAT **Bc, ***b; > + > + BATcheck(Bt, "multi_merged_union"); > + > + if (Bt->ttype != TYPE_bat) { > + GDKerror("multi_merged_union: tail-type must be BAT, not %s.\n", ATOMname(Bt->ttype)); > + return GDK_FAIL; > + } > + > + if ((ntabs = BATcount(Bt)) < 2) { > + GDKerror("multi_merged_union: input must contain at least 2 tables/BUNs.\n"); > + return GDK_FAIL; > + } > + > + Bc = (BAT**)GDKmalloc(ntabs*sizeof(BAT*)); > + if (Bc == NULL) { > + GDKerror("multi_merged_union: GDKmalloc(" SZFMT ") failed.\n", ntabs*sizeof(BAT*)); > + return GDK_FAIL; > + } > + > + for (t=0; t<ntabs; t++) { > + Bc[t] = BATdescriptor(*(bat*)BUNtloc(Bt, BUNptr(Bt,t))); > + if (Bc[t]->ttype != TYPE_bat) { > + GDKerror("multi_merged_union: tail-type of BAT holding table %d must be BAT, not %s.\n", t+1, ATOMname(Bc[t]->ttype)); > + ret = GDK_FAIL; > + } else if (t == 0) { > + assert(BATcount(Bc[t]) <= (size_t)GDK_int_max); > + if ((ncols = (int)BATcount(Bc[t])) < 1) { > + GDKerror("multi_merged_union: first table must consist of at least 1 column.\n"); > + ret = GDK_FAIL; > + } > + } else if (ncols != (int)BATcount(Bc[t])) { > + GDKerror("multi_merged_union: table %d (%d columns) must have as many columns as all other tables (%d columns).\n", > + t+1, (int)BATcount(Bc[t]), ncols); > + ret = GDK_FAIL; > + } > + if (ret == GDK_FAIL) { > + while (t >= 0) { > + BBPunfix(Bc[t--]->batCacheid); > + } > + GDKfree(Bc); > + return GDK_FAIL; > + } > + } > + > + b = (BAT***)GDKmalloc(ntabs*sizeof(BAT**)); > + if (b == NULL) { > + GDKerror("multi_merged_union: GDKmalloc(" SZFMT ") failed.\n", ntabs*sizeof(BAT**)); > + for (t=0; t<ntabs; t++) BBPunfix(Bc[t]->batCacheid); > + GDKfree(Bc); > + return GDK_FAIL; > + } > + for (t=0; t<ntabs; t++) { > + b[t] = (BAT**)GDKmalloc(ncols*sizeof(BAT*)); > + if (b[t] == NULL) { > + GDKerror("multi_merged_union: GDKmalloc(" SZFMT ") failed.\n", ncols*sizeof(BAT*)); > + while (t>0) { > + GDKfree(b[--t]); > + } > + GDKfree(b); > + for (t=0; t<ntabs; t++) BBPunfix(Bc[t]->batCacheid); > + GDKfree(Bc); > + return GDK_FAIL; > + } > + } > + > + for (t=0; t<ntabs; t++) { > + for (c=0; c<ncols; c++) { > + b[t][c] = BATdescriptor(*(bat*)BUNtloc(Bc[t], BUNptr(Bc[t],c))); > + } > + BBPunfix(Bc[t]->batCacheid); > + } > + GDKfree(Bc); > + > + ret = merged_union(res, ntabs, ncols, b); > + > + for (t=0; t<ntabs; t++) { > + for (c=0; c<ncols; c++) { > + BBPunfix(b[t][c]->batCacheid); > + } > + } > return ret; > } > > @@ -7561,33 +7802,6 @@ > return newProp; > } > > -PROC multi_merged_union (BAT[void, BAT] b) : BAT[void,BAT] > -{ > - var res := b.fetch(0); > - > - b.slice(1,count(b))@batloop() { > - var iter := res.fetch(0); > - var pre := res.fetch(1); > - var size := res.fetch(2); > - var level := res.fetch(3); > - var kind := res.fetch(4); > - var prop := res.fetch(5); > - var cont := res.fetch(6); > - var old_pre := res.fetch(7); > - var old_cont := res.fetch(8); > - res := merged_union (iter, $t.fetch(0), > - pre, $t.fetch(1), > - size, $t.fetch(2), > - level, $t.fetch(3), > - kind, $t.fetch(4), > - prop, $t.fetch(5), > - cont, $t.fetch(6), > - old_pre, $t.fetch(7), > - old_cont, $t.fetch(8)); > - } > - return res; > -} > - > > @- !!! THE FOLLOWING PROCs (*_constr) ARE DEPRECATED !!! > They are however not removed yet to support comparison > > > ------------------------------------------------------------------------- > 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 > -- Jan Rittinger Database Systems Technische Universität München (Germany) http://www-db.in.tum.de/~rittinge/

1 0

[Monetdb-developers] Query Timeout
by Bharani 18 Jul '07

18 Jul '07

Hi I am trying to make monetdb work with hibernate using existing mysql dialect. When i do a simple select it actually returns the value but i get an exception saying Method not supported,Sorry! for nl.cwi.monetdb.jdbc.MonetStatement.getQueryTimeout any reason why it is being thrown Thanks Bharani -- View this message in context: http://www.nabble.com/Query-Timeout-tf4102673.html#a11666902 Sent from the monetdb-developers mailing list archive at Nabble.com.

2 6

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/tools mserver5.mx.in, , 1.20, 1.21
by Stefan Manegold 17 Jul '07

17 Jul '07

On Tue, Jul 17, 2007 at 04:07:11AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/tools > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10293/tools > > Modified Files: > mserver5.mx.in > Log Message: > My penny to cleanup the welcome message. see my change below. Stefan > Index: mserver5.mx.in > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/tools/mserver5.mx.in,v > retrieving revision 1.20 > retrieving revision 1.21 > diff -u -d -r1.20 -r1.21 > --- mserver5.mx.in 16 Jul 2007 11:51:44 -0000 1.20 > +++ mserver5.mx.in 17 Jul 2007 04:07:07 -0000 1.21 > @@ -174,15 +174,15 @@ > char *msg = mo_find_option(set, setlen, "monet_welcome"); > > if (msg && strcmp(msg, "yes") == 0) { > - printf("# MonetDB Server v" VERSION "\n"); > - printf("# based on GDK v%s\n", GDKversion()); > - printf("# Copyright (c) 1993-2007 CWI, all rights reserved\n"); > + printf("# MonetDB server v" VERSION "\n"); > + printf("# Based on kernel v%s\n", GDKversion()); > + printf("# Database serviced:%s\n", GDKgetenv("gdk_dbname")); ^^ shouldn't there be a space for sake of (human) readability? > printf("# Compiled for %s/" SZFMT "bit with " SZFMT "bit OIDs %s linked\n", HOST, (size_t) (sizeof(ptr) * 8), (size_t) (sizeof(oid) * 8), linkinfo); > #ifdef MONET_GLOBAL_DEBUG > - printf("# config:%s\n", GDKgetenv("config")); > - printf("# dbfarm:%s\n", GDKgetenv("gdk_dbfarm")); > + printf("# Configuration:%s\n", GDKgetenv("config")); ^^ shouldn't there be a space for sake of (human) readability? > + printf("# Database farm:%s\n", GDKgetenv("gdk_dbfarm")); ^^ shouldn't there be a space for sake of (human) readability? > #endif > - printf("# dbname:%s\n", GDKgetenv("gdk_dbname")); > + printf("# Copyright (c) 1993-2007 CWI, all rights reserved\n"); > printf("# Visit http://monetdb.cwi.nl/ for further information\n"); > } > } -- | 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-checkins] clients/src/java build.properties, , 1.6, 1.7 build.xml, , 1.20, 1.21 release.txt, , 1.4, 1.5 version.sh, , 1.7, 1.8
by Stefan Manegold 16 Jul '07

16 Jul '07

On Mon, Jul 16, 2007 at 12:16:14PM +0000, Fabian wrote: > Update of /cvsroot/monetdb/clients/src/java > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18385/src/java > > Modified Files: > build.properties build.xml release.txt version.sh > Log Message: > For ease of maintenance, make jdbcclient a versionless jar-file. > [...] > > Index: version.sh > =================================================================== > RCS file: /cvsroot/monetdb/clients/src/java/version.sh,v > retrieving revision 1.7 > retrieving revision 1.8 > diff -u -d -r1.7 -r1.8 > --- version.sh 16 Jul 2007 10:38:21 -0000 1.7 > +++ version.sh 16 Jul 2007 12:16:08 -0000 1.8 > @@ -113,13 +113,7 @@ > > for file in \ > Makefile.ag \ > - ../../../*/NT/MonetDB4-SQL/MonetDB4-Installer.vdproj \ > - ../../../*/NT/MonetDB5-SQL/MonetDB5-Installer.vdproj \ > - ../../../*/src/jdbc/tests/Tests/Test_JdbcClient.SQL.bat \ > ../../../*/src/jdbc/tests/Tests/Test.SQL.bat \ > - ../../../*/NT/MonetDB-XQuery/MonetDB-XQuery.vdproj \ > - ../../../*/NT/MonetDB4-XQuery/MonetDB4-Installer.vdproj \ ../../../*/NT/MonetDB4-SQL/MonetDB4-Installer.vdproj ../../../*/NT/MonetDB5-SQL/MonetDB5-Installer.vdproj ../../../*/NT/MonetDB-XQuery/MonetDB-XQuery.vdproj ../../../*/NT/MonetDB4-XQuery/MonetDB4-Installer.vdproj still contain "monetdb-1.6-jdbc.jar"; hence, this version number is now no longer maintained by clients/src/java/version.sh ... Stefan > - ../../../*/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat \ > ; do > if [[ -f ${file} ]] ; then > for f in $FILES ; do > -- | 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-checkins] MonetDB5/src/mal mal_box.mx, , 1.78, 1.79
by Sjoerd Mullender 16 Jul '07

16 Jul '07

Fabian wrote: > Update of /cvsroot/monetdb/MonetDB5/src/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12770/mal > > Modified Files: > mal_box.mx > Log Message: > insertToBox copies its 2nd and 3rd arguments, so it can declare them as > const. Nevertheless we still need a cast, because char * != str. > > > Index: mal_box.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_box.mx,v > retrieving revision 1.78 > retrieving revision 1.79 > diff -u -d -r1.78 -r1.79 > --- mal_box.mx 12 Jun 2007 17:21:17 -0000 1.78 > +++ mal_box.mx 16 Jul 2007 12:45:25 -0000 1.79 > @@ -226,7 +226,7 @@ > mal_export int releaseAllBox(Box box); > > mal_export int depositBox(Box box, str name, ValPtr val); > -mal_export void insertToBox(Box box, str name, str val); > +mal_export void insertToBox(Box box, const str name, const str val); > mal_export int takeBox(Box box, str name, ValPtr val, int tpe); > mal_export int bindBAT(Box box, str name, str location); > mal_export int releaseBox(Box box, str name); > @@ -418,7 +418,7 @@ > } > > void > -insertToBox(Box box, str nme, str val) > +insertToBox(Box box, const str nme, const str val) > { > ValRecord vr; > > > This is actually pretty useless. You've declared val as a const, not what val point to (i.e. the chars that make up the string). Consider this: typedef char *str; void foo(const str x) { *x = 0; } this is valid code and will be accepted by both gcc and icc, but this is exactly what you try to prevent from happening when you declare a parameter const char *. In other words, val should be declared as const char *val, and then you shouldn't need the case when calling the function. -- Sjoerd Mullender

2 2

Re: [Monetdb-developers] [Monetdb-checkins] clients/src/java build.properties, , 1.5, 1.6 build.xml, , 1.19, 1.20 release.txt, , 1.3, 1.4 version.sh, , 1.5, 1.6
by Stefan Manegold 16 Jul '07

16 Jul '07

On Mon, Jul 16, 2007 at 09:42:16AM +0000, Fabian wrote: > Update of /cvsroot/monetdb/clients/src/java > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5504 > > Modified Files: > build.properties build.xml release.txt version.sh > Log Message: > Fix for bug #1754452 > Store the given connection in the SendThread instead of ignoring it. > > Since we changed the code after the release, tag the version suffix > [...] > Index: version.sh > =================================================================== > RCS file: /cvsroot/monetdb/clients/src/java/version.sh,v > retrieving revision 1.5 > retrieving revision 1.6 > diff -u -d -r1.5 -r1.6 > --- version.sh 6 Jun 2007 12:00:55 -0000 1.5 > +++ version.sh 16 Jul 2007 09:42:12 -0000 1.6 > @@ -106,10 +106,13 @@ > > file="release.txt" > sed \ > - -e "s|version ${ESC_MAJOR}\.${ESC_MINOR} (${ESC_SUFFIX})|version ${NEW_MAJOR}.${NEW_MINOR} $${NEW_SUFFIX}$|g" \ > + -e "s|version ${ESC_MAJOR}\.${ESC_MINOR} (${ESC_SUFFIX}|version ${NEW_MAJOR}.${NEW_MINOR} \(${NEW_SUFFIX}|g" \ > + -e "s|${TYPE}-${ESC_MAJOR}\.${ESC_MINOR}|${TYPE}-${NEW_MAJOR}.${NEW_MINOR}|g" \ > -e "s|Release date: 20[0-9][0-9]-[01][0-9]-[0-3][0-9]|Release date: `date +%F`|" \ > ${file} | ${diff} ${file} - | ${patch} > > +# not found: > +# ../../../*/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat \ ======== $ l */tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat -------- -rwxr-x--- 1 manegold ins1 376 Jun 6 14:16 pathfinder/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat* ======== $ cat */tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat -------- @echo off set JAR="%CLIENTS_PREFIX%\share\MonetDB\lib\jdbcclient-1.6.jar" echo user=monetdb> .monetdb echo password=monetdb>> .monetdb set LANG=en_US.UTF-8 call Mlog.bat -x java -jar "%JAR%" -h %HOST% -p %MAPIPORT% -d %TSTDB% -l xquery -f "%TST%.250.xq" call Mlog.bat -x java -jar "%JAR%" -h %HOST% -p %MAPIPORT% -d %TSTDB% -l xquery -f "%TST%.251.xq" del .monetdb ======== maybe, we should find some way to use the "latest" jdbcclient.jar on both unix and windows platforms without knowing the exact version number ... Stefan > for file in \ > Makefile.ag \ > ../../../*/NT/MonetDB4-SQL/MonetDB4-Installer.vdproj \ > @@ -118,7 +121,6 @@ > ../../../*/src/jdbc/tests/Tests/Test.SQL.bat \ > ../../../*/NT/MonetDB-XQuery/MonetDB-XQuery.vdproj \ > ../../../*/NT/MonetDB4-XQuery/MonetDB4-Installer.vdproj \ > - ../../../*/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat \ > ; do > if [[ -f ${file} ]] ; then > for f in $FILES ; do > @@ -138,5 +140,4 @@ > -e "s|${TYPE}_MAJOR=${ESC_MAJOR}|${TYPE}_MAJOR=${NEW_MAJOR}|g" \ > -e "s|${TYPE}_MINOR=${ESC_MINOR}|${TYPE}_MINOR=${NEW_MINOR}|g" \ > -e "s|${TYPE}_VER_SUFFIX=${ESC_SUFFIX}|${TYPE}_VER_SUFFIX=${NEW_SUFFIX}|g" \ > - -e "s|${TYPE}-${ESC_MAJOR}\.${ESC_MINOR}|${TYPE}-${NEW_MAJOR}.${NEW_MINOR}|g" \ > ${file} | ${diff} ${file} - | ${patch} > [...] -- | 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