Changeset: 145b59486a5e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/145b59486a5e
Modified Files:
monetdb5/mal/mal_instruction.c
Branch: no_type_bat
Log Message:
fndConstants needs to check also on bat / isabat when matching constants.
diffs (16 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
@@ -872,8 +872,10 @@ fndConstant(MalBlkPtr mb, const ValRecor
for (i = k; i < mb->vtop - 1; i++) {
VarPtr v = getVar(mb, i);
if (v->constant) {
- if (v && v->type == cst->vtype && v->value.len ==
cst->len
- && ATOMcmp(cst->vtype, VALptr(&v->value), p) ==
0)
+ if (v && v->type == cst->vtype &&
+ v->value.len == cst->len &&
+ isaBatType(v->type) == cst->bat &&
+ ATOMcmp(cst->vtype, VALptr(&v->value),
p) == 0)
return i;
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
