November 2008 - developers-list

[Monetdb-developers] closing the stable branch
by Sjoerd Mullender 14 Nov '08

14 Nov '08

I am closing the stable branch for further checkins. We need to converge to a release. Today I will only still accept fixes that make that things compile on all platforms. I do not want anything that could possibly break tonight's compilation or testing. Note, this is only for the Nov2008 stable branch. -- Sjoerd Mullender

2 4

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/tests/BugTracker/Tests All, , 1.119, 1.120
by Lefteris 14 Nov '08

14 Nov '08

I jsut runned the fn_collection_after_delete.SF-2141000 test and did not produced any errors. I was not aware that it was disabled. lefteris On Fri, Nov 14, 2008 at 12:53 PM, Stefan Manegold <stmane(a)users.sourceforge.net> wrote: > Update of /cvsroot/monetdb/pathfinder/tests/BugTracker/Tests > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18290/pathfinder/tests/BugTracker/Tests > > Modified Files: > All > Log Message: > > Since Lefteris implemented fn:collection() (also) for the Algebra back-end, > we can re-enable the fn_collection_after_delete.SF-2141000 test (also) for the Algebra back-end. > > Wrapped changes in Lefteris's "fn_collection_before" & "fn_collection_after" tags. > > > U All > Index: All > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/All,v > retrieving revision 1.119 > retrieving revision 1.120 > diff -u -d -r1.119 -r1.120 > --- All 15 Oct 2008 10:32:18 -0000 1.119 > +++ All 14 Nov 2008 11:53:03 -0000 1.120 > @@ -164,7 +164,7 @@ > duplicates_error.SF-2142522 > order_by.SF-2140992 > combination_of_constructed_and_doc_elements.SF-2059394 > -NOT_ALGEBRA?fn_collection_after_delete.SF-2141000 > +fn_collection_after_delete.SF-2141000 > XML_attribute_generation.SF-2038906-unpack_doc > XML_attribute_generation.SF-2038906 > empty_file.SF-2017862 > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > 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] Transactions
by Eric M. Hielscher 13 Nov '08

13 Nov '08

Hi all, My name is Eric Hielscher, and I'm a PhD student working on a database project. The goal will be to replace the transaction processing subsystem of a dbms, and I've decided to use MonetDB. I've yet to really look much at the source. If anyone has the time, I'd appreciate some tips about where to look for: - The transaction processing code - The scheduling of transaction execution This is of course something I could do on my own, but would be more efficient if someone with expert knowledge could just quickly walk me through things. Thanks in advance, -- Eric Hielscher

2 1

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/runtime/xrpc/admin admin.xq, , 1.10, 1.11 xrpcwebclient.js, , 1.12, 1.13
by Ying Zhang 12 Nov '08

12 Nov '08

