MonetDB: Oct2014 - Don't increment anything for non-BAT arguments.

[Sjoerd Mullender]

Changeset: e9bf84f4aa1f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9bf84f4aa1f
Modified Files:
        monetdb5/modules/mal/manifold.c
Branch: Oct2014
Log Message:

Don't increment anything for non-BAT arguments.


diffs (21 lines):

diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -114,7 +114,8 @@ default:\
                        if(ATOMstorage(mut->args[i].type == TYPE_void) ){       
\
                                args[i] = (void*)  &mut->args[i].o;      \
                                mut->args[i].o++;               \
-                       } else if(ATOMstorage(mut->args[i].type) < TYPE_str){   
\
+                       } else if(mut->args[i].size == 0 || \
+                                         ATOMstorage(mut->args[i].type) < 
TYPE_str){   \
                                args[i] += mut->args[i].size;   \
                        } else if(ATOMvarsized(mut->args[i].type)){     \
                                mut->args[i].o++;               \
@@ -298,6 +299,7 @@ MANIFOLDevaluate(Client cntxt, MalBlkPtr
                        mat[i].q = BUNlast(mat[i].b);
                } else {
                        mat[i].last = mat[i].first = (void *) 
getArgReference(stk,pci,i);
+                       mat[i].type = getArgType(mb, pci, i);
                }
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list