Changeset: dd6a1eec71dc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd6a1eec71dc Modified Files: monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batstr.c Branch: default Log Message:
Remove some legacy code
diffs (157 lines):
diff --git a/monetdb5/modules/kernel/aggr.c b/monetdb5/modules/kernel/aggr.c
--- a/monetdb5/modules/kernel/aggr.c
+++ b/monetdb5/modules/kernel/aggr.c
@@ -48,9 +48,6 @@ AGGRgrouped(bat *retval1, bat *retval2,
BBPunfix(e->batCacheid);
throw(MAL, malfunc, RUNTIME_OBJECT_MISSING);
}
- assert(BAThdense(b));
- assert(BAThdense(g));
- assert(BAThdense(e));
assert(b->hseqbase == g->hseqbase);
assert(BATcount(b) == BATcount(g));
if (tp == TYPE_any && (grpfunc1 == BATgroupmedian || quantilefunc ==
BATgroupquantile))
@@ -638,17 +635,8 @@ AGGRsubgroupedExt(bat *retval1, bat *ret
BBPunfix(e->batCacheid);
throw(MAL, malfunc, RUNTIME_OBJECT_MISSING);
}
- } else {
- if (!BAThdense(b)) {
- /* XXX backward compatibility code: ignore non-dense
head, but
- * only if no candidate list */
- //s = BATmirror(BATmark(BATmirror(b), 0));
- s = b;
- BBPunfix(b->batCacheid);
- b = s;
- }
+ } else
s = NULL;
- }
if (grpfunc1)
bn = (*grpfunc1)(b, g, e, s, tp, skip_nils, abort_on_error);
if (quantilefunc) {
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -88,9 +88,6 @@ CMDgen_group(BAT **result, BAT *gids, BA
id++;
}
}
- r -> hdense = TRUE;
- r -> hsorted = TRUE;
- r -> hrevsorted = FALSE;
r -> tkey = FALSE;
r -> tdense = FALSE;
r -> tsorted = BATtordered(gids);
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -870,8 +870,6 @@ BKCinfo(bat *ret1, bat *ret2, const bat
BUNappend(bv, local_itoa((ssize_t)BAThrevordered(b)), FALSE) !=
GDK_SUCCEED ||
BUNappend(bk, "hident", FALSE) != GDK_SUCCEED ||
BUNappend(bv, b->hident, FALSE) != GDK_SUCCEED ||
- BUNappend(bk, "hdense", FALSE) != GDK_SUCCEED ||
- BUNappend(bv, local_itoa((ssize_t)(BAThdense(b))), FALSE) !=
GDK_SUCCEED ||
BUNappend(bk, "hseqbase", FALSE) != GDK_SUCCEED ||
BUNappend(bv, oidtostr(b->hseqbase), FALSE) != GDK_SUCCEED ||
BUNappend(bk, "hkey", FALSE) != GDK_SUCCEED ||
diff --git a/monetdb5/modules/kernel/batcolor.c
b/monetdb5/modules/kernel/batcolor.c
--- a/monetdb5/modules/kernel/batcolor.c
+++ b/monetdb5/modules/kernel/batcolor.c
@@ -57,14 +57,7 @@ str CLRbat##NAME(bat *ret, const bat *l)
FUNC(yp,x);
\
bunfastapp(bn, yp);
\
}
\
- if (!BAThdense(b)) {
\
- /* legacy */
\
- BAT *b2 = VIEWcreate(b, bn);
\
- BBPunfix(bn->batCacheid);
\
- bn = b2;
\
- } else {
\
- BATseqbase(bn, b->hseqbase);
\
- }
\
+ BATseqbase(bn, b->hseqbase);
\
if (!(bn->batDirty & 2))
\
BATsetaccess(bn, BAT_READ);
\
*ret = bn->batCacheid;
\
@@ -151,14 +144,7 @@ str CLRbat##NAME(bat *ret, const bat *l,
p2++;
\
p3++;
\
}
\
- if (!BAThdense(b)) {
\
- /* legacy */
\
- BAT *b2 = VIEWcreate(b, bn);
\
- BBPunfix(bn->batCacheid);
\
- bn = b2;
\
- } else {
\
- BATseqbase(bn, b->hseqbase);
\
- }
\
+ BATseqbase(bn, b->hseqbase);
\
if (!(bn->batDirty & 2))
\
BATsetaccess(bn, BAT_READ);
\
*ret = bn->batCacheid;
\
diff --git a/monetdb5/modules/kernel/batmmath.c
b/monetdb5/modules/kernel/batmmath.c
--- a/monetdb5/modules/kernel/batmmath.c
+++ b/monetdb5/modules/kernel/batmmath.c
@@ -80,13 +80,6 @@ str CMDscience_bat_##TYPE##_##FUNC(bat *
BATkey(BATmirror(bn), 0);
\
if (!(bn->batDirty&2))
\
BATsetaccess(bn, BAT_READ);
\
- if (!BAThdense(b)) {
\
- /* legacy */
\
- BAT *r = VIEWcreate(b,bn);
\
-
\
- BBPunfix(bn->batCacheid);
\
- bn = r;
\
- }
\
BBPkeepref(*ret = bn->batCacheid);
\
BBPunfix(b->batCacheid);
\
return MAL_SUCCEED;
\
@@ -132,13 +125,6 @@ str CMDscience_bat_cst_##FUNC##_##TYPE(b
BATkey(BATmirror(bn),0);
\
if (!(bn->batDirty&2))
\
BATsetaccess(bn, BAT_READ);
\
- if (!BAThdense(b)) {
\
- /* legacy */
\
- BAT *r = VIEWcreate(b,bn);
\
-
\
- BBPunfix(bn->batCacheid);
\
- bn = r;
\
- }
\
BBPkeepref(*ret = bn->batCacheid);
\
BBPunfix(b->batCacheid);
\
return MAL_SUCCEED;
\
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -119,14 +119,7 @@ batstr_export str STRbatsubstring(bat *r
X->tsorted=0;
\
X->trevsorted=0;
#define finalizeResult(X,Y,Z)
\
- if (!BAThdense(Z)) {
\
- /* legacy */
\
- BAT *b2 = VIEWcreate((Z), (Y));
\
- BBPunfix((Y)->batCacheid);
\
- (Y) = b2;
\
- } else {
\
- BATseqbase((Y), (Z)->hseqbase);
\
- }
\
+ BATseqbase((Y), (Z)->hseqbase);
\
if (!((Y)->batDirty&2)) BATsetaccess((Y), BAT_READ); \
*X = (Y)->batCacheid;
\
BBPkeepref(*(X));
\
@@ -1202,14 +1195,6 @@ STRbatsubstringcst(bat *ret, const bat *
GDKfree(res);
}
- if (!BAThdense(b)) {
- /* legacy */
- BAT *r = VIEWcreate(b,bn);
-
- BBPunfix(bn->batCacheid);
- bn = r;
- }
-
bn->T->nonil = 0;
bunins_failed:
if (!(bn->batDirty&2)) BATsetaccess(bn, BAT_READ);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
