Changeset: e0b172161f54 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0b172161f54 Modified Files: sql/src/backends/monet5/sql.mx sql/src/backends/monet5/sql_gencode.mx sql/src/backends/monet5/sql_scenario.mx sql/src/server/rel_optimizer.c sql/src/server/rel_schema.c sql/src/server/rel_select.c sql/src/storage/store.c Branch: default Log Message:
Merge with Oct2010 branch. diffs (truncated from 343 to 300 lines): diff -r 9565b26b0d1c -r e0b172161f54 sql/src/backends/monet5/sql.mx --- a/sql/src/backends/monet5/sql.mx Wed Jan 05 10:08:17 2011 +0100 +++ b/sql/src/backends/monet5/sql.mx Wed Jan 05 10:47:30 2011 +0100 @@ -5352,7 +5352,7 @@ /* actually build the hash on the multi-column primary key */ - for (o = t->columns.set->h; o; o = o->next) { + for (o = t->columns.set->h; msg == MAL_SUCCEED && o; o = o->next) { BAT *b, *e; sql_delta *d; sql_column *c = o->data; @@ -5377,7 +5377,7 @@ t->cleared = 1; t->base.wtime = s->base.wtime = tr->wtime = tr->stime; t->base.rtime = s->base.rtime = tr->rtime = tr->stime; - return MAL_SUCCEED; + return msg; @c str SQLnewDictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){ @:compression(DICTcompress(&ret, &nme, &b->batCacheid))@ @@ -5410,7 +5410,7 @@ /* actually build the hash on the multi-column primary key */ - for (o = t->columns.set->h; o; o = o->next) { + for (o = t->columns.set->h; msg == MAL_SUCCEED && o; o = o->next) { BAT *b; sql_column *c = o->data; @@ -5423,7 +5423,7 @@ BBPreleaseref(b->batCacheid); } } - return MAL_SUCCEED; + return msg; @c str SQLgzcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){ @:gzcompression(CMDbbpcompress(&ret, &b->batCacheid,&sbuf),gzcompress)@ diff -r 9565b26b0d1c -r e0b172161f54 sql/src/backends/monet5/sql_gencode.mx --- a/sql/src/backends/monet5/sql_gencode.mx Wed Jan 05 10:08:17 2011 +0100 +++ b/sql/src/backends/monet5/sql_gencode.mx Wed Jan 05 10:47:30 2011 +0100 @@ -169,7 +169,7 @@ q = pushStr(mb, q, t->type->sqlname); q = pushInt(mb, q, t->digits); q = pushInt(mb, q, t->scale); - q = pushArgument(mb, q, c->nr); + (void) pushArgument(mb, q, c->nr); _DELETE(ntn); _DELETE(nsn); } @@ -183,7 +183,7 @@ InstrPtr k = newStmt1(mb, sqlRef, "declaredTable"); nr = getDestVar(k); - k = pushStr(mb, k, t->base.name ); + (void) pushStr(mb, k, t->base.name ); for (n = t->columns.set->h; n; n = n->next) { sql_column *c = n->data; char *tname = c->t->base.name; @@ -196,7 +196,7 @@ q = pushStr(mb, q, cn); q = pushStr(mb, q, c->type.type->sqlname); q = pushInt(mb, q, c->type.digits); - q = pushInt(mb, q, c->type.scale); + (void) pushInt(mb, q, c->type.scale); _DELETE(tn); } return nr; @@ -208,7 +208,7 @@ InstrPtr k = newStmt1(mb, sqlRef, "dropDeclaredTable"); int nr = getDestVar(k); - k = pushStr(mb, k, n); + (void) pushStr(mb, k, n); return nr; } @@ -537,7 +537,7 @@ setVarType(mb, getArg(q, 0), TYPE_int); if (list_length(l) == 2) { - q = pushStr(mb, q, (char *) n->next->data); + (void) pushStr(mb, q, (char *) n->next->data); } } @@ -567,7 +567,7 @@ case st_none: { q = newAssignment(mb); s->nr = getDestVar(q); - q = pushInt(mb, q, 1); + (void) pushInt(mb, q, 1); } break; case st_connection: { if (list_length(s->op4.lval) < 3) @@ -746,7 +746,7 @@ q = newStmt2(mb, batRef, appendRef); q = pushArgument(mb, q, k); - q = pushArgument(mb, q, l); + (void) pushArgument(mb, q, l); l = k; } if (s->flag) { @@ -1247,7 +1247,7 @@ snprintf(nme, SMALLBUFSIZ, "grp%d", getDestVar(q)); q = pushReturn(mb, q, newVariable(mb, nme, TYPE_any)); grp = getArg(q, 1); - q = pushArgument(mb, q, o1); + (void) pushArgument(mb, q, o1); q = newAssignment(mb); q = pushArgument(mb, q, grp); @@ -1285,7 +1285,7 @@ (void) snprintf(buf, SMALLBUFSIZ, "ext%d", g); q = pushArgumentId(mb, q, buf); q = pushArgument(mb, q, g); - q = pushArgument(mb, q, l); + (void) pushArgument(mb, q, l); q = newAssignment(mb); q = pushArgument(mb, q, grp); @@ -1311,7 +1311,7 @@ (void) snprintf(buf, SMALLBUFSIZ, "ext%d", g); q = pushArgumentId(mb, q, buf); q = pushArgument(mb, q, g); - q = pushArgument(mb, q, l); + (void) pushArgument(mb, q, l); q = newStmt2(mb, batRef, mirrorRef); q = pushArgument(mb, q, e); @@ -1805,7 +1805,7 @@ q = pushInt(mb, q, t->scale); q = pushInt(mb, q, t->type->eclass); q = pushArgument(mb, q, c->nr); - q = pushStr(mb, q, ""); /* warning */ + (void) pushStr(mb, q, ""); /* warning */ _DELETE(ntn); _DELETE(nsn); break; @@ -1832,7 +1832,7 @@ } else { k = pushInt(mb, k, sql->mvc->type); } - k = pushArgument(mb, k, order->nr); + (void) pushArgument(mb, k, order->nr); dump_header(sql->mvc, mb, s, l); if (s->type == st_export && s->op2) { @@ -1873,14 +1873,14 @@ */ q = newStmt2(mb, sqlRef, exportResultRef); q = pushArgument(mb, q, file); - q = pushArgument(mb, q, s->nr); + (void) pushArgument(mb, q, s->nr); if (s->type == st_export && s->op2) { q = newStmt(mb, "streams", "close"); - q = pushArgument(mb, q, file); + (void) pushArgument(mb, q, file); } } else { q = newStmt1(mb, sqlRef, "print"); - q = pushStr(mb, q, "not a valid output list\n"); + (void) pushStr(mb, q, "not a valid output list\n"); s->nr = 1; } } @@ -1897,11 +1897,11 @@ q = newStmt1(mb, batRef, "new"); s->nr = getDestVar(q); q = pushType(mb, q, TYPE_str); - q = pushType(mb, q, TYPE_bat); + (void) pushType(mb, q, TYPE_bat); s->nr = dump_cols(sql->mvc, mb, l, s->nr); } else { q = newStmt1(mb, sqlRef, "print"); - q = pushStr(mb, q, "not a valid output list\n"); + (void) pushStr(mb, q, "not a valid output list\n"); s->nr = 1; } } @@ -1940,7 +1940,7 @@ getArg(q,0) = c; q->argc = q->retc = 1; q->barrier = REDOsymbol; - q = pushBit(mb, q, TRUE); + (void) pushBit(mb, q, TRUE); } else { q = newAssignment(mb); getArg(q,0) = c; @@ -1956,7 +1956,7 @@ if (s->flag) { /* drop declared tables */ InstrPtr k = newStmt1(mb, sqlRef, "dropDeclaredTables"); - k = pushInt(mb, k, s->flag); + (void) pushInt(mb, k, s->flag); } q = newInstruction(mb,RETURNsymbol); getArg(q,0) = getArg(getInstrPtr(mb,0),0); @@ -1991,7 +1991,7 @@ q = pushArgument(mb, q, vn); s->nr = 1; } - q = pushArgument(mb, q, r); + (void) pushArgument(mb, q, r); } break; /* todo */ @@ -2052,7 +2052,7 @@ be->mvc_var = old_mv; if (c->caching && (c->type == Q_SCHEMA || c->type == Q_TRANS)) { q = newStmt2(mb, sqlRef, exportOperationRef); - q = pushStr(mb, q, ""); /* warning */ + (void) pushStr(mb, q, ""); /* warning */ } /* generate a dummy return assignment for functions */ if (getArgType(mb,getInstrPtr(mb,0),0) != TYPE_void && @@ -2091,10 +2091,10 @@ if (atom_null(a)) { sql_subtype *t = atom_type(a); - curInstr = pushNil(curBlk, curInstr, t->type->localtype); + (void) pushNil(curBlk, curInstr, t->type->localtype); } else { int _t = constantAtom(be, curBlk, a); - curInstr = pushArgument(curBlk, curInstr, _t); + (void) pushArgument(curBlk, curInstr, _t); } } } @@ -2196,7 +2196,7 @@ q = pushWrd(mb, q, queryid); q = pushStr(mb, q, t); q = pushLng(mb, q, m->Tparse ); - q = pushLng(mb, q, Toptimize); + (void) pushLng(mb, q, Toptimize); m->Tparse = 0; } if (cq) diff -r 9565b26b0d1c -r e0b172161f54 sql/src/backends/monet5/sql_scenario.mx --- a/sql/src/backends/monet5/sql_scenario.mx Wed Jan 05 10:08:17 2011 +0100 +++ b/sql/src/backends/monet5/sql_scenario.mx Wed Jan 05 10:47:30 2011 +0100 @@ -1056,13 +1056,13 @@ if (onoff){ if ( strstr(def,"keep") == 0) - q = newStmt(mb,"profiler","reset"); + (void) newStmt(mb,"profiler","reset"); q = newStmt(mb,"profiler","setFilter"); q = pushStr(mb,q, "*"); q = pushStr(mb,q, "*"); - q = newStmt(mb,"profiler","start"); + (void) newStmt(mb,"profiler","start"); } else if (def && strstr(def, "show")) { - q = newStmt(mb, "profiler", "stop"); + (void) newStmt(mb, "profiler", "stop"); do { s = t; @@ -1128,14 +1128,14 @@ q = pushInt(mb, q, 32); } q = pushInt(mb, q, 0); - q = pushArgument(mb, q, rs[j]); + (void) pushArgument(mb, q, rs[j]); } q = newStmt(mb, ioRef, "stdout"); n = getDestVar(q); q = newStmt(mb, sqlRef, "exportResult"); q = pushArgument(mb, q, n); - q = pushArgument(mb, q, r); + (void) pushArgument(mb, q, r); } } GDKfree(def); diff -r 9565b26b0d1c -r e0b172161f54 sql/src/server/rel_optimizer.c --- a/sql/src/server/rel_optimizer.c Wed Jan 05 10:08:17 2011 +0100 +++ b/sql/src/server/rel_optimizer.c Wed Jan 05 10:47:30 2011 +0100 @@ -74,7 +74,7 @@ } case op_table: if (rel->exps) - alias = exps_bind_column(rel->exps, name, NULL); + (void) exps_bind_column(rel->exps, name, NULL); /* table func */ return NULL; case op_join: diff -r 9565b26b0d1c -r e0b172161f54 sql/src/server/rel_schema.c --- a/sql/src/server/rel_schema.c Wed Jan 05 10:08:17 2011 +0100 +++ b/sql/src/server/rel_schema.c Wed Jan 05 10:47:30 2011 +0100 @@ -830,7 +830,7 @@ if (s == NULL) s = cur_schema(sql); - if (create && (t = mvc_bind_table(sql, s, name)) != NULL) { + if (create && mvc_bind_table(sql, s, name) != NULL) { return sql_error(sql, 02, "CREATE VIEW: name '%s' already in use", name); } else if (create && !schema_privs(sql->role_id, s)) { _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list