On Fri, Oct 31, 2008 at 03:26:46PM +0000, Sjoerd Mullender wrote: > Update of /cvsroot/monetdb/pathfinder/runtime/xrpc/admin > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25251/runtime/xrpc/admin > > Modified Files: > admin.xq xrpcwebclient.js > Log Message: > Fixed administration console: > > - Reverted back the merge from the xrpcdemo branch since it did not > work at all: the function XRPC was called with too few parameters, > and the callback function was never called. Hi Sjoerd, Thanks for trying fix the admin gui. However, simply revert the changes does not seem to help to improve the situation, i.e., executing an admin function just returns error. Since the JS script before the merge is out-dated, I would prefer to fix things based on the latest version. Hence, is it ok if I undo your reverting of xrpcwebclient.js, while keeping your bonus (see below)? Jennie > - Reintroduced the logger_base variable in pf_logmanager since it is > used by the statistics call. > - Added a CATCH in the statistics implementation so that the lock is > freed even if an error occurs. > - If there are no documents, the sum() in the statistics > implementation returns nil which causes serialization of the answer > to fail. > > As a bonus, replaced the non-ASCII characters in xrpcwebclient.js with > octal escapes so that the file can also be viewed in a UTF-8 > environment. > > > U admin.xq > Index: admin.xq > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/admin.xq,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -d -r1.10 -r1.11 > --- admin.xq 6 Jul 2008 11:20:06 -0000 1.10 > +++ admin.xq 31 Oct 2008 15:26:44 -0000 1.11 > @@ -86,7 +86,7 @@ > (: =================== server management =================== :) > > declare function admin:db-stats() > -{ pf:mil('lock_set(pf_short); var ret := bat(str,str); var tot := 0LL; colname_runtime@batloop() tot :+= sum([batsize]($t)); ret.insert("xquery_index_curMB", str(tot/1048576LL)); tot := doc_timestamp.select(timestamp_nil,timestamp_nil).reverse(); ret.insert("xquery_cache_curdocs", str(count(tot))); tot := tot.join(doc_collection).tunique().reverse().join(collection_size).sum(); ret.insert("xquery_cache_curMB", str(tot/1048576LL)); ret.insert("xquery_log_curMB", str((logger_changes(pf_logger) - logger_base)/131072)); ret.insert("gdk_vm_cursize", str(vm_cursize())); ret.insert("gdk_mem_cursize", str(mem_cursize())); lock_unset(pf_short); return ret;') }; > +{ pf:mil('var ret; var err := CATCH({ lock_set(pf_short); ret := bat(str,str); var tot := 0LL; colname_runtime@batloop() tot :+= sum([batsize]($t)); ret.insert("xquery_index_curMB", str(tot/1048576LL)); tot := doc_timestamp.select(timestamp_nil,timestamp_nil).reverse(); ret.insert("xquery_cache_curdocs", str(count(tot))); tot := tot.join(doc_collection).tunique().reverse().join(collection_size).sum(); if (isnil(tot)) tot := 0LL; ret.insert("xquery_cache_curMB", str(tot/1048576LL)); ret.insert("xquery_log_curMB", str((logger_changes(pf_logger) - logger_base)/131072)); ret.insert("gdk_vm_cursize", str(vm_cursize())); ret.insert("gdk_mem_cursize", str(mem_cursize())); }); lock_unset(pf_short); if (not(isnil(err))) ERROR(err); return ret;') }; > > declare function admin:db-env() > { pf:mil('var dels := new(void, str, 20).append("exec_prefix").append("prefix").append("gdk_debug").append("gdk_embedded").append("gdk_vm_minsize").append("mapi_debug").append("mapi_noheaders").append("monet_daemon").append("monet_mod_path").append("monet_pid").append("monet_prompt").append("monet_welcome").append("sql_debug").append("sql_logdir").reverse(); return monet_environment.kdiff(dels).access(BAT_WRITE).insert("gdk_mem_maxsize", str(mem_maxsize())).sort();') }; > > U xrpcwebclient.js > Index: xrpcwebclient.js > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/xrpcwebclient.js,v > retrieving revision 1.12 > retrieving revision 1.13 > diff -u -d -r1.12 -r1.13 > --- xrpcwebclient.js 3 Jul 2008 15:10:37 -0000 1.12 > +++ xrpcwebclient.js 31 Oct 2008 15:26:44 -0000 1.13 > @@ -4,28 +4,18 @@ > moduleurl, /* module (physical) at-hint URL. Module file must be here! */ > method, /* method name (matches function name in module) */ > arity, /* arity of the method */ > - updating, /* whether the function is an updating function */ > call, /* one or more XRPC_CALL() parameter specs (concatenated strings) */ > - callback, /* callback function to call with the XML response */ > - timeout, /* timeout value, when > 0 repeatable isolation level is presumed */ > - mode) /* (none | repeatable) [-iterative][-trace] */ > -{ > - clnt.sendReceive(posturl, method, XRPC_REQUEST(module,moduleurl,method,arity,updating,call,timeout,mode), callback); > -} > - > -function XRPC_PART(geturl, /* Your XRPC server. Usually: "http://yourhost:yourport/xrpc" */ > callback) /* callback function to call with the XML response */ > { > - clntPart.sendReceivePart(geturl, callback); > + clnt.sendReceive(posturl, method, XRPC_REQUEST(module,moduleurl,method,arity,call), callback); > } > > /********************************************************************** > functions to construct valid XRPC soap requests > ***********************************************************************/ > > -function XRPC_REQUEST(module, moduleurl, method, arity, updating, body, timeout, mode) > -{ > - return '<?xml version="1.0" encoding="utf-8"?>\n' + > +function XRPC_REQUEST(module, moduleurl, method, arity, body) { > + var r = '<?xml version="1.0" encoding="utf-8"?>\n' + > '<env:Envelope ' + > 'xmlns:env="http://www.w3.org/2003/05/soap-envelope" ' + > 'xmlns:xrpc="http://monetdb.cwi.nl/XQuery" ' + > @@ -36,11 +26,10 @@ > '<xrpc:request xrpc:module="' + module + '" ' + > 'xrpc:location="' + moduleurl + '" ' + > 'xrpc:method="' + method + '" ' + > - 'xrpc:mode="' + mode + '" ' + > - 'xrpc:updCall="' + (updating?"true":"false") + '" ' + > 'xrpc:arity="' + arity + '">' + > body > + '</xrpc:request></env:Body></env:Envelope>'; > + return r; > } > > /* a body consists of one or more calls */ > @@ -83,25 +72,6 @@ > } > } > > -function string2XML(text) { > - try //Internet Explorer > - { > - xmlDoc=new ActiveXObject("Microsoft.XMLDOM"); > - xmlDoc.async="false"; > - xmlDoc.loadXML(text); > - } > - catch(e) > - { > - try //Firefox, Mozilla, Opera, etc. > - { > - parser=new DOMParser(); > - xmlDoc=parser.parseFromString(text,"text/xml"); > - } > - catch(e) {alert(e.message)} > - } > - return xmlDoc; > -} > - > function getnodesXRPC(node,tagname) { > try { > return node.getElementsByTagNameNS("http://monetdb.cwi.nl/XQuery",tagname); > @@ -122,75 +92,21 @@ > } > } > > -XRPCWebClientPart = function () { > - if (window.XMLHttpRequest) { > - this.xmlhttp = new XMLHttpRequest(); > - } else if (window.ActiveXObject) { > - try { > - this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); > - } catch(e) { > - this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); > - } > - } > -} > - > XRPCWebClient.prototype.sendReceive = function(posturl, method, request, callback) { > try { > - this.xmlhttp.open("POST", posturl, true); > - //alert(request); > - if (XRPCDEBUG && method != 'getdoc') { > - //document.getElementById("messreq").value = request; > - messreqChanged(string2XML(request)); > - } > - this.xmlhttp.send(request); > - var app = this; > - > - this.xmlhttp.onreadystatechange = function() { > - if (app.xmlhttp.readyState == 4 ) { > - if (app.xmlhttp.status == 200 && > - app.xmlhttp.responseText.indexOf("!ERROR") < 0 && > - app.xmlhttp.responseText.indexOf("<env:Fault>") < 0) > - { > - if (XRPCDEBUG) { > - if (app.xmlhttp.responseText) { > - > - > - if(method != 'getdoc') messresChanged(app.xmlhttp.responseXML? app.xmlhttp.responseXML: string2XML(app.xmlhttp.responseText)); > - callback(app.xmlhttp.responseXML? app.xmlhttp.responseXML: string2XML(app.xmlhttp.responseText)); > - } > - } > - } else { > - var errmsg = > - '!ERROR: "' + method + ' execution failed at the remote side"\n\n' + > - '!ERROR: HTTP/1.1 ' + app.xmlhttp.status + '\n' + > - '!ERROR: HTTP Response:\n\n\t' + app.xmlhttp.responseText; > - alert(errmsg); > - return null; > - } > - } > - }; > - } catch (e) { > - alert('sendRequest('+posturl,','+method+'): '+e); > - } > -} > + this.xmlhttp.open("POST", posturl, true); > + if (XRPCDEBUG) alert(request); > + this.xmlhttp.send(request); > > -XRPCWebClientPart.prototype.sendReceivePart = function(geturl, callback) { > - try { > - //alert("get " + geturl); > - this.xmlhttp.open("GET", geturl, true); > - this.xmlhttp.send(""); > var app = this; > - > - this.xmlhttp.onreadystatechange = function() { > + this.xmlhttp.onreadystatechange = function() { > if (app.xmlhttp.readyState == 4 ) { > if (app.xmlhttp.status == 200 && > app.xmlhttp.responseText.indexOf("!ERROR") < 0 && > app.xmlhttp.responseText.indexOf("<env:Fault>") < 0) > { > - if (XRPCDEBUG) { > - if (app.xmlhttp.responseText) > - callback(app.xmlhttp.responseXML? app.xmlhttp.responseXML: string2XML(app.xmlhttp.responseText)); > - } > + if (XRPCDEBUG) alert(serializeXML(app.xmlhttp.responseXML)); > + callback(app.xmlhttp.responseXML); > } else { > var errmsg = > '!ERROR: "' + method + ' execution failed at the remote side"\n\n' + > @@ -202,7 +118,7 @@ > } > }; > } catch (e) { > - alert('sendRequest('+geturl+'): '+e); > + alert('sendRequest('+method+'): '+e); > } > } > > @@ -222,15 +138,15 @@ > '\\030', '\\031', '\\032', '\\033', '\\034', '\\035', '\\036', '\\037'); > > > - var chars = new Array ('&','�','�','�','�','�','�','�','�','�','�', > - '�','�','�','�','�','�','�','�','�','�','�', > - '�','�','�','�','�','�','�','�','�','�','�', > - '�','�','�','�','�','�','�','�','�','�','�', > - '�','�','�','�','�','�','�','�','�','�','�', > - '�','�','�','�','�','�','�','�','\"','�','<', > - '>','�','�','�','�','�','�','�','�','�','�', > - '�','�','�','�','�','�','�','�','�','�','�', > - '�','�','�','�','�','�','�','�'); > + var chars = new Array ('&','\340','\341','\342','\343','\344','\345','\346','\347','\350','\351', > + '\352','\353','\354','\355','\356','\357','\360','\361','\362','\363','\364', > + '\365','\366','\370','\371','\372','\373','\374','\375','\376','\377','\300', > + '\301','\302','\303','\304','\305','\306','\307','\310','\311','\312','\313', > + '\314','\315','\316','\317','\320','\321','\322','\323','\324','\325','\326', > + '\330','\331','\332','\333','\334','\335','\336','\200','\"','\337','<', > + '>','\242','\243','\244','\245','\246','\247','\250','\251','\252','\253', > + '\254','\255','\256','\257','\260','\261','\262','\263','\264','\265','\266', > + '\267','\270','\271','\272','\273','\274','\275','\276'); > > var entities = new Array ('amp','agrave','aacute','acirc','atilde','auml','aring', > 'aelig','ccedil','egrave','eacute','ecirc','euml','igrave', > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-pf-checkins mailing list > Monetdb-pf-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

2 1

[Monetdb-developers] Mtest: remove M5 warning about modules
by Fabian Groffen 11 Nov '08

11 Nov '08

Currently Mtest.py spits out the following warning when using M5: Mtest.py Warning: MonetDB/5: Check, whether required modules do exist, is not possible, yet! It's in there for years. I think the functionality of Mtest to be able to check whether required modules are available before running a test come at the price of administering which modules are necessary to run the test. Implementing the module check in M5 hence would also mean adding the required module information to each test. Hence, I would suggest to remove the warning from Mtest.py and just deal with the error messages that appear when modules don't exist. Opinions?

2 1

Re: [Monetdb-developers] [Monetdb-sql-checkins] sql/src/server sql_env.mx, Nov2008, 1.74, 1.74.2.1
by Martin Kersten 05 Nov '08

05 Nov '08

It will change again ;) see in my local dir Niels Nes wrote: > Update of /cvsroot/monetdb/sql/src/server > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17857/src/server > > Modified Files: > Tag: Nov2008 > sql_env.mx > Log Message: > keepCall now has 12 arguments > > > U sql_env.mx > Index: sql_env.mx > =================================================================== > RCS file: /cvsroot/monetdb/sql/src/server/sql_env.mx,v > retrieving revision 1.74 > retrieving revision 1.74.2.1 > diff -u -d -r1.74 -r1.74.2.1 > --- sql_env.mx 4 Nov 2008 11:38:16 -0000 1.74 > +++ sql_env.mx 5 Nov 2008 21:16:00 -0000 1.74.2.1 > @@ -114,7 +114,7 @@ > sgn = stack_get_number(m, "history"); > assert((lng) GDK_int_min <= sgn && sgn <= (lng) GDK_int_max); > if (!sql_find_func(sys, "keepquery", 4) || > - !sql_find_func(sys, "keepcall", 6)) > + !sql_find_func(sys, "keepcall", 12)) > return sql_message( "Cannot activate history because the keepQuery and keepCall procedures are not available\n" ); > m->history = (int) (sgn)?1:0; > } > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-sql-checkins mailing list > Monetdb-sql-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins >

