developers-list February 2013

developers-list@monetdb.org

11 participants
8 discussions

Re: MonetDB: Feb2013 - Make MALresource independent of cntxt and mb

by Fabian Groffen

Any reason for undoing 0f30e64e9bb2? On 26-02-2013 14:52:15 +0100, Martin Kersten wrote: > Changeset: 33a1b7bfcb28 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33a1b7bfcb28 > Modified Files: > monetdb5/mal/mal_dataflow.c > monetdb5/mal/mal_interpreter.c > monetdb5/mal/mal_resource.c > monetdb5/mal/mal_resource.h > Branch: Feb2013 > Log Message: > > Make MALresource independent of cntxt and mb > > > diffs (87 lines): > > diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c > --- a/monetdb5/mal/mal_dataflow.c > +++ b/monetdb5/mal/mal_dataflow.c > @@ -328,13 +328,13 @@ DFLOWworker(void *t) > } > MT_lock_unset(&flow->flowlock, "MALworker"); > > + q_enqueue(flow->done, fe); > if ( fnxt == 0) { > if (todo->last == 0) > profilerHeartbeatEvent("wait"); > else > - MALresourceFairness(flow->cntxt, flow->mb, usec); > + MALresourceFairness(usec); > } > - q_enqueue(flow->done, fe); > } > GDKfree(GDKerrbuf); > GDKsetbuf(0); -- Fabian Groffen fabian(a)monetdb.org column-store pioneer http://www.monetdb.org/Home

9 years, 4 months

Announcement: New Feb2013 Feature release of MonetDB suite

by Sjoerd Mullender

The MonetDB team at CWI/MonetDB BV is pleased to announce the Feb2013 feature release of the MonetDB suite of programs. More information about MonetDB can be found on our website at <http://www.monetdb.org/>. For details on this release, please see the release notes at <http://www.monetdb.org/Downloads/ReleaseNotes>. As usual, the download location is <http://dev.monetdb.org/downloads/>. Feb 2013 feature release Testing Environment * enabled "top-level" Mtest.py So far, while Mtest.py could be called in any subdirectory of the MonetDB source tree (and could then run all tests in the entire sub-tree), it was not possible to call Mtest.py in the top-level MonetDB source directory to run all tests. Instead, to run all tests, Mtest.py had to be called at least 4 times, once in each of these directories: "clients", "monetdb5", "sql", "geom". Now, it is possible to call Mtest.py once in the top-level MonetDB source directory to run all tests in one go. The behaviour of calling Mtest.py in any subdirectory, including the four mentioned above, did not changed, other than that now obsolete command line options "-p / --package <package>" and "-5 / --monetdb5" have been removed. Java Module * merocontrol was changed to return server URIs, and lastStop time. Connections and dbpath were removed. * Mapi protocol v8 support was removed from MapiSocket. Protocol v8 has not been used by the servers any more since Apr2012 release Client Package * Mapi protocol v8 support was removed from all client drivers. Protocol v8 has not been used by the servers any more since Apr2012 release * The tool mnc was removed from installations * msqldump: Implmented an option (--table/-t) to dump a single table. * Changed msqdump's trace option to be in line with mclient. In both cases, the long option is --Xdebug and the short option is -X. MonetDB5 Server * mserver5: The --dbname and --dbfarm options have been replaced by the single --dbpath option. * The scheduler of mserver5 was changed to use a fixed set of workers to perform the work for all connected clients. Previously, each client connection had its own set of workers, easily causing resource problems upon multiple connections to the server. Merovingian * Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped * monetdb status now uses a more condensed output, to cater for the uris being shown, and prints how long a database is stopped, or how long ago it crashed * monetdb status now prints the connection uri for each database, when available. The connections and database path properties have been dropped. * monetdb status now prints last crash date only if the database has not been started since. Bug Fixes * 2291: small doubles end up as NULL after arithmetic * 3215: Calculation Date function using interval and year * 3033: stethoscope needs better documentation * 3084: Timestamp arithmetic very slow (especially on Windows) * 3125: Python tests fail after recent Python API changes * 3172: assertion fails on table function with subselects as parameters * 3178: one scan is enough to implement ALGstdev_@1 in monetdb5/modules/kernel/algebra.mx * 3179: LIKE: batstr.like+algebra.uselect called instead of pcre.like_filter * 3193: Expressions not supported in the GROUP BY or ORDER BY clause. * 3216: "unknown property" error setting format and width in .monetdb file * 3217: gdk_posix fails to compile under NetBSD * 3221: can no execute large statements * 3227: MT_set_lock() call on an non-initialized lock

