MonetDB: Jul2021 - Don't produce unneeded column.

[Sjoerd Mullender]

Changeset: e9608050e060 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e9608050e060
Modified Files:
        gdk/gdk_firstn.c
Branch: Jul2021
Log Message:

Don't produce unneeded column.


diffs (28 lines):

diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -1127,7 +1127,7 @@ BATfirstn_grouped_with_groups(BAT **topn
 
        MT_thread_setalgorithm(__func__);
        if (distinct) {
-               BAT *bn1, *bn2, *bn3, *bn4, *bn5, *bn6, *bn7, *bn8;
+               BAT *bn1, *bn2, *bn3, *bn4, *bn5, *bn6, *bn7;
                if (BATgroup(&bn1, &bn2, NULL, b, s, g, NULL, NULL) != 
GDK_SUCCEED)
                        return GDK_FAIL;
                bn3 = BATproject(bn2, b);
@@ -1155,13 +1155,12 @@ BATfirstn_grouped_with_groups(BAT **topn
                        BBPunfix(bn1->batCacheid);
                        return GDK_FAIL;
                }
-               rc = BATleftjoin(&bn8, &bn7, bn1, bn6, NULL, NULL, false, 
BUN_NONE);
+               rc = BATleftjoin(&bn7, NULL, bn1, bn6, NULL, NULL, false, 
BUN_NONE);
                BBPunfix(bn6->batCacheid);
                if (rc != GDK_SUCCEED)
                        return GDK_FAIL;
+               bn = BATproject(bn7, s);
                BBPunfix(bn7->batCacheid);
-               bn = BATproject(bn8, s);
-               BBPunfix(bn8->batCacheid);
                if (bn == NULL)
                        return GDK_FAIL;
        } else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list