MonetDB: Jul2017 - Merge with Dec2016 branch.

[Sjoerd Mullender]

Changeset: 0443926acf93 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0443926acf93
Modified Files:
        gdk/gdk_join.c
Branch: Jul2017
Log Message:

Merge with Dec2016 branch.


diffs (18 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1606,11 +1606,11 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT 
                        if (rcand) {
                                if (rcand == rcandend) {
                                        v = NULL; /* no more values */
-                               } else if (roff != 0) {
+                               } else if (rvals) {
+                                       v = VALUE(r, (equal_order ? rcand[0] : 
rcandend[-1]) - r->hseqbase);
+                               } else {
                                        rval = roff == lng_nil ? oid_nil : 
(oid) ((lng) (equal_order ? rcand[0] : rcandend[-1]) + roff);
                                        v = &rval;
-                               } else {
-                                       v = VALUE(r, (equal_order ? rcand[0] : 
rcandend[-1]) - r->hseqbase);
                                }
                        } else {
                                if (rstart == rend) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list