Changeset: bedc4b0e8859 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bedc4b0e8859
Modified Files:
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_group.c
gdk/gdk_unique.c
Branch: default
Log Message:
Remove some useless code.
diffs (185 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2167,8 +2167,6 @@ BATassertProps(BAT *b)
/* we need to check for uniqueness the hard
* way (i.e. using a hash table) */
const char *nme = BBP_physical(b->batCacheid);
- char *ext;
- size_t nmelen = strlen(nme);
Heap *hp;
Hash *hs = NULL;
BUN mask;
@@ -2181,7 +2179,6 @@ BATassertProps(BAT *b)
}
snprintf(hp->filename, sizeof(hp->filename),
"%s.hash%d", nme, THRgettid());
- ext = GDKstrdup(hp->filename + nmelen + 1);
if (ATOMsize(b->ttype) == 1)
mask = 1 << 8;
else if (ATOMsize(b->ttype) == 2)
@@ -2192,7 +2189,6 @@ BATassertProps(BAT *b)
hashheap)) < 0 ||
(hs = HASHnew(hp, b->ttype, BUNlast(b),
mask, BUN_NONE)) == NULL) {
- GDKfree(ext);
GDKfree(hp);
fprintf(stderr,
"#BATassertProps: cannot allocate "
@@ -2219,7 +2215,6 @@ BATassertProps(BAT *b)
HEAPfree(hp, 1);
GDKfree(hp);
GDKfree(hs);
- GDKfree(ext);
}
abort_check:
assert(!b->tnil || seennil);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1098,15 +1098,12 @@ BATkeyed(BAT *b)
b->tkey = 1;
} else {
const char *nme;
- size_t nmelen;
BUN prb;
BUN mask;
- char *ext = NULL;
Heap *hp = NULL;
GDKclrerr(); /* not interested in BAThash errors */
nme = BBP_physical(b->batCacheid);
- nmelen = strlen(nme);
if (ATOMbasetype(b->ttype) == TYPE_bte) {
mask = (BUN) 1 << 8;
cmpf = NULL; /* no compare needed, "hash" is
perfect */
@@ -1121,12 +1118,10 @@ BATkeyed(BAT *b)
if ((hp = GDKzalloc(sizeof(Heap))) == NULL ||
snprintf(hp->filename, sizeof(hp->filename),
"%s.hash%d", nme, THRgettid()) < 0 ||
- (ext = GDKstrdup(hp->filename + nmelen + 1)) ==
NULL ||
(hs = HASHnew(hp, b->ttype, BUNlast(b), mask,
BUN_NONE)) == NULL) {
if (hp) {
GDKfree(hp);
}
- GDKfree(ext);
/* err on the side of caution: not keyed */
goto doreturn;
}
@@ -1152,7 +1147,6 @@ BATkeyed(BAT *b)
HEAPfree(hp, 1);
GDKfree(hp);
GDKfree(hs);
- GDKfree(ext);
if (p == q) {
/* we completed the complete scan: no
* duplicates */
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -553,7 +553,6 @@ BATgroup_internal(BAT **groups, BAT **ex
BUN p, q, r;
const void *v, *pv;
BATiter bi;
- char *ext = NULL;
Hash *hs = NULL;
BUN hb;
BUN maxgrps;
@@ -1085,7 +1084,6 @@ BATgroup_internal(BAT **groups, BAT **ex
} else {
bit gc = g && (BATordered(g) || BATordered_rev(g));
const char *nme;
- size_t nmelen;
Heap *hp = NULL;
BUN prb;
int bits;
@@ -1111,7 +1109,6 @@ BATgroup_internal(BAT **groups, BAT **ex
h ? BATgetId(h) : "NULL", h ? BATcount(h) : 0,
subsorted, gc ? " (g clustered)" : "");
nme = BBP_physical(b->batCacheid);
- nmelen = strlen(nme);
mask = MAX(HASHmask(cnt), 1 << 16);
/* mask is a power of two, so pop(mask - 1) tells us
* which power of two */
@@ -1120,16 +1117,12 @@ BATgroup_internal(BAT **groups, BAT **ex
(hp->farmid = BBPselectfarm(TRANSIENT, b->ttype, hashheap))
< 0 ||
snprintf(hp->filename, sizeof(hp->filename),
"%s.hash%d", nme, THRgettid()) < 0 ||
- (ext = GDKstrdup(hp->filename + nmelen + 1)) == NULL ||
(hs = HASHnew(hp, b->ttype, BUNlast(b),
mask, BUN_NONE)) == NULL) {
if (hp) {
GDKfree(hp);
}
- if (ext)
- GDKfree(ext);
hp = NULL;
- ext = NULL;
GDKerror("BATgroup: cannot allocate hash table\n");
goto error;
}
@@ -1220,7 +1213,6 @@ BATgroup_internal(BAT **groups, BAT **ex
HEAPfree(hp, 1);
GDKfree(hp);
GDKfree(hs);
- GDKfree(ext);
}
if (extents) {
BATsetcount(en, (BUN) ngrp);
diff --git a/gdk/gdk_unique.c b/gdk/gdk_unique.c
--- a/gdk/gdk_unique.c
+++ b/gdk/gdk_unique.c
@@ -34,7 +34,6 @@ BATunique(BAT *b, BAT *s)
oid i, o;
unsigned short *seen = NULL;
const char *nme;
- char *ext = NULL;
Heap *hp = NULL;
Hash *hs = NULL;
BUN hb;
@@ -287,7 +286,6 @@ BATunique(BAT *b, BAT *s)
}
}
} else {
- size_t nmelen;
BUN prb;
BUN p;
BUN mask;
@@ -298,7 +296,6 @@ BATunique(BAT *b, BAT *s)
s ? BATgetId(s) : "NULL",
s ? BATcount(s) : 0);
nme = BBP_physical(b->batCacheid);
- nmelen = strlen(nme);
if (ATOMbasetype(b->ttype) == TYPE_bte) {
mask = (BUN) 1 << 8;
cmp = NULL; /* no compare needed, "hash" is perfect */
@@ -316,13 +313,9 @@ BATunique(BAT *b, BAT *s)
if ((hp = GDKzalloc(sizeof(Heap))) == NULL ||
snprintf(hp->filename, sizeof(hp->filename),
"%s.hash%d", nme, THRgettid()) < 0 ||
- (ext = GDKstrdup(hp->filename + nmelen + 1)) == NULL ||
(hs = HASHnew(hp, b->ttype, BUNlast(b), mask, BUN_NONE)) ==
NULL) {
GDKfree(hp);
- if (ext)
- GDKfree(ext);
hp = NULL;
- ext = NULL;
GDKerror("BATunique: cannot allocate hash table\n");
goto bunins_failed;
}
@@ -358,7 +351,6 @@ BATunique(BAT *b, BAT *s)
HEAPfree(hp, 1);
GDKfree(hp);
GDKfree(hs);
- GDKfree(ext);
}
bn->tsorted = 1;
@@ -375,7 +367,6 @@ BATunique(BAT *b, BAT *s)
HEAPfree(hp, 1);
GDKfree(hp);
GDKfree(hs);
- GDKfree(ext);
}
BBPreclaim(bn);
return NULL;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
