Changeset: 520f011edcd3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=520f011edcd3
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: linear-hashing
Log Message:
Fixed error conditions at rel_bin
This fixes the merge-partitions and merge-statements tests.
diffs (24 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -5343,7 +5343,7 @@ rel2bin_partition_limits(backend *be, sq
l = subrel_bin(be, rel->l, refs);
if (rel->r) /* first construct the sub relation */
r = subrel_bin(be, rel->r, refs);
- if (!l || !r)
+ if ((rel->l && !l) || (rel->r && !r))
return NULL;
assert(rel->exps);
@@ -5373,9 +5373,9 @@ rel2bin_exception(backend *be, sql_rel *
if (rel->l) /* first construct the sub relation */
l = subrel_bin(be, rel->l, refs);
- if (rel->r) /* first construct the sub relation */
+ if (rel->r) /* first construct the sub relation */
r = subrel_bin(be, rel->r, refs);
- if (!l || !r)
+ if ((rel->l && !l) || (rel->r && !r))
return NULL;
if (rel->exps) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
