- developers-list - monetdb.org

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_interpreter.mx, , 1.286, 1.287
by Stefan Manegold 16 Feb '09

16 Feb '09

Milena, do you consider this a bug fix or a new feature? if the former, it will not be in the upcoming release, since it has not (yet) been checked in to the Feb2009 release branch... in case you consider an exceptional back-port of this checkin to the Feb2009 release branch, please make sure you od this using the approriate CVS commands to ensure that the identical changes are applied --- see, e.g., page 14 of http://homepages.cwi.nl/~manegold/Presentations/MonetDBdevTTT.pdf for details --- don't hesitate to ask inc ase you need help ... Stefan On Mon, Feb 16, 2009 at 01:56:58PM +0000, Milena Ivanova wrote: > Update of /cvsroot/monetdb/MonetDB5/src/mal > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13891 > > Modified Files: > mal_interpreter.mx > Log Message: > Call recycler only for instructions with positive value of the recycle field. > > > U mal_interpreter.mx > Index: mal_interpreter.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v > retrieving revision 1.286 > retrieving revision 1.287 > diff -u -d -r1.286 -r1.287 > --- mal_interpreter.mx 15 Feb 2009 23:15:30 -0000 1.286 > +++ mal_interpreter.mx 16 Feb 2009 13:56:55 -0000 1.287 > @@ -1993,14 +1993,14 @@ > The recycler works for any variable and relies on policy functions > registered. > @= MALrecycleStart > - if ( pci->recycle >= 0) > + if ( pci->recycle > 0) > @1->clk = GDKusec(); > if( !RECYCLEentry(cntxt, mb,stk,pci) ) > @= MALrecycleExit > - if ( pci->recycle >= 0) > + if( pci->recycle > 0 ){ > tcs = GDKusec() - @1->clk; > - if( pci->recycle > 0 ) > RECYCLEexit(cntxt, mb,stk,pci,tcs); > + } > @} > @- > @node Garbage Collection, Stack Management, Exception Handling, The MAL Interpreter > > > ------------------------------------------------------------------------------ > Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA > -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise > -Strategies to boost innovation and cut costs with open source participation > -Receive a $600 discount off the registration fee with the source code: SFAD > http://p.sf.net/sfu/XcvMzF8H > _______________________________________________ > 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

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/NT/MonetDB5-Server MonetDB5-Server.vdproj, Feb2009, 1.17.2.2, 1.17.2.3 MonetDB5-Server64.vdproj, Feb2009, 1.14.2.2, 1.14.2.3
by Stefan Manegold 15 Feb '09

15 Feb '09