1 0

[Monetdb-developers] Release schedule
by Sjoerd Mullender 04 Nov '08

04 Nov '08

Today we decided that we want to try to do releases more often and more regularly. I have been appointed release manager for all upcoming releases. I propose that we keep to the following schedule: - Do a major (feature) release once every 4 months. - Do a minor (bug fix) release once every month inbetween the major releases. This should solve the problem that we get bug reports for problems in the release for bugs that were already fixed months ago but not yet released. In the worst case the submitter has to wait a month for the fix, but usually of course much less than that. It also solves the problem that developers always want to add just one more feature to the next release and thereby forcing the release to be postponed. If a feature doesn't make it in a release, it will be released in four months time. If users (and developers) had to wait years for this feature, they can wait a little longer. I also propose to create a new stable branch right after releasing the last of the bug fix releases in a cycle. This gives us one month to stabilize and test a new release. This plan is effective as of now. -- Sjoerd Mullender

4 7

[Monetdb-developers] New stable branch created
by Sjoerd Mullender 04 Nov '08

04 Nov '08

I have created new stable branches for the upcoming release. From now on *all* bug fixes and *only* bug fixes *must* go to this new stable branch. I reserve the right to undo any changes that do not comply with this rule. Unlike previous stable branches, this time all packages use the same name for the branch: Nov2008. So in each of your stable checkout directories you can do cvs update -rNov2008 to update to the new branch. I have created branches for the following packages: MonetDB MonetDB4 MonetDB5 TestTools buildtools clients geom pathfinder sql template. Note that java and datacell are missing from this list. Java has its own release schedule, and datacell is not yet released and will not be released in this round. -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-sql-checkins] sql/src/backends/monet5 sql_gencode.mx, , 1.291, 1.292
by Stefan Manegold 04 Nov '08

