MonetDB: Jul2017 - Merged last commit

[Pedro Ferreira]

Changeset: 812ae77c0578 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=812ae77c0578
Modified Files:
        gdk/gdk_batop.c
Branch: Jul2017
Log Message:

Merged last commit


diffs (25 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -957,8 +957,8 @@ BATkeyed(BAT *b)
                           (b->batPersistence == PERSISTENT &&
                            BAThash(b, 0) == GDK_SUCCEED)
 #ifndef DISABLE_PARENT_HASH
-                          || ((parent = VIEWtparent(b)) != 0 &&
-                              BATcheckhash(BBPdescriptor(parent)))
+                          || (VIEWtparent(b) != 0 &&
+                              BATcheckhash(BBPdescriptor(VIEWtparent(b))))
 #endif
                        ) {
                        /* we already have a hash table on b, or b is
@@ -969,8 +969,8 @@ BATkeyed(BAT *b)
 
                        hs = b->thash;
 #ifndef DISABLE_PARENT_HASH
-                       if (b->thash == NULL && (parent = VIEWtparent(b)) != 0) 
{
-                               BAT *b2 = BBPdescriptor(parent);
+                       if (b->thash == NULL && VIEWtparent(b) != 0) {
+                               BAT *b2 = BBPdescriptor(VIEWtparent(b));
                                lo = (BUN) ((b->theap.base - b2->theap.base) >> 
b->tshift);
                                hs = b2->thash;
                        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list