MonetDB: jacqueline - ALGproject{head,tail}_*: cosmetics

[Fabian Groffen]

Changeset: b8bf915a68b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8bf915a68b7
Modified Files:
        monetdb5/extras/jaql/Tests/func01.mal
        monetdb5/modules/kernel/algebra.mx
Branch: jacqueline
Log Message:

ALGproject{head,tail}_*: cosmetics

no code change, just to make it slightly more readable


diffs (32 lines):

diff --git a/monetdb5/extras/jaql/Tests/func01.mal 
b/monetdb5/extras/jaql/Tests/func01.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/Tests/func01.mal
@@ -0,0 +1,4 @@
+# test of groupable functions
+jaql.x("[1,2,3] -> sum();");
+jaql.x("sum([1.2,2.4,3.6]);");
+jaql.x("count([1.2,5,3.6,8,\"bla\"]);");
diff --git a/monetdb5/modules/kernel/algebra.mx 
b/monetdb5/modules/kernel/algebra.mx
--- a/monetdb5/modules/kernel/algebra.mx
+++ b/monetdb5/modules/kernel/algebra.mx
@@ -3711,7 +3711,8 @@ str ALGprojecthead_@1(int *ret,ptr *val,
        bn->T->nonil = b->T->nonil;
 bunins_failed:
        BATaccessEnd(b,USE_TAIL,MMAP_SEQUENTIAL);
-       if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); \
+       if (!(bn->batDirty&2))
+               bn = BATsetaccess(bn, BAT_READ);
        *ret= bn->batCacheid;
        BBPkeepref(bn->batCacheid);
        BBPreleaseref(b->batCacheid);
@@ -3736,7 +3737,8 @@ str ALGprojecttail_@1(int *ret,int *bid,
        bn->T->nonil = (ATOMcmp(bn->ttype, val, ATOMnilptr(bn->ttype))); 
 bunins_failed:
        BATaccessEnd(b,USE_HEAD,MMAP_SEQUENTIAL);
-       if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); \
+       if (!(bn->batDirty&2))
+               bn = BATsetaccess(bn, BAT_READ);
        *ret= bn->batCacheid;
        BBPkeepref(bn->batCacheid);
        BBPreleaseref(b->batCacheid);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list