On Sun, Feb 15, 2009 at 12:03:10PM +0000, Sjoerd Mullender wrote: > Update of /cvsroot/monetdb/MonetDB5/NT/MonetDB5-Server > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9992/MonetDB5-Server > > Modified Files: > Tag: Feb2009 > MonetDB5-Server.vdproj MonetDB5-Server64.vdproj > Log Message: > s/batmath/batmmath/ Thanks! --- I was "afraid" that also some of the Windows/installer specific magic code need to be changed and hence did not "dare" to do the simple replacement ... Stefan > U MonetDB5-Server.vdproj > Index: MonetDB5-Server.vdproj > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj,v > retrieving revision 1.17.2.2 > retrieving revision 1.17.2.3 > diff -u -d -r1.17.2.2 -r1.17.2.3 > --- MonetDB5-Server.vdproj 9 Feb 2009 09:39:32 -0000 1.17.2.2 > +++ MonetDB5-Server.vdproj 15 Feb 2009 12:03:07 -0000 1.17.2.3 > @@ -1813,8 +1813,8 @@ > } > "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E6AFBE1C87A4AB0A6A8F2162FD79B8C" > { > - "SourcePath" = "8:Lib\\MonetDB5\\batmath.mal" > - "TargetName" = "8:batmath.mal" > + "SourcePath" = "8:Lib\\MonetDB5\\batmmath.mal" > + "TargetName" = "8:batmmath.mal" > "Tag" = "8:" > "Folder" = "8:_E7F9CF4E0220468FB71F65052227D019" > "Condition" = "8:" > @@ -4453,8 +4453,8 @@ > } > "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DFBC77B23C8E43C59447539AC5AD8E85" > { > - "SourcePath" = "8:Lib\\MonetDB5\\lib_batmath.dll" > - "TargetName" = "8:lib_batmath.dll" > + "SourcePath" = "8:Lib\\MonetDB5\\lib_batmmath.dll" > + "TargetName" = "8:lib_batmmath.dll" > "Tag" = "8:" > "Folder" = "8:_E7F9CF4E0220468FB71F65052227D019" > "Condition" = "8:" > > U MonetDB5-Server64.vdproj > Index: MonetDB5-Server64.vdproj > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj,v > retrieving revision 1.14.2.2 > retrieving revision 1.14.2.3 > diff -u -d -r1.14.2.2 -r1.14.2.3 > --- MonetDB5-Server64.vdproj 9 Feb 2009 09:39:32 -0000 1.14.2.2 > +++ MonetDB5-Server64.vdproj 15 Feb 2009 12:03:07 -0000 1.14.2.3 > @@ -2759,8 +2759,8 @@ > } > "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6F7E9C22938E4CB794DBCDBAE1043F7E" > { > - "SourcePath" = "8:Lib\\MonetDB5\\batmath.mal" > - "TargetName" = "8:batmath.mal" > + "SourcePath" = "8:Lib\\MonetDB5\\batmmath.mal" > + "TargetName" = "8:batmmath.mal" > "Tag" = "8:" > "Folder" = "8:_E7F9CF4E0220468FB71F65052227D019" > "Condition" = "8:" > @@ -4379,8 +4379,8 @@ > } > "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E0DFFCD93BB4490782297CCD3E6E5DE9" > { > - "SourcePath" = "8:Lib\\MonetDB5\\lib_batmath.dll" > - "TargetName" = "8:lib_batmath.dll" > + "SourcePath" = "8:Lib\\MonetDB5\\lib_batmmath.dll" > + "TargetName" = "8:lib_batmmath.dll" > "Tag" = "8:" > "Folder" = "8:_E7F9CF4E0220468FB71F65052227D019" > "Condition" = "8:" > > > ------------------------------------------------------------------------------ > Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA > -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise > -Strategies to boost innovation and cut costs with open source participation > -Receive a $600 discount off the registration fee with the source code: SFAD > http://p.sf.net/sfu/XcvMzF8H > _______________________________________________ > 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 |

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/kernel batmmath.mx, Feb2009, NONE, 1.1.2.1 Makefile.ag, Feb2009, 1.74, 1.74.2.1 batmath.mx, Feb2009, 1.21, NONE
by Stefan Manegold 14 Feb '09

14 Feb '09

Sjoerd, could you please also fix the Windows installers accordingly, i.e., rename "batmath" into "batmmath" in MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thanks! Stefan On Sat, Feb 14, 2009 at 05:20:25AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17075/modules/kernel > > Modified Files: > Tag: Feb2009 > Makefile.ag > Added Files: > Tag: Feb2009 > batmmath.mx > Removed Files: > Tag: Feb2009 > batmath.mx > Log Message: > Addressing bug 2596114 > The multiplex mat functions were not found by the remap optimizer, > because they did not obey the naming convention [bat]mmath. > Given the performance impact of using MAL loops, this change > in interface naming has been rectified over a specific hack > in the remap optimizer itself. > > > U Makefile.ag > Index: Makefile.ag > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/Makefile.ag,v > retrieving revision 1.74 > retrieving revision 1.74.2.1 > diff -u -d -r1.74 -r1.74.2.1 > --- Makefile.ag 7 Jan 2009 14:15:12 -0000 1.74 > +++ Makefile.ag 14 Feb 2009 05:20:23 -0000 1.74.2.1 > @@ -28,7 +28,7 @@ > SOURCES = \ > calc.mx bat5.mx algebra.mx status.mx unix.mx \ > mmath.mx lock.mx sema.mx alarm.mx batifthen.mx \ > - batcast.mx batcalc.mx batmath.mx aggr.mx counters.mx \ > + batcast.mx batcalc.mx batmmath.mx aggr.mx counters.mx \ > microbenchmark.mx > > #SCRIPTS = mal mil "" > @@ -103,7 +103,7 @@ > SOURCES = \ > calc.mx bat5.mx algebra.mx status.mx unix.mx \ > mmath.mx lock.mx sema.mx alarm.mx batifthen.mx \ > - batcast.mx batcalc.mx batmath.mx aggr.mx counters.mx \ > + batcast.mx batcalc.mx batmmath.mx aggr.mx counters.mx \ > microbenchmark.mx \ > batstr.mx batmtime.mx batcolor.mx group.mx array.mx logger.mx > HEADERS = h > @@ -114,7 +114,7 @@ > DIR = libdir/MonetDB5 > SOURCES = calc.mx bat5.mx algebra.mx status.mx unix.mx \ > mmath.mx lock.mx sema.mx alarm.mx batstr.mx batmtime.mx \ > - batcolor.mx batifthen.mx batcast.mx batcalc.mx batmath.mx \ > + batcolor.mx batifthen.mx batcast.mx batcalc.mx batmmath.mx \ > group.mx aggr.mx array.mx \ > counters.mx logger.mx microbenchmark.mx > } > > --- batmath.mx DELETED --- > > --- NEW FILE: batmmath.mx --- > @' The contents of this file are subject to the MonetDB Public License > @' Version 1.1 (the "License"); you may not use this file except in > @' compliance with the License. You may obtain a copy of the License at > @' http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html > @' > @' Software distributed under the License is distributed on an "AS IS" > @' basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the > @' License for the specific language governing rights and limitations > @' under the License. > @' > @' The Original Code is the MonetDB Database System. > @' > @' The Initial Developer of the Original Code is CWI. > @' Portions created by CWI are Copyright (C) 1997-July 2008 CWI. > @' Copyright August 2008-2009 MonetDB B.V. > @' All Rights Reserved. > > @f batmmath > @a M.L. Kersten > @+ BAT math calculator > This module contains the multiplex versions of the linked > in mathematical functions. > @{ > @= tstBat > if( bn== NULL) {*ret= 0; > throw(MAL, "batcalc.@1", "can not create bat");} > > @+ Scientific routines > The mmath functions are also overloaded to provide for > the fast execution of expanded code blocks. > The common set of math functions is supported. > @= scienceFcn > command @1(x:bat[:oid,:dbl]) :bat[:oid,:dbl] > address CMDscience_bat_dbl_@1; > command @1(x:bat[:oid,:flt]) :bat[:oid,:flt] > address CMDscience_bat_flt_@1; > @= scienceFcnBinary > command @1(x:bat[:oid,:dbl],y:dbl):bat[:oid,:dbl] > address CMDscience_bat_cst_@1_dbl; > command @1(x:bat[:oid,:flt],y:flt):bat[:oid,:flt] > address CMDscience_bat_cst_@1_flt; > @- > @mal > module batmmath; > @:scienceFcn(asin)@ > @:scienceFcn(acos)@ > @:scienceFcn(atan)@ > @:scienceFcn(cos)@ > @:scienceFcn(sin)@ > @:scienceFcn(tan)@ > @:scienceFcn(cosh)@ > @:scienceFcn(sinh)@ > @:scienceFcn(tanh)@ > @:scienceFcn(exp)@ > @:scienceFcn(log)@ > @:scienceFcn(log10)@ > @:scienceFcn(sqrt)@ > @:scienceFcn(ceil)@ > @:scienceFcn(fabs)@ > @:scienceFcn(floor)@ > @- > round is not binary... > @:scienceFcnBinary(round,int)@ > @mal > @:scienceFcnBinary(fmod)@ > @:scienceFcnBinary(atan2)@ > @:scienceFcnBinary(pow)@ > @- Implementation > @include kprelude.mx > > @h > #ifdef _BATMATH_H > #define _BATMATH_H > > #endif /* _BATMATH_H */ > @- Implementations of scientific functions > @c > #include "mal_config.h" > #include "gdk.h" > #include "math.h" > #include "mal_exception.h" > #include "batmmath.h" > > #ifdef WIN32 > #ifndef LIBBATMATH > #define batmmath_export extern __declspec(dllimport) > #else > #define batmmath_export extern __declspec(dllexport) > #endif > #else > #define batmmath_export extern > #endif > > @- > @= scienceFcnImpl > batmmath_export str CMDscience_bat_@2_@1(int *ret, int *bid); > str CMDscience_bat_@2_@1(int *ret, int *bid) > { > BAT *b,*bn; > @2 *o, *p, *q; > > @:getBATdescriptor(bid,b,"batcalc.@1")@ > @:voidresultBAT(TYPE_dbl,"batcalc.@1")@ > > o = (@2*) Tloc(bn, BUNfirst(bn)); > p = (@2*) Tloc(b, BUNfirst(b)); > q = (@2*) Tloc(b, BUNlast(b)); > > if (b->T->nonil){ > for(;p<q; o++, p++) > *o = @1(*p); > } else > for(;p<q; o++, p++){ > *o = *p == dbl_nil? dbl_nil: @1(*p); > } > BATsetcount(bn, BATcount(b)); > bn->tsorted = 0; > BATkey(BATmirror(bn),0); > > if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); > > if (b->htype != bn->htype) { > BAT *r = VIEWcreate(b,bn); > > BBPreleaseref(bn->batCacheid); > bn = r; > } > BBPkeepref(*ret = bn->batCacheid); > BBPreleaseref(b->batCacheid); > return MAL_SUCCEED; > } > @= scienceBinaryImpl > batmmath_export str CMDscience_bat_cst_@1_@2(int *ret, int *bid, @2 *d); > str CMDscience_bat_cst_@1_@2(int *ret, int *bid, @2 *d) > { > BAT *b,*bn; > @2 *o, *p, *q; > > @:getBATdescriptor(bid,b,"batcalc.@1")@ > @:voidresultBAT(TYPE_dbl,"batcalc.@1")@ > > o = (@2*) Tloc(bn, BUNfirst(bn)); > p = (@2*) Tloc(b, BUNfirst(b)); > q = (@2*) Tloc(b, BUNlast(b)); > > if (b->T->nonil){ > for(;p<q; o++, p++) > *o = @1(*p,*d); > } else > for(;p<q; o++, p++){ > *o = *p == dbl_nil? dbl_nil: @1(*p,*d); > } > > BATsetcount(bn, BATcount(b)); > bn->tsorted = 0; > BATkey(BATmirror(bn),0); > > if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); > > if (b->htype != bn->htype) { > BAT *r = VIEWcreate(b,bn); > > BBPreleaseref(bn->batCacheid); > bn = r; > } > BBPkeepref(*ret = bn->batCacheid); > BBPreleaseref(b->batCacheid); > return MAL_SUCCEED; > } > @= scienceImpl > @:scienceFcnImpl(@1,dbl)@ > @:scienceFcnImpl(@1,flt)@ > @c > @:scienceImpl(asin)@ > @:scienceImpl(acos)@ > @:scienceImpl(atan)@ > @:scienceImpl(cos)@ > @:scienceImpl(sin)@ > @:scienceImpl(tan)@ > @:scienceImpl(cosh)@ > @:scienceImpl(sinh)@ > @:scienceImpl(tanh)@ > @:scienceImpl(exp)@ > @:scienceImpl(log)@ > @:scienceImpl(log10)@ > @:scienceImpl(sqrt)@ > @:scienceImpl(ceil)@ > @:scienceImpl(fabs)@ > @:scienceImpl(floor)@ > @- > round is not binary... > @:scienceBinaryImpl(round,int)@ > @c > @:scienceBinaryImpl(fmod,dbl)@ > @:scienceBinaryImpl(fmod,flt)@ > @:scienceBinaryImpl(atan2,dbl)@ > @:scienceBinaryImpl(atan2,flt)@ > @:scienceBinaryImpl(pow,dbl)@ > @:scienceBinaryImpl(pow,flt)@ > > @} > > > ------------------------------------------------------------------------------ > Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA > -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise > -Strategies to boost innovation and cut costs with open source participation > -Receive a $600 discount off the registration fee with the source code: SFAD > http://p.sf.net/sfu/XcvMzF8H > _______________________________________________ > 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 |

1 0

[Monetdb-developers] stable xq testweb
by Peter Boncz 10 Feb '09

10 Feb '09

Hi, (the below analyis of the Stable XQ testweb is not an implicit request for anybody to do something, I just share it here so you will not do double work) Recently I checked in some fixes. - Because I have the suspicion that certain scripts at NFI may still use hard commits, I redefined the commit() in module pathfinder to giving an error. - I also added pflock_trycommit(), as part of the change (hack?) to ensure that checkpoint flushes occur only on an idle system. This led me to expect the Stable testweb in detail today. My new commit() error policy causes the following tests to display different output: benchmarks/XPath*/import_doc benchmarks/XMark*/import_doc benchmarks/Music*/import_doc tests/BugsViaSourgeforce/ ID.1078462_import tests/Standoff/video/import_doc tests/W3C_use_cases/XQUF/AddressBook/check_docs tests/i18n/import_doc tests/WebSite/voc I think what we could do is to substitute the commit() by a pf_logflush(0LL) , although simply omitting the "commit();"should also work. The pflock_trycommit() new command obviously alsoshows up in some tests. However, I also saw time-, standoff- and pf-tjah related output that probably can be approved: modules/pftijah/procs runtime/sigs runtime/procs No to the oher differences (ignoring xrpc and W3c/qn/ns which AFAIK has always failed).. The below use recursive functions for which we maybe could add 'declare option pf:recursion-depth "<number>";?? tests/BugTracker/Alignment_error.SF-1886994 tests/BugTracker/recursive_function.SF-1835745 tests/BugTracker/pf-O0_produces_wrong_MIL.SF-1771532 tests/BugTracker/posjoin_null_BAT_2nd_run.SF-1678948 tests/BugTracker/error-KO2.SF-1562868 recursion_type_error.SF-1579524 tests/BugsViaSourgeforce/ID.1652527 tests/W3C_use_cases/XQ/PARTS/Q1[x] tests/W3C_use_cases/XQ/TREE/Q[1,6] tests/W3C_use_cases/XQUF/Parts/q3b[12] tests/WebSite/books2,3 tests/XQuery/fun1,4 which leaves us with 6 the following suspect regressions: tests/BugTracker/replace-corrupts.SF-1758902 tests/BugTracker/1637867.xq tests/BugTracker/1pagedoc.SF-2141012 tests/BugTracker/Zombie_document.SF-2009556 tests/W3C_use_cases/XQUF/AddressBook/check_docs tests/Update/insert_test_order_seq

2 1

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB/src/gdk gdk_heap.mx, , 1.107, 1.108
by Stefan Manegold 09 Feb '09

09 Feb '09

Peter, IMHO, this check in does more than the log message suggests; among others, it appears to me as if this check in undoes some fixes coancerning *.new files that Sjoerd recently checked in. Could you please check and comment whether this was/is intended? Or was there any CVS related "accident"? Given that also the copyright statement is reverted to a state of last year, I suspect that an old version of this file has been re-activated, possibly instead of using CVS commands to revert or replay a former check in? Thanks in advance! Stefan On Thu, Feb 05, 2009 at 03:39:43PM +0000, Peter Boncz wrote: > Update of /cvsroot/monetdb/MonetDB/src/gdk > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5674 > > Modified Files: > gdk_heap.mx > Log Message: > - make large allocs fall back again on mmap > > > > U gdk_heap.mx > Index: gdk_heap.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_heap.mx,v > retrieving revision 1.107 > retrieving revision 1.108 > diff -u -d -r1.107 -r1.108 > --- gdk_heap.mx 22 Jan 2009 14:47:53 -0000 1.107 > +++ gdk_heap.mx 5 Feb 2009 15:39:41 -0000 1.108 > @@ -12,7 +12,7 @@ > @' > @' The Initial Developer of the Original Code is CWI. > @' Portions created by CWI are Copyright (C) 1997-July 2008 CWI. > -@' Copyright August 2008-2009 MonetDB B.V. > +@' Copyright August 2008- MonetDB B.V. > @' All Rights Reserved. > > @f gdk_heap > @@ -115,7 +115,7 @@ > fp = GDKfilelocate(nme, "wb", ext); > if (fp != NULL) { > fclose(fp); > - h->storage = STORE_MMAP; > + h->newstorage = STORE_MMAP; > HEAPload(h, nme, ext, FALSE); > } > GDKfree(of); > @@ -262,7 +262,7 @@ > @} > @- HEAPload > > -If we find file X.new, we move it over X (if present) and open it. > +If we don find file X.new, we move it over X (if present) and open it. > > This routine initializes the h->filename without deallocating > its previous contents. > @@ -284,7 +284,7 @@ > if (h->filename == NULL) > h->filename = (char *) GDKmalloc(strlen(nme) + strlen(ext) + 2); > if (h->filename == NULL) > - return -1; > + return -1; > sprintf(h->filename, "%s.%s", nme, ext); > > /* round up mmap heap sizes to REMAP_PAGE_MAXSIZE (usually 512KB) segments */ > @@ -323,19 +323,21 @@ > strcpy(p, ".new"); > ret = stat(dstpath, &st); > if (stat(srcpath, &st) == 0) { > - int t0; > - if (ret == 0) { > - t0 = GDKms(); > + if (ret) { > + int t0 = GDKms(); > ret = unlink(dstpath); > IODEBUG THRprintf(GDKout, "#unlink %s = %d (%dms)\n", dstpath, ret, GDKms() - t0); > } > - t0 = GDKms(); > - ret = rename(srcpath, dstpath); > - if (ret < 0) { > - GDKsyserror("HEAPload: rename of %s failed\n", srcpath); > - return -1; > + if (ret == 0) { /* move X.new to X */ > + int t0 = GDKms(); > + ret = rename(srcpath, dstpath); > + IODEBUG THRprintf(GDKout, "#rename %s %s = %d (%dms)\n", srcpath, dstpath, ret, GDKms() - t0); > } > - IODEBUG THRprintf(GDKout, "#rename %s %s = %d (%dms)\n", srcpath, dstpath, ret, GDKms() - t0); > + } else if (ret) { /* legacy: accept .priv files as well */ > + int t0 = GDKms(); > + strcpy(p, ".priv"); > + ret = rename(srcpath, dstpath); /* move X.priv to X */ > + IODEBUG THRprintf(GDKout, "#rename %s %s = %d (%dms)\n", srcpath, dstpath, ret, GDKms() - t0); > } > > h->base = (char *) GDKload(nme, ext, h->free, h->size, h->newstorage); > @@ -885,13 +887,15 @@ > /* > // Create bitmasks that will hold all valid block positions > */ > - hr->validmask = (int *) GDKzalloc(sizeof(int) * ++nwords); > - freemask = (int *) GDKzalloc(sizeof(int) * nwords); > + hr->validmask = (int *) GDKmalloc(sizeof(int) * ++nwords); > + freemask = (int *) GDKmalloc(sizeof(int) * nwords); > if (hr->validmask == NULL || freemask == NULL) { > GDKfree(hr->validmask); > GDKfree(freemask); > return FALSE; > } > + for (block = 0; block < nwords; block++) > + freemask[block] = hr->validmask[block] = 0; > > /* > // Walk the freelist; register them in freemask > > > ------------------------------------------------------------------------------ > Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) > software. With Adobe AIR, Ajax developers can use existing skills and code to > build responsive, highly engaging applications that combine the power of local > resources and data with the reach of the web. Download the Adobe AIR SDK and > Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com > _______________________________________________ > 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

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal Makefile.ag, Feb2009, 1.127, 1.127.2.1 mal_init.mx, Feb2009, 1.155, 1.155.2.1 factory.mx, Feb2009, 1.28, NONE
by Stefan Manegold 08 Feb '09

08 Feb '09

On Sun, Feb 08, 2009 at 10:16:30AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6498 > > Modified Files: > Tag: Feb2009 > Makefile.ag mal_init.mx > Removed Files: > Tag: Feb2009 > factory.mx > Log Message: > Solving a name conflict. Factory cannot be used as a module name, because > it is a keyword. It should have been captured a long time ago. Haven't trued to checkout and compile, yet, but I suspect you forgot to check in the new factories.mx, right? Stefan > > U Makefile.ag > Index: Makefile.ag > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Makefile.ag,v > retrieving revision 1.127 > retrieving revision 1.127.2.1 > diff -u -d -r1.127 -r1.127.2.1 > --- Makefile.ag 7 Jan 2009 14:15:13 -0000 1.127 > +++ Makefile.ag 8 Feb 2009 10:16:28 -0000 1.127.2.1 > @@ -31,7 +31,7 @@ > chopper.mx constraints.mx language.mx box.mx \ > profiler.mx const.mx algebraExtensions.mx \ > inspect.mx manual.mx pqueue.mx mkey.mx \ > - factory.mx mdb.mx \ > + factories.mx mdb.mx \ > urlbox.mx mat.mx \ > sabaoth.mx remote.mx replicator.mx txtsim.mx recycle.mx \ > cluster.mx > @@ -182,7 +182,7 @@ > chopper.mx constraints.mx language.mx box.mx \ > profiler.mx const.mx algebraExtensions.mx \ > inspect.mx manual.mx pqueue.mx mkey.mx \ > - factory.mx mdb.mx \ > + factories.mx mdb.mx \ > urlbox.mx mat.mx \ > sabaoth.mx remote.mx replicator.mx batxml.mx recycle.mx \ > cluster.mx > @@ -198,7 +198,7 @@ > profiler.mx const.mx batExtensions.mx algebraExtensions.mx \ > inspect.mx manual.mx mal_io.mx pqueue.mx mkey.mx \ > chopper.mx clients.mx \ > - factory.mx mdb.mx pcre.mx tablet.mx mat.mx \ > + factories.mx mdb.mx pcre.mx tablet.mx mat.mx \ > urlbox.mx statistics.mx transaction.mx \ > mal_mapi.mx sabaoth.mx remote.mx replicator.mx \ > bpm.mx batxml.mx txtsim.mx recycle.mx \ > > U mal_init.mx > Index: mal_init.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mal_init.mx,v > retrieving revision 1.155 > retrieving revision 1.155.2.1 > diff -u -d -r1.155 -r1.155.2.1 > --- mal_init.mx 26 Jan 2009 09:26:02 -0000 1.155 > +++ mal_init.mx 8 Feb 2009 10:16:28 -0000 1.155.2.1 > @@ -70,7 +70,7 @@ > library clients; > library mal_io; > library tablet; > -library factory; > +library factories; > library const; > library bbp; > library box; > @@ -160,7 +160,7 @@ > include box; > include mal_io; > include tablet; > -include factory; > +include factories; > include recycle; > include remote; > include replicator; > > --- factory.mx DELETED --- > > > ------------------------------------------------------------------------------ > Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) > software. With Adobe AIR, Ajax developers can use existing skills and code to > build responsive, highly engaging applications that combine the power of local > resources and data with the reach of the web. Download the Adobe AIR SDK and > Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com > _______________________________________________ > 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 |

1 0

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/compiler/semantics xquery_fo.c, Feb2009, 1.177.2.1, 1.177.2.2
by Lefteris 08 Feb '09

08 Feb '09

Ignore this commit, it is the wrong file, I will undo this and re commit the correct file On Sun, Feb 8, 2009 at 12:15 PM, Lefteris Sidirourgos <lsidir(a)users.sourceforge.net> wrote: > Update of /cvsroot/monetdb/pathfinder/compiler/semantics > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12467/compiler/semantics > > Modified Files: > Tag: Feb2009 > xquery_fo.c > Log Message: > do not assume that if a function has multiple signatures then it is always the correct. It might be the case that later on the list a more specific function definition is found. Thus, keep around the multiple signature function and return it only if nothing more specific is found. > > > U xquery_fo.c > Index: xquery_fo.c > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/compiler/semantics/xquery_fo.c,v > retrieving revision 1.177.2.1 > retrieving revision 1.177.2.2 > diff -u -d -r1.177.2.1 -r1.177.2.2 > --- xquery_fo.c 1 Feb 2009 10:57:08 -0000 1.177.2.1 > +++ xquery_fo.c 8 Feb 2009 11:15:36 -0000 1.177.2.2 > @@ -1597,20 +1597,88 @@ > .ret_ty = PFty_opt (PFty_xs_daytimeduration ()) } }, > .alg = NULL } > > -#if 0 > /* 10.6 Arithmetic Operators on Durations */ > - > - , /* op:add-yearMonthDurations */ > - , /* op:subtract-yearMonthDurations */ > - , /* op:multiply-yearMonthDuration */ > - , /* op:divide-yearMonthDuration */ > - , /* op:divide-yearMonthDuration-by-yearMonthDuration */ > - , /* op:add-dayTimeDurations */ > - , /* op:subtract-dayTimeDurations */ > - , /* op:multiply-dayTimeDuration */ > - , /* op:divide-dayTimeDuration */ > - , /* op:divide-dayTimeDuration-by-dayTimeDuration */ > - > + , /* op:add-yearMonthDurations (yearMonthDuration, yearMonthDuration) > + as yearMonthDuration */ > + { .ns = PFns_op, .loc = "plus", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_yearmonthduration (), > + PFty_xs_yearmonthduration () }, > + .ret_ty = PFty_xs_yearmonthduration () } }, > + .alg = PFbui_op_yearmonthduration_plus } > + , /* op:subtract-yearMonthDurations (yearMonthDuration, yearMonthDuration) > + as yearMonthDuration */ > + { .ns = PFns_op, .loc = "minus", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_yearmonthduration (), > + PFty_xs_yearmonthduration () }, > + .ret_ty = PFty_xs_yearmonthduration () } }, > + .alg = PFbui_op_yearmonthduration_minus } > + , /* op:multiply-yearMonthDuration (yearMonthDuration, double) > + as yearMonthDuration */ > + { .ns = PFns_op, .loc = "times", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_yearmonthduration (), > + PFty_xs_double () }, > + .ret_ty = PFty_xs_yearmonthduration () } }, > + .alg = PFbui_op_yearmonthduration_times } > + , /* op:divide-yearMonthDuration (yearMonthDuration, double) > + as yearMonthDuration */ > + { .ns = PFns_op, .loc = "div", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_yearmonthduration (), > + PFty_xs_double () }, > + .ret_ty = PFty_xs_yearmonthduration () } }, > + .alg = PFbui_op_yearmonthduration_div_dbl } > + , /* op:divide-yearMonthDuration-by-yearMonthDuration (yearMonthDuration, > + yearMonthDuration) as decimal */ > + { .ns = PFns_op, .loc = "div", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_yearmonthduration (), > + PFty_xs_yearmonthduration () }, > + .ret_ty = PFty_xs_decimal () } }, > + .alg = PFbui_op_yearmonthduration_div } > + , /* op:add-dayTimeDurations (dayTimeDuration, dayTimeDuration) > + as dayTimeDuration */ > + { .ns = PFns_op, .loc = "plus", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_daytimeduration (), > + PFty_xs_daytimeduration () }, > + .ret_ty = PFty_xs_daytimeduration () } }, > + .alg = PFbui_op_daytimeduration_plus } > + , /* op:subtract-dayTimeDurations (dayTimeDuration, dayTimeDuration) > + as dayTimeDuration */ > + { .ns = PFns_op, .loc = "minus", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_daytimeduration (), > + PFty_xs_daytimeduration () }, > + .ret_ty = PFty_xs_daytimeduration () } }, > + .alg = PFbui_op_daytimeduration_minus } > + , /* op:multiply-dayTimeDuration (dayTimeDuration, double) > + as dayTimeDuration */ > + { .ns = PFns_op, .loc = "times", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_daytimeduration (), > + PFty_xs_double () }, > + .ret_ty = PFty_xs_daytimeduration () } }, > + .alg = PFbui_op_daytimeduration_times } > + , /* op:divide-dayTimeDuration (dayTimeDuration, double) > + as dayTimeDuration */ > + { .ns = PFns_op, .loc = "div", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_daytimeduration (), > + PFty_xs_double () }, > + .ret_ty = PFty_xs_daytimeduration () } }, > + .alg = PFbui_op_daytimeduration_div_dbl } > + , /* op:divide-dayTimeDuration-by-dayTimeDuration (dayTimeDuration, > + dayTimeDuration) as decimal */ > + { .ns = PFns_op, .loc = "div", > + .arity = 2, .sig_count = 1, .sigs = { { > + .par_ty = (PFty_t[]) { PFty_xs_daytimeduration (), > + PFty_xs_daytimeduration () }, > + .ret_ty = PFty_xs_decimal () } }, > + .alg = PFbui_op_daytimeduration_div } > +#if 0 > /* 10.7 Timezone Adjustment Functions on Dates and Time Values */ > > , /* fn:adjust-dateTime-to-timezone */ > > > ------------------------------------------------------------------------------ > Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) > software. With Adobe AIR, Ajax developers can use existing skills and code to > build responsive, highly engaging applications that combine the power of local > resources and data with the reach of the web. Download the Adobe AIR SDK and > Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com > _______________________________________________ > Monetdb-pf-checkins mailing list > Monetdb-pf-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins >

