Changeset: 1782edab2910 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1782edab2910
Modified Files:
sql/backends/monet5/rel_pphash.c
sql/backends/monet5/sql_pp_statement.c
Branch: default
Log Message:
make sure we initialize the matches with nils (such that none used gid's aren't
part of the results)
diffs (27 lines):
diff --git a/sql/backends/monet5/rel_pphash.c b/sql/backends/monet5/rel_pphash.c
--- a/sql/backends/monet5/rel_pphash.c
+++ b/sql/backends/monet5/rel_pphash.c
@@ -457,8 +457,8 @@ rel2bin_oahash_build(backend *be, sql_re
}
if (!need_nulls && anti_join) {
/* mark used gid's */
- stmt *one = stmt_const(be, prnt, stmt_bool(be, 0));
- matched = stmt_algebra_project(be, matched, prnt, one,
projectionRef);
+ stmt *zero = stmt_const(be, prnt, stmt_bool(be, 0));
+ (void)stmt_mark_nulls(be, matched, zero, prnt); /* needed to
initialize with nils */
rel->oahash = 0; /* no nulls, pass down */
}
if (matched && nulls) {
diff --git a/sql/backends/monet5/sql_pp_statement.c
b/sql/backends/monet5/sql_pp_statement.c
--- a/sql/backends/monet5/sql_pp_statement.c
+++ b/sql/backends/monet5/sql_pp_statement.c
@@ -683,7 +683,8 @@ stmt_mark_nulls(backend *be, stmt *inout
s->nrcols = 1;
s->q = q;
s->op1 = inout;
- s->op2 = pos;
+ s->op2 = nils;
+ s->op3 = pos;
s->flag = cmp_project;
s->key = 0;
return s;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
