MonetDB: Aug2018 - Fix property setting.

[Sjoerd Mullender]

Changeset: 97535264f396 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97535264f396
Modified Files:
        gdk/gdk_join.c
Branch: Aug2018
Log Message:

Fix property setting.


diffs (31 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -664,7 +664,7 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
                                if (i > 0) {
                                        r2->tnil = true;
                                        r2->tnonil = false;
-                                       r2->tkey = i > 1;
+                                       r2->tkey = i == 1;
                                }
                        } else {
                                i = binsearch_oid(NULL, 0, lvals, 0, cnt - 1, 
lo, 1, 0);
@@ -674,13 +674,11 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
                                if (r2)
                                        APPEND(r2, lvals[i] - l->hseqbase + 
l->tseqbase - r->tseqbase + r->hseqbase);
                        }
-                       if (nil_on_miss) {
-                               if (i < cnt) {
-                                       r2->tkey = r2->tnil || (cnt - i > 1);
-                                       r2->tnil = true;
-                                       r2->tnonil = false;
-                                       r2->tsorted = false;
-                               }
+                       if (nil_on_miss && i < cnt) {
+                               r2->tkey = !r2->tnil && cnt - i == 1;
+                               r2->tnil = true;
+                               r2->tnonil = false;
+                               r2->tsorted = false;
                                for (; i < cnt; i++) {
                                        APPEND(r1, lvals[i]);
                                        APPEND(r2, oid_nil);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list