1 0

[Monetdb-developers] Aggr function comment clarification
by Stefan de Konink 07 Feb '09

07 Feb '09

Could anyone elaborate what: comment "Sum over grouped tail sum on @1"; vs comment "Grouped tail sum on @1"; ...means? It is the distinct difference between AX3aggrX3_sum and AX3aggrX3_sum3. I'm looking for this `answer' just from an informational perspective. Stefan

1 0

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/modules/pftijah/Tests test_lms_or.stable.out, Feb2009, 1.3, 1.3.16.1
by Stefan Manegold 06 Feb '09

06 Feb '09

On Thu, Feb 05, 2009 at 02:48:37PM +0000, Henning Rode wrote: > Update of /cvsroot/monetdb/pathfinder/modules/pftijah/Tests > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2165/Tests > > Modified Files: > Tag: Feb2009 > test_lms_or.stable.out > Log Message: > after running the testset of INEX efficiency track, i found and fixed > several small bugs that caused queries to fail. Would it be an option to consider adding these tests to the standard testset to be run (and checked) automatically every night? Stefan > > > U test_lms_or.stable.out > Index: test_lms_or.stable.out > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/Tests/test_lms_or.stable.out,v > retrieving revision 1.3 > retrieving revision 1.3.16.1 > diff -u -d -r1.3 -r1.3.16.1 > --- test_lms_or.stable.out 11 Sep 2007 15:52:53 -0000 1.3 > +++ test_lms_or.stable.out 5 Feb 2009 14:48:35 -0000 1.3.16.1 > @@ -22,7 +22,7 @@ > # 12:52:37 > > > <?xml version="1.0" encoding="utf-8"?> > -<XQueryResult><node rank="1"><title>Pathfinder and TIJAH</title></node><node rank="2"><title>TIJAH</title></node><node rank="3"><title>Pathfinder</title></node><node rank="4"><title>PF/Tijah</title></node></XQueryResult> > +<XQueryResult><node rank="1"><title>Pathfinder and TIJAH</title></node><node rank="2"><title>Pathfinder</title></node><node rank="3"><title>TIJAH</title></node><node rank="4"><title>PF/Tijah</title></node></XQueryResult> > > # 12:52:37 > > # 12:52:37 > Done. > > > ------------------------------------------------------------------------------ > Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) > software. With Adobe AIR, Ajax developers can use existing skills and code to > build responsive, highly engaging applications that combine the power of local > resources and data with the reach of the web. Download the Adobe AIR SDK and > Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-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 1

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/compiler/Tests usageH.stable.out, , 1.52, 1.53
by Sjoerd Mullender 05 Feb '09

05 Feb '09

Jan Rittinger wrote: > Update of /cvsroot/monetdb/pathfinder/compiler/Tests > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12228/Tests > > Modified Files: > usageH.stable.out > Log Message: > -- Restructured Peters yesterday type cast checkin. > > - There is no necessity to make the types known outside the > typing. We can add the function signatures also locally. > > - Only the atomic types can be casted -- so only add atomic > predefined types. > > - Switched phases 9 and 10 to make sure that the type constructor > functions are loaded before the function checking. > > @Sjoerd and Stefan: I think these changes should be propagated to > the stable branch as well. Can you do that > with a script or should I better do it by hand? For us it's also a manual thing, so we wouldn't mind if you did it. But please use cvs commands to backport so that subsequent propagation sees that there are in fact no changes (otherwise we get conflicts). -- Sjoerd Mullender

1 0