04 Nov '08

What about solving the actual problem and fixing the code properly instead of just curing/patching symptoms? In MonetDB type long is not supposed to be used at all as it is not portable. What is wrong with using the standard MonetDB type system? E.g., ======== $ cvs diff MonetDB5/src/mal/mal_builder.mx sql/src/backends/monet5/sql_gencode.mx Index: MonetDB5/src/mal/mal_builder.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_builder.mx,v retrieving revision 1.36 diff -u -r1.36 mal_builder.mx --- MonetDB5/src/mal/mal_builder.mx 30 Oct 2008 07:28:42 -0000 1.36 +++ MonetDB5/src/mal/mal_builder.mx 4 Nov 2008 07:33:47 -0000 @@ -47,7 +47,7 @@ mal_export InstrPtr pushChr(MalBlkPtr mb, InstrPtr q, char val); mal_export InstrPtr pushOid(MalBlkPtr mb, InstrPtr q, oid val); mal_export InstrPtr pushVoid(MalBlkPtr mb, InstrPtr q); -mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, long val); +mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, lng val); mal_export InstrPtr pushDbl(MalBlkPtr mb, InstrPtr q, double val); mal_export InstrPtr pushFlt(MalBlkPtr mb, InstrPtr q, float val); mal_export InstrPtr pushStr(MalBlkPtr mb, InstrPtr q, const char *val); @@ -232,7 +232,7 @@ } InstrPtr -pushLng(MalBlkPtr mb, InstrPtr q, long val) +pushLng(MalBlkPtr mb, InstrPtr q, lng val) { int _t; ValRecord cst; Index: sql/src/backends/monet5/sql_gencode.mx =================================================================== RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v retrieving revision 1.292 diff -u -r1.292 sql_gencode.mx --- sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 06:55:24 -0000 1.292 +++ sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 07:33:47 -0000 @@ -1929,8 +1929,8 @@ q = newStmt(mb,sqlRef,"keepquery"); q= pushInt(mb,q,c->history); q= pushStr(mb,q,t); - q= pushLng(mb,q, (long) (GDKusec() - be->mvc->Tparse) ); - q= pushLng(mb,q, (long) GDKusec()); + q= pushLng(mb,q, GDKusec() - be->mvc->Tparse); + q= pushLng(mb,q, GDKusec()); c->Tparse = 0; } ======== or even better ======== $ cvs diff MonetDB5/src/mal/mal_builder.mx sql/src/backends/monet5/sql_gencode.mx Index: MonetDB5/src/mal/mal_builder.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_builder.mx,v retrieving revision 1.36 diff -u -r1.36 mal_builder.mx --- MonetDB5/src/mal/mal_builder.mx 30 Oct 2008 07:28:42 -0000 1.36 +++ MonetDB5/src/mal/mal_builder.mx 4 Nov 2008 07:35:53 -0000 @@ -44,14 +44,14 @@ mal_export InstrPtr pushInt(MalBlkPtr mb, InstrPtr q, int val); mal_export InstrPtr pushWrd(MalBlkPtr mb, InstrPtr q, wrd val); mal_export InstrPtr pushBte(MalBlkPtr mb, InstrPtr q, bte val); -mal_export InstrPtr pushChr(MalBlkPtr mb, InstrPtr q, char val); +mal_export InstrPtr pushChr(MalBlkPtr mb, InstrPtr q, chr val); mal_export InstrPtr pushOid(MalBlkPtr mb, InstrPtr q, oid val); mal_export InstrPtr pushVoid(MalBlkPtr mb, InstrPtr q); -mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, long val); -mal_export InstrPtr pushDbl(MalBlkPtr mb, InstrPtr q, double val); -mal_export InstrPtr pushFlt(MalBlkPtr mb, InstrPtr q, float val); +mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, lng val); +mal_export InstrPtr pushDbl(MalBlkPtr mb, InstrPtr q, dbl val); +mal_export InstrPtr pushFlt(MalBlkPtr mb, InstrPtr q, flt val); mal_export InstrPtr pushStr(MalBlkPtr mb, InstrPtr q, const char *val); -mal_export InstrPtr pushBit(MalBlkPtr mb, InstrPtr q, int val); +mal_export InstrPtr pushBit(MalBlkPtr mb, InstrPtr q, bit val); mal_export InstrPtr pushNil(MalBlkPtr mb, InstrPtr q, int tpe); mal_export InstrPtr pushNilType(MalBlkPtr mb, InstrPtr q, char *tpe); mal_export InstrPtr pushZero(MalBlkPtr mb, InstrPtr q, int tpe); @@ -193,7 +193,7 @@ } InstrPtr -pushChr(MalBlkPtr mb, InstrPtr q, char val) +pushChr(MalBlkPtr mb, InstrPtr q, chr val) { int _t; ValRecord cst; @@ -232,7 +232,7 @@ } InstrPtr -pushLng(MalBlkPtr mb, InstrPtr q, long val) +pushLng(MalBlkPtr mb, InstrPtr q, lng val) { int _t; ValRecord cst; @@ -244,7 +244,7 @@ } InstrPtr -pushDbl(MalBlkPtr mb, InstrPtr q, double val) +pushDbl(MalBlkPtr mb, InstrPtr q, dbl val) { int _t; ValRecord cst; @@ -256,7 +256,7 @@ } InstrPtr -pushFlt(MalBlkPtr mb, InstrPtr q, float val) +pushFlt(MalBlkPtr mb, InstrPtr q, flt val) { ValRecord cst; @@ -281,7 +281,7 @@ } InstrPtr -pushBit(MalBlkPtr mb, InstrPtr q, int val) +pushBit(MalBlkPtr mb, InstrPtr q, bit val) { int _t; ValRecord cst; Index: sql/src/backends/monet5/sql_gencode.mx =================================================================== RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v retrieving revision 1.292 diff -u -r1.292 sql_gencode.mx --- sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 06:55:24 -0000 1.292 +++ sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 07:35:53 -0000 @@ -1929,8 +1929,8 @@ q = newStmt(mb,sqlRef,"keepquery"); q= pushInt(mb,q,c->history); q= pushStr(mb,q,t); - q= pushLng(mb,q, (long) (GDKusec() - be->mvc->Tparse) ); - q= pushLng(mb,q, (long) GDKusec()); + q= pushLng(mb,q, GDKusec() - be->mvc->Tparse); + q= pushLng(mb,q, GDKusec()); c->Tparse = 0; } ======== Stefan On Tue, Nov 04, 2008 at 06:55:26AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/sql/src/backends/monet5 > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13501 > > Modified Files: > sql_gencode.mx > Log Message: > Silence compiler > > > U sql_gencode.mx > Index: sql_gencode.mx > =================================================================== > RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v > retrieving revision 1.291 > retrieving revision 1.292 > diff -u -d -r1.291 -r1.292 > --- sql_gencode.mx 3 Nov 2008 15:32:04 -0000 1.291 > +++ sql_gencode.mx 4 Nov 2008 06:55:24 -0000 1.292 > @@ -1929,8 +1929,8 @@ > q = newStmt(mb,sqlRef,"keepquery"); > q= pushInt(mb,q,c->history); > q= pushStr(mb,q,t); > - q= pushLng(mb,q,GDKusec() - be->mvc->Tparse); > - q= pushLng(mb,q, GDKusec()); > + q= pushLng(mb,q, (long) (GDKusec() - be->mvc->Tparse) ); > + q= pushLng(mb,q, (long) GDKusec()); > c->Tparse = 0; > } > > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-sql-checkins mailing list > Monetdb-sql-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-sql-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] MonetDB4/src/modules/contrib malalgebra.mx, MonetDB_4-24, 1.8.2.2, 1.8.2.3
by Sjoerd Mullender 03 Nov '08

