Changeset: 81306d7b5868 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81306d7b5868
Modified Files:
monetdb5/mal/mal_dataflow.c
monetdb5/optimizer/opt_evaluate.c
Branch: default
Log Message:
opt_evaluate.c: reduce white-space differences between Feb2013 & default
diffs (38 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
@@ -114,7 +114,6 @@ q_create(int sz, const char *name)
{
Queue *q = (Queue*)GDKmalloc(sizeof(Queue));
- (void) name;
if (q == NULL)
return NULL;
q->size = ((sz << 1) >> 1); /* we want a multiple of 2 */
diff --git a/monetdb5/optimizer/opt_evaluate.c
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -99,8 +99,8 @@ OPTremoveUnusedBlocks(Client cntxt, MalB
top--;
freeInstruction(p);
continue;
- }
- if (skip )
+ }
+ if (skip)
freeInstruction(p);
else
mb->stmt[j++] = p;
@@ -229,10 +229,10 @@ OPTevaluateImplementation(Client cntxt,
mb->errors = 0;
}
}
+ //constantblock += p->barrier > 0 && OPTallConstant(cntxt, mb,
p); /* Feb2013 */
constantblock += blockStart(p) && OPTallConstant(cntxt, mb,
p); /* default */
- //constantblock += p->barrier > 0 && OPTallConstant(cntxt, mb,
p); /* Feb2013 */
}
- if ( constantblock )
+ if ( constantblock)
actions += OPTremoveUnusedBlocks(cntxt, mb);
GDKfree(assigned);
GDKfree(alias);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
