Changeset: 26f9ce7dbaa4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/26f9ce7dbaa4
Modified Files:
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
Branch: default
Log Message:
fndConstant is preparing work for the constant optimizer,
which in tuen is needed only for the commonterms to work faster.
These tasks should be better aligned.
For now, a reduced overhead in the preparation phase.
diffs (24 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
@@ -1100,7 +1100,7 @@ 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 && ATOMcmp(cst->vtype,
VALptr(&v->value), p) == 0)
+ if (v && v->type == cst->vtype && v->value.len ==
cst->len && ATOMcmp(cst->vtype, VALptr(&v->value), p) == 0)
return i;
}
}
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -22,7 +22,7 @@
#define DEBUG_MAL_INSTR
#define MAXARG 8 /* was 4 BEWARE the code
depends on this knowledge, where? */
#define STMT_INCREMENT 4
-#define MAL_VAR_WINDOW 32
+#define MAL_VAR_WINDOW 16 // was 32
#define MAXLISTING (64*1024)
/* Allocation of space assumes a rather exotic number of
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
