Changeset: 9f8a498051f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f8a498051f0
Modified Files:
        gdk/gdk_select.c
Branch: leftmart
Log Message:

IDXACCESS messages for the select code


diffs (129 lines):

diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -175,6 +175,12 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn, 
        seq = b->hseqbase;
        l = BUNfirst(b);
        h = BUNlast(b);
+
+       IDXACCESS fprintf(stderr,
+                         "[%d] #BATselect: hash select %s\n",
+                         VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
+                         VIEWtparent(b)?BATgetId(b):"\b");
+
 #ifndef DISABLE_PARENT_HASH
        if (VIEWtparent(b)) {
                BAT *b2 = BBPdescriptor(-VIEWtparent(b));
@@ -417,6 +423,10 @@ do {                                                       
                \
                          s ? BATgetId(s) : "NULL",                     \
                          s && BATtdense(s) ? "(dense)" : "",           \
                          anti, #TEST);                                 \
+       IDXACCESS fprintf(stderr,                                       \
+                         "[%d] #BATselect: imprints select %s\n",      \
+                         VIEWtparent(b)?-VIEWtparent(b):b->batCacheid, \
+                         VIEWtparent(b)?BATgetId(b):"\b");             \
        switch (imprints->bits) {                                       \
        case 8:  checkMINMAX(8); impsmask(CAND,TEST,8); break;          \
        case 16: checkMINMAX(16); impsmask(CAND,TEST,16); break;        \
@@ -438,9 +448,9 @@ do {                                                        
                \
                          s && BATtdense(s) ? "(dense)" : "",           \
                          anti, #NAME, #TEST);                          \
        IDXACCESS fprintf(stderr,                                       \
-                         "[%d]%s #BATselect: using imprints\n",        \
+                         "[%d] #BATselect: scan select %s\n",          \
                          VIEWtparent(b)?-VIEWtparent(b):b->batCacheid, \
-                         VIEWtparent(b)?"*":" ");                      \
+                         VIEWtparent(b)?BATgetId(b):"\b");             \
        if (BATcapacity(bn) < maximum) {                                \
                while (p < q) {                                         \
                        CAND;                                           \
@@ -602,6 +612,11 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c
 
        (void) maximum;
        (void) use_imprints;
+
+       IDXACCESS fprintf(stderr,
+                         "[%d] #BATselect: scan select (any) %s\n",
+                         VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
+                         VIEWtparent(b)?BATgetId(b):"\b");
        if (equi) {
                ALGODEBUG fprintf(stderr,
                                  "#BATselect(b=%s#"BUNFMT",s=%s%s,anti=%d): "
@@ -690,6 +705,11 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co
        (void) maximum;
        (void) use_imprints;
 
+       IDXACCESS fprintf(stderr,
+                         "[%d] #BATselect: scan select (any) %s\n",
+                         VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
+                         VIEWtparent(b)?BATgetId(b):"\b");
+
        if (equi) {
                ALGODEBUG fprintf(stderr,
                                  "#BATselect(b=%s#"BUNFMT",s=%s%s,anti=%d): "
@@ -779,6 +799,11 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
                          "fullscan equi strelim\n", BATgetId(b), BATcount(b),
                          s ? BATgetId(s) : "NULL",
                          s && BATtdense(s) ? "(dense)" : "", anti);
+       IDXACCESS fprintf(stderr,
+                         "[%d] #BATselect: scan select (strings) %s\n",
+                         VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
+                         VIEWtparent(b)?BATgetId(b):"\b");
+
        if ((pos = strLocate(b->T->vheap, tl)) == 0)
                return 0;
        assert(pos >= GDK_VAROFFSET);
@@ -1437,7 +1462,7 @@ BATselect(BAT *b, BAT *s, const void *tl
             (VIEWtparent(b) && 
BATcheckorderidx(BBPquickdesc(abs(VIEWtparent(b)), 0)))))
        {
                BAT *view = NULL;
-               if (VIEWtparent(b)) {
+               if (VIEWtparent(b) && !BATcheckorderidx(b)) {
                        view = b;
                        b = BBPdescriptor(abs(VIEWtparent(b)));
                }
@@ -1502,6 +1527,10 @@ BATselect(BAT *b, BAT *s, const void *tl
                                          s ? BATgetId(s) : "NULL",
                                          s && BATtdense(s) ? "(dense)" : "",
                                          anti);
+                       IDXACCESS fprintf(stderr,
+                                         "[%d] #BATselect: sort select %s\n",
+                                         
VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
+                                         VIEWtparent(b)?BATgetId(b):"\b");
                        if (lval) {
                                if (li)
                                        low = SORTfndfirst(b, tl);
@@ -1527,6 +1556,10 @@ BATselect(BAT *b, BAT *s, const void *tl
                                          s ? BATgetId(s) : "NULL",
                                          s && BATtdense(s) ? "(dense)" : "",
                                          anti);
+                       IDXACCESS fprintf(stderr,
+                                         "[%d] #BATselect: reverse sort select 
%s\n",
+                                         
VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
+                                         VIEWtparent(b)?BATgetId(b):"\b");
                        if (lval) {
                                if (li)
                                        high = SORTfndlast(b, tl);
@@ -1552,6 +1585,10 @@ BATselect(BAT *b, BAT *s, const void *tl
                                          s ? BATgetId(s) : "NULL",
                                          s && BATtdense(s) ? "(dense)" : "",
                                          anti);
+                       IDXACCESS fprintf(stderr,
+                                         "[%d] #BATselect: order idx select 
%s\n",
+                                         
VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
+                                         VIEWtparent(b)?BATgetId(b):"\b");
                        if (lval) {
                                if (li)
                                        low = ORDERfndfirst(b, tl);
@@ -1850,11 +1887,6 @@ BATselect(BAT *b, BAT *s, const void *tl
                         *  ii) it is not an equi-select, and
                         * iii) is not var-sized.
                         */
-                       IDXACCESS fprintf(stderr,
-                                         "[%d] #BATselect: use imprints %s\n",
-                                         
VIEWtparent(b)?-VIEWtparent(b):b->batCacheid,
-                                         VIEWtparent(b)?BATgetId(b):"\b");
-
                        use_imprints = 1;
                }
                bn = BAT_scanselect(b, s, bn, tl, th, li, hi, equi, anti,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to