9 years, 5 months

Au sujet MonetDB

by Bouslah Ahmed

Bonsoir, Je travaille depuis peu de temps sur MonetDB et je rencontre des difficultés à comprendre le principe de fonctionnement, pour cela j'ai des questions à vous poser. 1 - Où puis-je trouver le code source; 2 - Comment le compiler; 3 - Pour information j'utilise Windows comme système d'exploitation. Merci de me répondre. Cordialement a.bouslah(a)yahoo.fr

9 years, 5 months

Re: MonetDB: default - Merge with Feb2013 branch.

by Martin Kersten

Thx On 2/14/13 11:24 PM, Sjoerd Mullender wrote: > Changeset: f334ca6b1b90 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f334ca6b1b90 > Added Files: > sql/test/Users/Tests/privs.sql.src > sql/test/Users/Tests/privs.stable.err > sql/test/Users/Tests/privs.stable.out > sql/test/Users/Tests/privs2.sql.src > sql/test/Users/Tests/privs2.stable.err > sql/test/Users/Tests/privs2.stable.out > sql/test/Users/Tests/test_privs2_p1.SQL.py > sql/test/Users/Tests/test_privs2_p1.stable.err > sql/test/Users/Tests/test_privs2_p1.stable.out > sql/test/Users/Tests/test_privs2_p2.SQL.py > sql/test/Users/Tests/test_privs2_p2.stable.err > sql/test/Users/Tests/test_privs2_p2.stable.out > sql/test/Users/Tests/test_privs_p1.SQL.py > sql/test/Users/Tests/test_privs_p1.stable.err > sql/test/Users/Tests/test_privs_p1.stable.out > sql/test/Users/Tests/test_privs_p2.SQL.py > sql/test/Users/Tests/test_privs_p2.stable.err > sql/test/Users/Tests/test_privs_p2.stable.out > sql/test/Users/privs.sql > sql/test/Users/privs2.sql > sql/test/Users/test_privs.sql > sql/test/Users/test_privs2.sql > Modified Files: > monetdb5/mal/mal_dataflow.c > monetdb5/mal/mal_interpreter.c > monetdb5/mal/mal_resource.c > sql/backends/monet5/rel_bin.c > sql/backends/monet5/sql_gencode.c > sql/backends/monet5/sql_gencode.h > sql/backends/monet5/sql_scenario.c > sql/common/sql_backend.c > sql/common/sql_backend.h > sql/server/rel_updates.c > sql/test/Users/Tests/All > Branch: default > Log Message: > > Merge with Feb2013 branch. > > > diffs (truncated from 1336 to 300 lines): > > diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c > --- a/sql/backends/monet5/rel_bin.c > +++ b/sql/backends/monet5/rel_bin.c > @@ -1033,8 +1033,6 @@ rel_parse_value(mvc *m, char *query, cha > m->argc = 0; > m->sym = NULL; > m->errstr[0] = '\0'; > - /* via views we give access to protected objects */ > - m->user_id = USER_MONETDB; > > (void) sqlparse(m); /* blindly ignore errors */ > > @@ -2648,8 +2646,6 @@ sql_parse(mvc *m, sql_allocator *sa, cha > m->sym = NULL; > m->errstr[0] = '\0'; > m->errstr[ERRSIZE-1] = '\0'; > - /* via views we give access to protected objects */ > - m->user_id = USER_MONETDB; > > /* create private allocator */ > m->sa = (sa)?sa:sa_create(); > diff --git a/sql/backends/monet5/sql_gencode.c b/sql/backends/monet5/sql_gencode.c > --- a/sql/backends/monet5/sql_gencode.c > +++ b/sql/backends/monet5/sql_gencode.c > @@ -54,7 +54,8 @@ > #include <rel_bin.h> > > static int _dumpstmt(backend *sql, MalBlkPtr mb, stmt *s); > -static void backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s); > +static int backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s); > +static int backend_create_func(backend *be, sql_func *f); > > /* > * @+ MAL code support > @@ -261,7 +262,7 @@ relational_func_create_result( mvc *sql, > } > > > -static void > +static int > _create_relational_function(mvc *m, char *name, sql_rel *rel, stmt *call) > { > sql_rel *r; > @@ -314,16 +315,18 @@ _create_relational_function(mvc *m, char > } > } > > - backend_dumpstmt(be, curBlk, s); > + if (backend_dumpstmt(be, curBlk, s) < 0) > + return -1; > /* SQL function definitions meant for inlineing should not be optimized before */ > varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL); > addQueryToCache(c); > if (backup) > c->curprg = backup; > + return 0; > } > > /* stub and remote function */ > -static void > +static int > _create_relational_remote(mvc *m, char *name, sql_rel *rel, stmt *call, prop *prp) > { > Client c = MCgetClient(m->clientid); > @@ -346,7 +349,8 @@ _create_relational_remote(mvc *m, char * > /* dirty hack, rename (change first char of name) L->l, local > * functions name start with 'l' */ > name[0] = 'l'; > - _create_relational_function(m, name, rel, call); > + if (_create_relational_function(m, name, rel, call) < 0) > + return -1; > > /* create stub */ > name[0] = old; > @@ -462,18 +466,19 @@ _create_relational_remote(mvc *m, char * > if (backup) > c->curprg = backup; > name[0] = old; /* make sure stub is called */ > + return 0; > } > > -static void > +static int > monet5_create_relational_function(mvc *m, char *name, sql_rel *rel, stmt *call) > > { > prop *p = NULL; > > if (rel && (p = find_prop(rel->p, PROP_REMOTE)) != NULL) > - _create_relational_remote(m, name, rel, call, p); > + return _create_relational_remote(m, name, rel, call, p); > else > - _create_relational_function(m, name, rel, call); > + return _create_relational_function(m, name, rel, call); > } > > /* > @@ -663,7 +668,8 @@ dump_joinN(backend *sql, MalBlkPtr mb, s > InstrPtr q; > int op1, op2, op3 = 0; > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > > @@ -1121,7 +1127,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > node *n; > char *mod, *fimp; > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > > @@ -1632,7 +1639,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > char *mod, *fimp; > int l = _dumpstmt(sql, mb, s->op1); > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > if (s->op1->nrcols && strcmp(fimp, "not_uniques") == 0) { > @@ -1666,7 +1674,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > int l = _dumpstmt(sql, mb, s->op1); > int r = _dumpstmt(sql, mb, s->op2); > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > > @@ -1713,7 +1722,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > /* dump operands */ > _dumpstmt(sql, mb, s->op1); > > - backend_create_func(sql, f->func); > + if (backend_create_func(sql, f->func) < 0) > + return -1; > mod = sql_func_mod(f->func); > fimp = sql_func_imp(f->func); > if (s->nrcols) { > @@ -1769,7 +1779,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > /* dump args */ > if (s->op1) > _dumpstmt(sql, mb, s->op1); > - monet5_create_relational_function(sql->mvc, fimp, rel, s); > + if (monet5_create_relational_function(sql->mvc, fimp, rel, s) < 0) > + return -1; > > q = newStmt(mb, mod, fimp); > q = relational_func_create_result(sql->mvc, mb, q, rel); > @@ -1791,7 +1802,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > int restype = s->op4.aggrval->res.type->localtype; > int complex_aggr = 0; > > - backend_create_func(sql, s->op4.aggrval->aggr); > + if (backend_create_func(sql, s->op4.aggrval->aggr) < 0) > + return -1; > mod = s->op4.aggrval->aggr->mod; > aggrfunc = s->op4.aggrval->aggr->imp; > > @@ -2242,7 +2254,8 @@ static void setCommitProperty(MalBlkPtr > varSetProperty(mb, getArg(getInstrPtr(mb,0),0), "autoCommit","=", &cst); > } > > -static void backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s) > +static int > +backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s) > { > mvc *c = be->mvc; > stmt **stmts = stmt_array(c->sa, s); > @@ -2259,9 +2272,11 @@ static void backend_dumpstmt(backend *be > clear_stmts(stmts); > while(stmts[nr]) { > stmt *s = stmts[nr++]; > - (void)_dumpstmt(be, mb, s); > + if (_dumpstmt(be, mb, s) < 0) > + return -1; > } > - (void)_dumpstmt(be, mb, s); > + if (_dumpstmt(be, mb, s) < 0) > + return -1; > > be->mvc_var = old_mv; > if (c->caching && (c->type == Q_SCHEMA || c->type == Q_TRANS)) { > @@ -2276,9 +2291,10 @@ static void backend_dumpstmt(backend *be > q->barrier = RETURNsymbol; > } > pushEndInstruction(mb); > + return 0; > } > > -void > +int > backend_callinline(backend *be, Client c, stmt *s ) > { > mvc *m = be->mvc; > @@ -2312,8 +2328,10 @@ backend_callinline(backend *be, Client c > } > } > } > - backend_dumpstmt(be, curBlk, s); > + if (backend_dumpstmt(be, curBlk, s) < 0) > + return -1; > c->curprg->def = curBlk; > + return 0; > } > > Symbol > @@ -2336,8 +2354,9 @@ backend_dumpproc(backend *be, Client c, > sql_subfunc *cq = sql_find_func(m->sa, sys, "keepcall", NR_KEEPCALL_ARGS, F_PROC); > > assert(kq && cq); > - backend_create_func(be, kq->func); > - backend_create_func(be, cq->func); > + if (backend_create_func(be, kq->func) < 0 || > + backend_create_func(be, cq->func) < 0) > + return NULL; > /* only needed once */ > m->history = 2; > } > @@ -2383,7 +2402,8 @@ backend_dumpproc(backend *be, Client c, > } > } > > - backend_dumpstmt(be, mb, s); > + if (backend_dumpstmt(be, mb, s) < 0) > + return NULL; > Toptimize = GDKusec(); > Tparse = Toptimize - m->Tparse; > > @@ -2460,53 +2480,6 @@ backend_call(backend *be, Client c, cq * > } > } > > -void > -monet5_create_table_function(ptr M, char *name, sql_rel *rel, sql_table *t) > -{ > - sql_rel *r; > - mvc *m = (mvc*)M; > - Client c = MCgetClient(m->clientid); > - backend *be = (backend *) c->sqlcontext; > - MalBlkPtr curBlk = 0; > - InstrPtr curInstr = 0; > - Symbol backup = NULL; > - stmt *s; > - > - (void)t; > - r = rel_optimizer(m, rel); > - s = rel_bin(m, r); > - > - if (s->type == st_list && s->nrcols == 0 && s->key) { > - /* row to columns */ > - node *n; > - list *l = sa_list(m->sa); > - > - for(n=s->op4.lval->h; n; n = n->next) > - list_append(l, const_column(m->sa, n->data)); > - s = stmt_list(m->sa, l); > - } > - s = stmt_table(m->sa, s, 1); > - s = stmt_return(m->sa, s, 0); > - > - backup = c->curprg; > - c->curprg = newFunction(userRef,putName(name,strlen(name)), FUNCTIONsymbol); > - > - curBlk = c->curprg->def; > - curInstr = getInstrPtr(curBlk, 0); > - > - curInstr = table_func_create_result(curBlk, curInstr, t); > - setVarUDFtype(curBlk,0); > - > - /* no ops */ > - > - backend_dumpstmt(be, curBlk, s); > - /* SQL function definitions meant for inlineing should not be optimized before */ > - varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL); > - addQueryToCache(c); > - if (backup) > - c->curprg = backup; > -} > - > int > monet5_resolve_function(ptr M, sql_func *f) > { > @@ -2549,7 +2522,7 @@ monet5_resolve_function(ptr M, sql_func > } > > /* TODO handle aggr */ > -void > +static int > backend_create_func(backend *be, sql_func *f) > { > mvc *m = be->mvc; > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > http://mail.monetdb.org/mailman/listinfo/checkin-list >

9 years, 5 months

Re: MonetDB: Feb2013 - fixes and test added for bug 3230

by Stefan Manegold

Niels, could you please also check in the missing file sql/test/Users/privs2.sql Thanks! Stefan On Wed, Feb 13, 2013 at 04:00:35PM +0100, Niels Nes wrote: > Changeset: fffd420f1ee8 for MonetDB > URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fffd420f1ee8 > Added Files: > sql/test/Users/Tests/privs2.sql.src > sql/test/Users/Tests/privs2.stable.err > sql/test/Users/Tests/privs2.stable.out > sql/test/Users/Tests/test_privs2_p1.SQL.py > sql/test/Users/Tests/test_privs2_p1.stable.err > sql/test/Users/Tests/test_privs2_p1.stable.out > sql/test/Users/Tests/test_privs2_p2.SQL.py > sql/test/Users/Tests/test_privs2_p2.stable.err > sql/test/Users/Tests/test_privs2_p2.stable.out > Modified Files: > sql/backends/monet5/rel_bin.c > sql/backends/monet5/sql_gencode.c > sql/backends/monet5/sql_gencode.h > sql/backends/monet5/sql_scenario.c > sql/common/sql_backend.c > sql/common/sql_backend.h > sql/test/Users/Tests/All > Branch: Feb2013 > Log Message: > > fixes and test added for bug 3230 > > > diffs (truncated from 901 to 300 lines): > > diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c > --- a/sql/backends/monet5/rel_bin.c > +++ b/sql/backends/monet5/rel_bin.c > @@ -1124,8 +1124,6 @@ rel_parse_value(mvc *m, char *query, cha > m->argc = 0; > m->sym = NULL; > m->errstr[0] = '\0'; > - /* via views we give access to protected objects */ > - m->user_id = USER_MONETDB; > > (void) sqlparse(m); /* blindly ignore errors */ > > @@ -2741,8 +2739,6 @@ sql_parse(mvc *m, sql_allocator *sa, cha > m->sym = NULL; > m->errstr[0] = '\0'; > m->errstr[ERRSIZE-1] = '\0'; > - /* via views we give access to protected objects */ > - m->user_id = USER_MONETDB; > > /* create private allocator */ > m->sa = (sa)?sa:sa_create(); > diff --git a/sql/backends/monet5/sql_gencode.c b/sql/backends/monet5/sql_gencode.c > --- a/sql/backends/monet5/sql_gencode.c > +++ b/sql/backends/monet5/sql_gencode.c > @@ -54,7 +54,8 @@ > #include <rel_bin.h> > > static int _dumpstmt(backend *sql, MalBlkPtr mb, stmt *s); > -static void backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s); > +static int backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s); > +static int backend_create_func(backend *be, sql_func *f); > > /* > * @+ MAL code support > @@ -261,7 +262,7 @@ relational_func_create_result( mvc *sql, > } > > > -static void > +static int > _create_relational_function(mvc *m, char *name, sql_rel *rel, stmt *call) > { > sql_rel *r; > @@ -314,16 +315,18 @@ _create_relational_function(mvc *m, char > } > } > > - backend_dumpstmt(be, curBlk, s); > + if (backend_dumpstmt(be, curBlk, s) < 0) > + return -1; > /* SQL function definitions meant for inlineing should not be optimized before */ > varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL); > addQueryToCache(c); > if (backup) > c->curprg = backup; > + return 0; > } > > /* stub and remote function */ > -static void > +static int > _create_relational_remote(mvc *m, char *name, sql_rel *rel, stmt *call, prop *prp) > { > Client c = MCgetClient(m->clientid); > @@ -346,7 +349,8 @@ _create_relational_remote(mvc *m, char * > /* dirty hack, rename (change first char of name) L->l, local > * functions name start with 'l' */ > name[0] = 'l'; > - _create_relational_function(m, name, rel, call); > + if (_create_relational_function(m, name, rel, call) < 0) > + return -1; > > /* create stub */ > name[0] = old; > @@ -462,18 +466,19 @@ _create_relational_remote(mvc *m, char * > if (backup) > c->curprg = backup; > name[0] = old; /* make sure stub is called */ > + return 0; > } > > -static void > +static int > monet5_create_relational_function(mvc *m, char *name, sql_rel *rel, stmt *call) > > { > prop *p = NULL; > > if (rel && (p = find_prop(rel->p, PROP_REMOTE)) != NULL) > - _create_relational_remote(m, name, rel, call, p); > + return _create_relational_remote(m, name, rel, call, p); > else > - _create_relational_function(m, name, rel, call); > + return _create_relational_function(m, name, rel, call); > } > > /* > @@ -663,7 +668,8 @@ dump_joinN(backend *sql, MalBlkPtr mb, s > InstrPtr q; > int op1, op2, op3 = 0; > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > > @@ -1121,7 +1127,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > node *n; > char *mod, *fimp; > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > > @@ -1632,7 +1639,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > char *mod, *fimp; > int l = _dumpstmt(sql, mb, s->op1); > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > if (s->op1->nrcols && strcmp(fimp, "not_uniques") == 0) { > @@ -1666,7 +1674,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > int l = _dumpstmt(sql, mb, s->op1); > int r = _dumpstmt(sql, mb, s->op2); > > - backend_create_func(sql, s->op4.funcval->func); > + if (backend_create_func(sql, s->op4.funcval->func) < 0) > + return -1; > mod = sql_func_mod(s->op4.funcval->func); > fimp = sql_func_imp(s->op4.funcval->func); > > @@ -1713,7 +1722,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > /* dump operands */ > _dumpstmt(sql, mb, s->op1); > > - backend_create_func(sql, f->func); > + if (backend_create_func(sql, f->func) < 0) > + return -1; > mod = sql_func_mod(f->func); > fimp = sql_func_imp(f->func); > if (s->nrcols) { > @@ -1769,7 +1779,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > /* dump args */ > if (s->op1) > _dumpstmt(sql, mb, s->op1); > - monet5_create_relational_function(sql->mvc, fimp, rel, s); > + if (monet5_create_relational_function(sql->mvc, fimp, rel, s) < 0) > + return -1; > > q = newStmt(mb, mod, fimp); > q = relational_func_create_result(sql->mvc, mb, q, rel); > @@ -1791,7 +1802,8 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st > int restype = s->op4.aggrval->res.type->localtype; > int sum_or_prod = 0; > > - backend_create_func(sql, s->op4.aggrval->aggr); > + if (backend_create_func(sql, s->op4.aggrval->aggr) < 0) > + return -1; > mod = s->op4.aggrval->aggr->mod; > aggrfunc = s->op4.aggrval->aggr->imp; > > @@ -2241,7 +2253,8 @@ static void setCommitProperty(MalBlkPtr > varSetProperty(mb, getArg(getInstrPtr(mb,0),0), "autoCommit","=", &cst); > } > > -static void backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s) > +static int > +backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s) > { > mvc *c = be->mvc; > stmt **stmts = stmt_array(c->sa, s); > @@ -2258,9 +2271,11 @@ static void backend_dumpstmt(backend *be > clear_stmts(stmts); > while(stmts[nr]) { > stmt *s = stmts[nr++]; > - (void)_dumpstmt(be, mb, s); > + if (_dumpstmt(be, mb, s) < 0) > + return -1; > } > - (void)_dumpstmt(be, mb, s); > + if (_dumpstmt(be, mb, s) < 0) > + return -1; > > be->mvc_var = old_mv; > if (c->caching && (c->type == Q_SCHEMA || c->type == Q_TRANS)) { > @@ -2275,9 +2290,10 @@ static void backend_dumpstmt(backend *be > q->barrier = RETURNsymbol; > } > pushEndInstruction(mb); > + return 0; > } > > -void > +int > backend_callinline(backend *be, Client c, stmt *s ) > { > mvc *m = be->mvc; > @@ -2311,8 +2327,10 @@ backend_callinline(backend *be, Client c > } > } > } > - backend_dumpstmt(be, curBlk, s); > + if (backend_dumpstmt(be, curBlk, s) < 0) > + return -1; > c->curprg->def = curBlk; > + return 0; > } > > Symbol > @@ -2335,8 +2353,9 @@ backend_dumpproc(backend *be, Client c, > sql_subfunc *cq = sql_find_func(m->sa, sys, "keepcall", NR_KEEPCALL_ARGS, F_PROC); > > assert(kq && cq); > - backend_create_func(be, kq->func); > - backend_create_func(be, cq->func); > + if (backend_create_func(be, kq->func) < 0 || > + backend_create_func(be, cq->func) < 0) > + return NULL; > /* only needed once */ > m->history = 2; > } > @@ -2382,7 +2401,8 @@ backend_dumpproc(backend *be, Client c, > } > } > > - backend_dumpstmt(be, mb, s); > + if (backend_dumpstmt(be, mb, s) < 0) > + return NULL; > Toptimize = GDKusec(); > Tparse = Toptimize - m->Tparse; > > @@ -2459,53 +2479,6 @@ backend_call(backend *be, Client c, cq * > } > } > > -void > -monet5_create_table_function(ptr M, char *name, sql_rel *rel, sql_table *t) > -{ > - sql_rel *r; > - mvc *m = (mvc*)M; > - Client c = MCgetClient(m->clientid); > - backend *be = (backend *) c->sqlcontext; > - MalBlkPtr curBlk = 0; > - InstrPtr curInstr = 0; > - Symbol backup = NULL; > - stmt *s; > - > - (void)t; > - r = rel_optimizer(m, rel); > - s = rel_bin(m, r); > - > - if (s->type == st_list && s->nrcols == 0 && s->key) { > - /* row to columns */ > - node *n; > - list *l = sa_list(m->sa); > - > - for(n=s->op4.lval->h; n; n = n->next) > - list_append(l, const_column(m->sa, n->data)); > - s = stmt_list(m->sa, l); > - } > - s = stmt_table(m->sa, s, 1); > - s = stmt_return(m->sa, s, 0); > - > - backup = c->curprg; > - c->curprg = newFunction(userRef,putName(name,strlen(name)), FUNCTIONsymbol); > - > - curBlk = c->curprg->def; > - curInstr = getInstrPtr(curBlk, 0); > - > - curInstr = table_func_create_result(curBlk, curInstr, t); > - setVarUDFtype(curBlk,0); > - > - /* no ops */ > - > - backend_dumpstmt(be, curBlk, s); > - /* SQL function definitions meant for inlineing should not be optimized before */ > - varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL); > - addQueryToCache(c); > - if (backup) > - c->curprg = backup; > -} > - > int > monet5_resolve_function(ptr M, sql_func *f) > { > @@ -2548,7 +2521,7 @@ monet5_resolve_function(ptr M, sql_func > } > > /* TODO handle aggr */ > -void > +static int > backend_create_func(backend *be, sql_func *f) > { > mvc *m = be->mvc; > _______________________________________________ > checkin-list mailing list > checkin-list(a)monetdb.org > http://mail.monetdb.org/mailman/listinfo/checkin-list -- | Stefan.Manegold(a)CWI.nl | DB Architectures (DA) | | www.CWI.nl/~manegold | Science Park 123 (L321) | | +31 (0)20 592-4212 | 1098 XG Amsterdam (NL) |

9 years, 5 months

Coercions optimizer name bug

by Pete Hollobon

Hi, The name of the coercions optimizer in the codes array in opt_wrapper.c is wrong (currently it's "coercion"), and so it is never run. This patch fixes: diff -r 6e9b305e92e2 monetdb5/optimizer/opt_wrapper.c --- a/monetdb5/optimizer/opt_wrapper.c Sun Feb 10 17:39:23 2013 +0100 +++ b/monetdb5/optimizer/opt_wrapper.c Tue Feb 12 11:33:20 2013 +0000 @@ -84,7 +84,7 @@ {"aliases", &OPTaliasesImplementation}, {"centipede", &OPTcentipedeImplementation}, {"cluster", &OPTclusterImplementation}, - {"coercion", &OPTcoercionImplementation}, + {"coercions", &OPTcoercionImplementation}, {"commonTerms", &OPTcommonTermsImplementation}, {"compression", &OPTcompressionImplementation}, {"costModel", &OPTcostModelImplementation}, Regards, Pete

9 years, 5 months

No mclient prompt. Connection hangs.

by Tapomay Dey

I have started facing issues when trying to connect to the DB using mclient remotely/locally. All my services have started failing as the DB is no longer responding(using JDBC). There is hardly any load on the DB - no memory/cpu usage. Although the monetdb status shows a health of only 47%(What does this mean?) When I do a sockstat on the merovingian I can see the client's socket. But when I sockstat on the mserver5 process I don't see that. (FYI- when I am able to connect using mclient I see this socket in mserver's sockstat instead of monetdbd) I do get the mclient prompt sometimes with full functionality. But most of the times it just gets stuck and the prompt never occurs. Any more diagnostics that I can perform to resolve this? When I ctrl+c on the mclient the mclient process stops but socket stays in ESTABLISHED state on server. Verified it by comparign port no. before and after killing mclient and making sure no one else is connected. Regards, Tapomay.

9 years, 5 months

Python API's: sql.Binary() fix

by Mate Birkas

Hi, I may have found a bug in sql.Binary(). Here is the patch: --- pythonize.py 2013-02-03 15:22:09.217186598 +0100 +++ pythonize.py.fix 2013-02-03 15:23:34.613187703 +0100 @@ -119,7 +119,7 @@ def Binary(data): """returns binary encoding of data""" - return ''.join([hex(ord(i))[2:] for i in data]).upper() + return ''.join(["%02X" % ord(i) for i in data]) def DateFromTicks(ticks): """Convert ticks to python Date""" The hex() built-in returns three character string for integers lower than 15. This combined with the original code's [2:] results in corrupt string representations of binary objects having bytes with these values. cheers Mate

9 years, 5 months

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

developers-list February 2013