Changeset: e52f92efdfc3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e52f92efdfc3
Modified Files:
sql/backends/monet5/sql_statement.c
Branch: Jun2020
Log Message:
make sure we don't push candidates for scalars
diffs (30 lines):
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1633,14 +1633,18 @@ select2_join2(backend *be, stmt *op1, st
p = pushNil(mb, p, TYPE_bat);
else if (op1->nrcols)
p = pushArgument(mb, p, sub->nr);
- if (op2->cand)
- p = pushNil(mb, p, TYPE_bat);
- else if (op2->nrcols)
- p = pushArgument(mb, p, sub->nr);
- if (op3->cand)
- p = pushNil(mb, p, TYPE_bat);
- else if (op3->nrcols)
- p = pushArgument(mb, p, sub->nr);
+ if (op2->nrcols) {
+ if (op2->cand)
+ p = pushNil(mb, p, TYPE_bat);
+ else if (op2->nrcols)
+ p = pushArgument(mb, p, sub->nr);
+ }
+ if (op2->nrcols) {
+ if (op3->cand)
+ p = pushNil(mb, p, TYPE_bat);
+ else if (op3->nrcols)
+ p = pushArgument(mb, p, sub->nr);
+ }
sub = NULL;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