03 Nov '08

Did you see what I had done on the head branch for this problem? On 2008-11-03 22:51, Stefan Manegold wrote: > Update of /cvsroot/monetdb/MonetDB4/src/modules/contrib > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6583/MonetDB4/src/modules/contrib > > Modified Files: > Tag: MonetDB_4-24 > malalgebra.mx > Log Message: > > attempt to fix bug in Peter's new {band,left}mergejoin_limit() functions > that was reported by Riham: > > While {band,left}mergejoin_limit() internally use a limit of type size_t, > the MIL level uses type lng; hence, we need to properly convert the types > back and forth (and check for potential under-/overflows). > > (For now, I did not dare to change the MIL interface to use the more suitable > type wrd that (unlike lng) grows with system word size just like size_t.) > > Riham, > > could you please check, whether this fixes your problem? > Thanks! > > > > U malalgebra.mx > Index: malalgebra.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB4/src/modules/contrib/malalgebra.mx,v > retrieving revision 1.8.2.2 > retrieving revision 1.8.2.3 > diff -u -d -r1.8.2.2 -r1.8.2.3 > --- malalgebra.mx 28 Oct 2008 17:49:34 -0000 1.8.2.2 > +++ malalgebra.mx 3 Nov 2008 21:51:09 -0000 1.8.2.3 > @@ -263,28 +263,50 @@ > } > > int > -CMDbandmergejoin_limit(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus, bit *li, bit *hi, lng* limit) > +CMDbandmergejoin_limit(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus, bit *li, bit *hi, lng* _limit) > { > - size_t cutoff = *limit; > + lng limit = *_limit; > + size_t cutoff = (size_t) limit; > + assert(limit >= 0); > +#if SIZEOF_SIZE_T == SIZEOF_INT > + assert(limit <= GDK_int_max); > +#endif > *result = BATbandmergejoin_limit(left, right, minus, plus, *li, *hi, &cutoff); > if (*result) { > bat bid = (*result)->batCacheid; > *result = BATnew(TYPE_lng, TYPE_bat, 1); > - if (*result) BUNins(*result, &cutoff, &bid, FALSE); > + if (*result) { > +#if SIZEOF_SIZE_T == SIZEOF_LNG > + assert(cutoff <= (size_t) GDK_lng_max); > +#endif > + limit = (lng) cutoff; > + BUNins(*result, &limit, &bid, FALSE); > + } > BBPunfix(bid); > } > return (*result)?GDK_SUCCEED:GDK_FAIL; > } > > int > -CMDleftmergejoin_limit(BAT **result, BAT *left, BAT *right, lng* limit) > +CMDleftmergejoin_limit(BAT **result, BAT *left, BAT *right, lng* _limit) > { > - size_t cutoff = *limit; > + lng limit = *_limit; > + size_t cutoff = (size_t) limit; > + assert(limit >= 0); > +#if SIZEOF_SIZE_T == SIZEOF_INT > + assert(limit <= GDK_int_max); > +#endif > *result = BATleftmergejoin_limit(left, right, cutoff, &cutoff); > if (*result) { > bat bid = (*result)->batCacheid; > *result = BATnew(TYPE_lng, TYPE_bat, 1); > - if (*result) BUNins(*result, &cutoff, &bid, FALSE); > + if (*result) { > +#if SIZEOF_SIZE_T == SIZEOF_LNG > + assert(cutoff <= (size_t) GDK_lng_max); > +#endif > + limit = (lng) cutoff; > + BUNins(*result, &limit, &bid, FALSE); > + } > BBPunfix(bid); > } > return (*result)?GDK_SUCCEED:GDK_FAIL; > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Sjoerd Mullender

2 1