MonetDB: Jul2021 - A little cleanup.

[Sjoerd Mullender]

Changeset: 9653a7e640fd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9653a7e640fd
Modified Files:
        gdk/gdk_join.c
        gdk/gdk_private.h
Branch: Jul2021
Log Message:

A little cleanup.


diffs (44 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -333,6 +333,12 @@ selectjoin(BAT **r1p, BAT **r2p, BAT *l,
                BBPunfix(bn->batCacheid);
                return GDK_FAIL;
        }
+       r1->tsorted = true;
+       r1->trevsorted = lci->ncand == 1;
+       r1->tseqbase = BATcount(bn) == 1 && lci->tpe == cand_dense ? o : 
oid_nil;
+       r1->tkey = BATcount(bn) == 1;
+       r1->tnil = false;
+       r1->tnonil = true;
        BAT *r2 = NULL;
        if (r2p) {
                r2 = COLnew(0, TYPE_oid, lci->ncand * BATcount(bn), TRANSIENT);
@@ -341,15 +347,6 @@ selectjoin(BAT **r1p, BAT **r2p, BAT *l,
                        BBPreclaim(r1);
                        return GDK_FAIL;
                }
-       }
-
-       r1->tsorted = true;
-       r1->trevsorted = lci->ncand == 1;
-       r1->tseqbase = BATcount(bn) == 1 && lci->tpe == cand_dense ? o : 
oid_nil;
-       r1->tkey = BATcount(bn) == 1;
-       r1->tnil = false;
-       r1->tnonil = true;
-       if (r2) {
                r2->tsorted = lci->ncand == 1 || BATcount(bn) == 1;
                r2->trevsorted = BATcount(bn) == 1;
                r2->tseqbase = lci->ncand == 1 && BATtdense(bn) ? bn->tseqbase 
: oid_nil;
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -68,8 +68,6 @@ Hash *BAThash_impl(BAT *restrict b, stru
        __attribute__((__visibility__("hidden")));
 gdk_return BAThashsave(BAT *b, bool dosync)
        __attribute__((__visibility__("hidden")));
-gdk_return BAThashsave(BAT *b, bool dosync)
-       __attribute__((__visibility__("hidden")));
 void BATinit_idents(BAT *bn)
        __attribute__((__visibility__("hidden")));
 bool BATiscand(BAT *b)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list