MonetDB: Jun2020 - Don't set properties on input bats.

[Sjoerd Mullender]

Changeset: 8a328745f3e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a328745f3e6
Modified Files:
        gdk/gdk_calc.c
Branch: Jun2020
Log Message:

Don't set properties on input bats.


diffs (79 lines):

diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -320,11 +320,6 @@ BATcalcnot(BAT *b, BAT *s, BAT *r)
        bn->tnonil = nils == 0;
        bn->tkey = b->tkey && nils <= 1;
 
-       if (nils != 0 && !b->tnil) {
-               b->tnil = true;
-               b->batDirtydesc = true;
-       }
-
        TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
                  ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
                  ALGOBATPAR(b), ALGOOPTBATPAR(s),
@@ -450,11 +445,6 @@ BATcalcnegate(BAT *b, BAT *s, BAT *r)
        bn->tnonil = nils == 0;
        bn->tkey = b->tkey && nils <= 1;
 
-       if (nils != 0 && !b->tnil) {
-               b->tnil = true;
-               b->batDirtydesc = true;
-       }
-
        TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
                  ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
                  ALGOBATPAR(b), ALGOOPTBATPAR(s),
@@ -590,11 +580,6 @@ BATcalcabsolute(BAT *b, BAT *s, BAT *r)
        bn->tnil = nils != 0;
        bn->tnonil = nils == 0;
 
-       if (nils && !b->tnil) {
-               b->tnil = true;
-               b->batDirtydesc = true;
-       }
-
        TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
                  ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
                  ALGOBATPAR(b), ALGOOPTBATPAR(s),
@@ -729,11 +714,6 @@ BATcalciszero(BAT *b, BAT *s, BAT *r)
        bn->tnil = nils != 0;
        bn->tnonil = nils == 0;
 
-       if (nils != 0 && !b->tnil) {
-               b->tnil = true;
-               b->batDirtydesc = true;
-       }
-
        TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
                  ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
                  ALGOBATPAR(b), ALGOOPTBATPAR(s),
@@ -872,11 +852,6 @@ BATcalcsign(BAT *b, BAT *s, BAT *r)
        bn->tnil = nils != 0;
        bn->tnonil = nils == 0;
 
-       if (nils != 0 && !b->tnil) {
-               b->tnil = true;
-               b->batDirtydesc = true;
-       }
-
        TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
                  ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
                  ALGOBATPAR(b), ALGOOPTBATPAR(s),
@@ -3805,15 +3780,6 @@ BATcalcincrdecr(BAT *b, BAT *s, BAT *r, 
        bn->tnil = nils != 0;
        bn->tnonil = nils == 0;
 
-       if (nils && !b->tnil) {
-               b->tnil = true;
-               b->batDirtydesc = true;
-       }
-       if (nils == 0 && !b->tnonil) {
-               b->tnonil = true;
-               b->batDirtydesc = true;
-       }
-
        TRC_DEBUG(ALGO, "%s: b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
                  ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
                  func, ALGOBATPAR(b), ALGOOPTBATPAR(s),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list