Changeset: b1b504c51b9b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b1b504c51b9b
Modified Files:
monetdb5/mal/mal_session.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pushselect.c
Branch: default
Log Message:
Some identation fixes
diffs (98 lines):
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -480,7 +480,7 @@ MSresetVariables(MalBlkPtr mb)
int i;
if (mb->errors == MAL_SUCCEED)
- for (i = sig->argc; i < mb->vtop; i++)
+ for (i = sig->argc; i < mb->vtop; i++)
if( isVarConstant(mb,i)){
VALclear(&getVarConstant(mb,i));
clrVarConstant(mb, i);
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -588,7 +588,7 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl
getArg(s,0) = newTmpVariable(mb, getArgType(mb,
mat[n].mi, k));
- ttpe = getArgType(mb, mat[n].mi, 0);
+ ttpe = getArgType(mb, mat[n].mi, 0);
for (j=1; j<mat[n].mi->argc; j++) {
int ov = 0;
if (getBatType(ttpe) != TYPE_oid || (ov =
overlap(ml, getArg(mat[m].mi, k), getArg(mat[n].mi, j), k, j, 1)) == 1){
diff --git a/monetdb5/optimizer/opt_pushselect.c
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -412,8 +412,8 @@ OPTpushselectImplementation(Client cntxt
/* make sure to resolve again */
p->token = ASSIGNsymbol;
p->typechk = TYPE_UNKNOWN;
- p->fcn = NULL;
- p->blk = NULL;
+ p->fcn = NULL;
+ p->blk = NULL;
actions++;
}
} else if ( (GDKdebug & (1<<15)) && isMatJoinOp(p) &&
p->retc == 2) {
@@ -441,8 +441,8 @@ OPTpushselectImplementation(Client cntxt
/* make sure to resolve again */
p->token = ASSIGNsymbol;
p->typechk = TYPE_UNKNOWN;
- p->fcn = NULL;
- p->blk = NULL;
+ p->fcn = NULL;
+ p->blk = NULL;
actions++;
}
}
@@ -576,7 +576,7 @@ OPTpushselectImplementation(Client cntxt
/* slice the candidates */
setFunctionId(r, sliceRef);
nvars[getArg(p,0)] = getArg(r, 0) =
- newTmpVariable(mb, getArgType(mb, r,
0));
+ newTmpVariable(mb, getArgType(mb, r, 0));
slices[getArg(q, 1)] = getArg(p, 0);
setVarCList(mb,getArg(r,0));
@@ -584,7 +584,7 @@ OPTpushselectImplementation(Client cntxt
pushInstruction(mb,r);
nvars[getArg(q,0)] = getArg(s, 0) =
- newTmpVariable(mb, getArgType(mb, s,
0));
+ newTmpVariable(mb, getArgType(mb, s, 0));
getArg(s, 1) = getArg(r, 0); /* use result of
slice */
pushInstruction(mb, s);
oclean[i] = 1;
@@ -627,7 +627,7 @@ OPTpushselectImplementation(Client cntxt
getArg(t, 1) = nvars[getArg(r,
0)]; /* use result of slice */
rslices[col] = 1;
nvars[getArg(s,0)] = getArg(t,
0) =
-
newTmpVariable(mb, getArgType(mb, t, 0));
+ newTmpVariable(mb,
getArgType(mb, t, 0));
pushInstruction(mb, t);
if (u) { /* add again */
if((t =
copyInstruction(u)) == NULL) {
@@ -751,8 +751,8 @@ OPTpushselectImplementation(Client cntxt
/* make sure to resolve again */
s->token = ASSIGNsymbol;
s->typechk = TYPE_UNKNOWN;
- s->fcn = NULL;
- s->blk = NULL;
+ s->fcn = NULL;
+ s->blk = NULL;
pushInstruction(mb,s);
setFunctionId(u, subdeltaRef);
@@ -763,8 +763,8 @@ OPTpushselectImplementation(Client cntxt
u = pushArgument(mb, u, getArg(s,0)); /*
selected updated values ids */
u->token = ASSIGNsymbol;
u->typechk = TYPE_UNKNOWN;
- u->fcn = NULL;
- u->blk = NULL;
+ u->fcn = NULL;
+ u->blk = NULL;
pushInstruction(mb,u);
oclean[i] = 1;
continue;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
