Changeset: 0d74c883af58 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d74c883af58
Modified Files:
gdk/gdk.h
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_select.c
monetdb5/mal/mal.h
monetdb5/mal/mal_resolve.c
Branch: orderidx
Log Message:
remove code not related with ordered idx
diffs (truncated from 309 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -475,8 +475,6 @@
#define XPROPMASK (1<<23)
#define XPROPDEBUG if (GDKdebug & XPROPMASK)
*/
-#define IDXACCMASK (1<<23)
-#define IDXACCESS if (GDKdebug & IDXACCMASK)
#define JOINPROPMASK (1<<24)
#define JOINPROPCHK if (!(GDKdebug & JOINPROPMASK))
@@ -679,8 +677,6 @@ typedef struct {
} Hash;
typedef struct Imprints Imprints;
-typedef struct Bloomfilter Bloomfilter;
-
/*
* @+ Binary Association Tables
@@ -2003,7 +1999,7 @@ gdk_export oid OIDnew(oid inc);
* @end multitable
*
* The current BAT implementation supports three search accelerators:
- * hashing, imprints, and oid order.
+ * hashing, imprints, and oid ordered index.
*
* The routine BAThash makes sure that a hash accelerator on the tail of the
* BAT exists. GDK_FAIL is returned upon failure to create the supportive
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -255,8 +255,6 @@ BATcheckhash(BAT *b)
b->T->hash = h;
ALGODEBUG fprintf(stderr,
"#BATcheckhash: reusing persisted hash %s\n", BATgetId(b));
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d,%d]:%c
(" BUNFMT ") #BATcheckhash: load persistent hash index (usec " LLFMT
- ")\n",
b->batCacheid,-VIEWtparent(b), h->type, BATcount(b), GDKusec() - t);
return 1;
}
GDKfree(h);
@@ -521,7 +519,6 @@ BAThash(BAT *b, BUN masksize)
ALGODEBUG HASHcollisions(b, b->T->hash);
}
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #BAThash: create
hash index (ms=" LLFMT ")\n", b->batCacheid,-VIEWtparent(b), b->T->hash->type,
BATcount(b), t1 - t0);
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -186,14 +186,12 @@ int
BATcheckimprints(BAT *b)
{
int ret;
- lng t;
if (VIEWtparent(b)) {
assert(b->T->imprints == NULL);
b = BBPdescriptor(-VIEWtparent(b));
}
- t = GDKusec();
MT_lock_set(&GDKimprintsLock(abs(b->batCacheid)));
if (b->T->imprints == (Imprints *) 1) {
Imprints *imprints;
@@ -246,8 +244,6 @@ BATcheckimprints(BAT *b)
b->T->imprints = imprints;
ALGODEBUG fprintf(stderr,
"#BATcheckimprints: reusing persisted imprints %d\n", b->batCacheid);
MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d,%d]:%d
(" BUNFMT ") #BATcheckimprints: load persistent imprints index (usec " LLFMT
- ")\n",
b->batCacheid,-VIEWtparent(b), b->ttype, BATcount(b), GDKusec() - t);
return 1;
}
@@ -500,8 +496,6 @@ BATimprints(BAT *b)
ALGODEBUG fprintf(stderr, "#BATimprints: imprints construction " LLFMT
" usec\n", t1 - t0);
MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d] #BATimprints: created imprints\n",
b->batCacheid);
-
/* BBPUnfix tries to get the imprints lock which might lead to a
deadlock
* if those were unfixed earlier */
if (s1) {
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2735,8 +2735,6 @@ hashjoin(BAT *r1, BAT *r2, BAT *l, BAT *
return nomatch(r1, r2, l, r, lstart, lend, lcand, lcandend,
nil_on_miss, only_misses, "hashjoin", t0);
- t0 = GDKusec();
-
rl = BUNfirst(r);
#ifndef DISABLE_PARENT_HASH
if (VIEWtparent(r)) {
@@ -3081,8 +3079,6 @@ hashjoin(BAT *r1, BAT *r2, BAT *l, BAT *
r2 && r2->tdense ? "-dense" : "",
r2 && r2->tkey & 1 ? "-key" : "",
GDKusec() - t0);
- IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #hashjoin: hash join
l=[%d,%d]:%d (" BUNFMT ") (usec " LLFMT
- ")\n", r->batCacheid,-VIEWtparent(r), r->ttype,
BATcount(r), l->batCacheid,-VIEWtparent(l), l->ttype, BATcount(l), GDKusec() -
t0);
return GDK_SUCCEED;
bailout:
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -92,8 +92,6 @@ BATcheckorderidx(BAT *b)
close(fd);
b->torderidx = hp;
ALGODEBUG fprintf(stderr,
"#BATcheckorderidx: reusing persisted orderidx %d\n", b->batCacheid);
- IDXACCESS fprintf(stderr, "[%d,%d]:%d
(" BUNFMT ") #BATcheckorderidx: load persistent order index (usec " LLFMT
- ")\n",
b->batCacheid,-VIEWtparent(b), b->ttype, BATcount(b), GDKusec() - t);
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
return 1;
}
@@ -108,7 +106,7 @@ BATcheckorderidx(BAT *b)
}
ret = b->T->orderidx != NULL;
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
- ALGODEBUG if (ret) fprintf(stderr, "#BATcheckorderidx: already has
orderidx %d, waited " LLFMT " usec\n", b->batCacheid, t);
+ ALGODEBUG if (ret) fprintf(stderr, "#BATcheckorderidx: already has
orderidx %d, waited " LLFMT " usec\n", b->batCacheid, GDKusec() - t);
return ret;
}
@@ -121,7 +119,6 @@ BATorderidx(BAT *b, int stable)
const char *nme;
oid seq;
BUN p, q;
- lng t0 = 0, t1 = 0;
if (BATcheckorderidx(b))
return GDK_SUCCEED;
@@ -130,7 +127,6 @@ BATorderidx(BAT *b, int stable)
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
return GDK_SUCCEED;
}
- t0 = GDKusec();
nme = BBP_physical(b->batCacheid);
nmelen = strlen(nme) + 12;
if ((m = GDKzalloc(sizeof(Heap))) == NULL ||
@@ -202,11 +198,8 @@ BATorderidx(BAT *b, int stable)
b->batDirtydesc = TRUE;
b->torderidx = m;
- t1 = GDKusec();
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #BATorderidx: create
order index (usec " LLFMT ")\n", b->batCacheid,-VIEWtparent(b), b->ttype,
BATcount(b), t1 - t0);
-
return GDK_SUCCEED;
}
@@ -369,7 +362,6 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
size_t nmelen;
oid *restrict mv;
const char *nme = BBP_physical(b->batCacheid);
- lng t0 = 0, t1 = 0;
if (BATcheckorderidx(b))
return GDK_SUCCEED;
@@ -378,7 +370,6 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
return GDK_SUCCEED;
}
- t0 = GDKusec();
nmelen = strlen(nme) + 12;
if ((m = GDKzalloc(sizeof(Heap))) == NULL ||
(m->farmid = BBPselectfarm(b->batRole, b->ttype, orderidxheap)) < 0
||
@@ -515,9 +506,7 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
b->batDirtydesc = TRUE;
b->torderidx = m;
- t1 = GDKusec();
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
- IDXACCESS fprintf(stderr, "[%d,%d]:%d (" BUNFMT ") #GDKmergeidx: merge
order index (usec " LLFMT ")\n", b->batCacheid,-VIEWtparent(b), b->ttype,
BATcount(b), t1 - t0);
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -176,11 +176,6 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn,
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));
@@ -423,10 +418,6 @@ 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; \
@@ -447,10 +438,6 @@ do {
\
s ? BATgetId(s) : "NULL", \
s && BATtdense(s) ? "(dense)" : "", \
anti, #NAME, #TEST); \
- IDXACCESS fprintf(stderr, \
- "[%d] #BATselect: scan select %s\n", \
- VIEWtparent(b)?-VIEWtparent(b):b->batCacheid, \
- VIEWtparent(b)?BATgetId(b):"\b"); \
if (BATcapacity(bn) < maximum) { \
while (p < q) { \
CAND; \
@@ -613,10 +600,6 @@ 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): "
@@ -705,11 +688,6 @@ 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): "
@@ -799,10 +777,6 @@ 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;
@@ -1530,10 +1504,6 @@ 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);
@@ -1559,10 +1529,6 @@ 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);
@@ -1588,10 +1554,6 @@ 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);
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -69,7 +69,6 @@ mal_export int have_hge;
#define GRPtransactions (TMMASK | DELTAMASK | TEMMASK)
#define GRPmodules (LOADMASK)
#define GRPalgorithms (ALGOMASK | ESTIMASK)
-#define GRPindexes (IDXACCMASK)
#define GRPperformance (JOINPROPMASK | DEADBEEFMASK)
#define GRPoptimizers (OPTMASK)
#define GRPforcemito (FORCEMITOMASK)
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
