Changeset: 90021ea4b1ed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90021ea4b1ed
Modified Files:
gdk/gdk_select.c
Branch: Oct2014
Log Message:
Extended debug information.
diffs (271 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -338,9 +338,11 @@ do {
\
do { \
assert(imprints); \
ALGODEBUG fprintf(stderr, \
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): " \
- "imprints select %s\n", BATgetId(b), BATcount(b), \
- s?BATgetId(s):"NULL", anti, #TEST); \
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d): " \
+ "imprints select %s\n", BATgetId(b), BATcount(b), \
+ s ? BATgetId(s) : "NULL", \
+ s && BATtdense(s) ? "(dense)" : "", \
+ anti, #TEST); \
switch (imprints->bits) { \
case 8: impsmask(CAND,TEST,8); break; \
case 16: impsmask(CAND,TEST,16); break; \
@@ -356,9 +358,11 @@ do {
\
#define scanloop(CAND,TEST) \
do { \
ALGODEBUG fprintf(stderr, \
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): " \
- "scanselect %s\n", BATgetId(b), BATcount(b), \
- s ? BATgetId(s) : "NULL", anti, #TEST); \
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d): " \
+ "scanselect %s\n", BATgetId(b), BATcount(b), \
+ s ? BATgetId(s) : "NULL", \
+ s && BATtdense(s) ? "(dense)" : "", \
+ anti, #TEST); \
if (BATcapacity(bn) < maximum) { \
while (p < q) { \
CAND; \
@@ -498,9 +502,10 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c
(void) use_imprints;
if (equi) {
ALGODEBUG fprintf(stderr,
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): "
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d):
"
"scanselect equi\n", BATgetId(b), BATcount(b),
- BATgetId(s), anti);
+ BATgetId(s), BATtdense(s) ? "(dense)" : "",
+ anti);
while (p < q) {
o = *candlist++;
v = BUNtail(bi,(BUN)(o-off));
@@ -513,9 +518,10 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c
}
} else if (anti) {
ALGODEBUG fprintf(stderr,
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): "
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d):
"
"scanselect anti\n", BATgetId(b), BATcount(b),
- BATgetId(s), anti);
+ BATgetId(s), BATtdense(s) ? "(dense)" : "",
+ anti);
while (p < q) {
o = *candlist++;
v = BUNtail(bi,(BUN)(o-off));
@@ -534,9 +540,10 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c
}
} else {
ALGODEBUG fprintf(stderr,
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): "
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d):
"
"scanselect range\n", BATgetId(b),
BATcount(b),
- BATgetId(s), anti);
+ BATgetId(s), BATtdense(s) ? "(dense)" : "",
+ anti);
while (p < q) {
o = *candlist++;
v = BUNtail(bi,(BUN)(o-off));
@@ -577,9 +584,10 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co
if (equi) {
ALGODEBUG fprintf(stderr,
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): "
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d):
"
"scanselect equi\n", BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
while (p < q) {
o = (oid)(p + off);
v = BUNtail(bi,(BUN)(o-off));
@@ -592,9 +600,10 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co
}
} else if (anti) {
ALGODEBUG fprintf(stderr,
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): "
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d):
"
"scanselect anti\n", BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
while (p < q) {
o = (oid)(p + off);
v = BUNtail(bi,(BUN)(o-off));
@@ -613,9 +622,10 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co
}
} else {
ALGODEBUG fprintf(stderr,
- "#BATsubselect(b=%s#"BUNFMT",s=%s,anti=%d): "
+ "#BATsubselect(b=%s#"BUNFMT",s=%s%s,anti=%d):
"
"scanselect range\n", BATgetId(b),
BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
while (p < q) {
o = (oid)(p + off);
v = BUNtail(bi,(BUN)(o-off));
@@ -1028,9 +1038,10 @@ BATsubselect(BAT *b, BAT *s, const void
s->tseqbase + BATcount(s) <= b->hseqbase))))) {
/* trivially empty result */
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): trivially empty\n",
+ ",s=%s%s,anti=%d): trivially empty\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
return newempty("BATsubselect");
}
@@ -1067,19 +1078,23 @@ BATsubselect(BAT *b, BAT *s, const void
lnil = ATOMcmp(t, tl, nil) == 0;
anti = 0;
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): anti: "
+ ",s=%s%s,anti=%d): anti: "
"switch ranges\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "",
+ anti);
} else if (!lval && !hval) {
/* antiselect for nil-nil range: all non-nil
* values are in range; we must return all
* other non-nil values, i.e. nothing */
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): anti: "
+ ",s=%s%s,anti=%d): anti: "
"nil-nil range, nonil\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "",
+ anti);
return newempty("BATsubselect");
} else if (equi && lnil) {
/* antiselect for nil value: turn into range
@@ -1090,9 +1105,10 @@ BATsubselect(BAT *b, BAT *s, const void
lval = 0;
hval = 0;
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=0): anti-nil\n",
+ ",s=%s%s,anti=0): anti-nil\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL");
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "");
} else if (equi) {
equi = 0;
if (!(li && hi)) {
@@ -1103,10 +1119,11 @@ BATsubselect(BAT *b, BAT *s, const void
lval = 0;
hval = 0;
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#"
- BUNFMT ",s=%s,anti=0): "
+ BUNFMT ",s=%s%s,anti=0): "
"anti-nothing\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL");
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)"
: "");
}
}
}
@@ -1117,17 +1134,19 @@ BATsubselect(BAT *b, BAT *s, const void
if (hval && ((equi && !(li && hi)) || ATOMcmp(t, tl, th) > 0)) {
/* empty range */
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): empty range\n",
+ ",s=%s%s,anti=%d): empty range\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
return newempty("BATsubselect");
}
if (equi && lnil && b->T->nonil) {
/* return all nils, but there aren't any */
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): equi-nil, nonil\n",
+ ",s=%s%s,anti=%d): equi-nil, nonil\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
return newempty("BATsubselect");
}
@@ -1135,9 +1154,10 @@ BATsubselect(BAT *b, BAT *s, const void
/* return all non-nils from a BAT that doesn't have
* any: i.e. return everything */
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): everything, nonil\n",
+ ",s=%s%s,anti=%d): everything, nonil\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
if (s) {
return BATcopy(s, TYPE_void, s->ttype, 0, TRANSIENT);
} else {
@@ -1183,9 +1203,11 @@ BATsubselect(BAT *b, BAT *s, const void
assert(b->T->nonil);
assert(b->tsorted);
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): dense\n",
+ ",s=%s%s,anti=%d): dense\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "",
+ anti);
h = * (oid *) th + hi;
if (h > b->tseqbase)
h -= b->tseqbase;
@@ -1205,9 +1227,11 @@ BATsubselect(BAT *b, BAT *s, const void
low = high;
} else if (b->tsorted) {
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): sorted\n",
+ ",s=%s%s,anti=%d): sorted\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "",
+ anti);
if (lval) {
if (li)
low = SORTfndfirst(b, tl);
@@ -1228,9 +1252,11 @@ BATsubselect(BAT *b, BAT *s, const void
} else {
assert(b->trevsorted);
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): reverse sorted\n",
+ ",s=%s%s,anti=%d): reverse sorted\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "",
+ anti);
if (lval) {
if (li)
high = SORTfndlast(b, tl);
@@ -1408,9 +1434,10 @@ BATsubselect(BAT *b, BAT *s, const void
if (equi && (b->T->hash || hash)) {
ALGODEBUG fprintf(stderr, "#BATsubselect(b=%s#" BUNFMT
- ",s=%s,anti=%d): hash select\n",
+ ",s=%s%s,anti=%d): hash select\n",
BATgetId(b), BATcount(b),
- s ? BATgetId(s) : "NULL", anti);
+ s ? BATgetId(s) : "NULL",
+ s && BATtdense(s) ? "(dense)" : "", anti);
bn = BAT_hashselect(b, s, bn, tl, maximum);
} else {
int use_imprints = 0;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
