Changeset: 9e58006fde91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e58006fde91
Modified Files:
monetdb5/mal/mal_instruction.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:
cleanup
diffs (70 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -32,7 +32,7 @@ newSymbol(str nme, int kind)
cur->kind = kind;
cur->peer = NULL;
cur->def = newMalBlk(kind == FUNCTIONsymbol?MAXVARS : MAXARG, kind ==
FUNCTIONsymbol? STMT_INCREMENT : 2);
- if ( cur->def == NULL){
+ if (cur->def == NULL){
GDKfree(cur);
return NULL;
}
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -272,7 +272,7 @@ SQLrun(Client c, backend *be, mvc *m){
// locate and inline the query template instruction
mb = copyMalBlk(c->curprg->def);
mb->history = c->curprg->def->history;
- c->curprg->def->history =0;
+ c->curprg->def->history = 0;
/* only consider a re-optimization when we are dealing with query
templates */
for ( i= 1; i < mb->stop;i++){
@@ -283,10 +283,10 @@ SQLrun(Client c, backend *be, mvc *m){
return msg;
}
if( getFunctionId(p) && p->blk &&
qc_isaquerytemplate(getFunctionId(p)) ) {
- mc= copyMalBlk(p->blk);
- retc =p->retc;
+ mc = copyMalBlk(p->blk);
+ retc = p->retc;
freeMalBlk(mb);
- mb= mc;
+ mb = mc;
// declare the argument values as a constant
// We use the knowledge that the arguments are first on
the stack
for (j = 0; j < m->argc; j++) {
@@ -321,16 +321,16 @@ SQLrun(Client c, backend *be, mvc *m){
if (m->emod & mod_explain) {
if (c->curprg->def)
printFunction(c->fdout, mb, 0, LIST_MAL_NAME |
LIST_MAL_VALUE | LIST_MAL_MAPI);
- } else
- if( m->emod & mod_debug)
+ } else if( m->emod & mod_debug) {
msg = runMALDebugger(c, mb);
- else{
+ } else {
if( m->emod & mod_trace){
SQLsetTrace(c,mb);
msg = runMAL(c, mb, 0, 0);
stopTrace(0);
- } else
+ } else {
msg = runMAL(c, mb, 0, 0);
+ }
}
// release the resources
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
@@ -913,7 +913,6 @@ cleanup:
if (backup)
c->curprg = backup;
return -1;
-
}
/* TODO handle aggr */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
