Changeset: 14fdd029ed10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14fdd029ed10
Modified Files:
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_batop.c
gdk/gdk_private.h
Branch: Oct2014
Log Message:
Removed some unused stuff.
diffs (95 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3195,38 +3195,12 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b
* levels.
*/
-#define GDK_AGGR_SIZE 1
-#define GDK_AGGR_CARD 2
#define GDK_MIN_VALUE 3
#define GDK_MAX_VALUE 4
gdk_export void PROPdestroy(PROPrec *p);
gdk_export PROPrec *BATgetprop(BAT *b, int idx);
gdk_export void BATsetprop(BAT *b, int idx, int type, void *v);
-gdk_export int BATtopN(BAT *b, BUN topN); /* used in
monet5/src/modules/kernel/algebra.mx */
-
-/*
- * @- Alignment transformations
- * Some classes of algebraic operators transform a sequence in an
- * input BAT always in the same way in the output result. An example
- * are the @{X@}() function (including histogram(b), which is
- * identical to @{count@}(b.reverse)). That is to say, if
- * synced(b2,b2) => synced(@{X@}(b1),@{Y@}(b2))
- *
- * Another example is b.fetch(position-bat). If synced(b2,b2) and the
- * same position-bat is fetched with, the results will again be
- * synced. This can be mimicked by transforming the
- * @emph{alignment-id} of the input BAT with a one-way function onto
- * the result.
- *
- * We use @strong{output->halign = NOID_AGGR(input->halign)} for the
- * @strong{output = @{X@}(input)} case, and @strong{output->align =
- * NOID_MULT(input1->align,input2->halign)} for the fetch.
- */
-#define AGGR_MAGIC 111
-#define NOID(x) ((oid)(x))
-#define NOID_AGGR(x) NOID_MULT(AGGR_MAGIC,x)
-#define NOID_MULT(x,y) NOID( (lng)(y)*(lng)(x) )
/*
* @- BAT relational operators
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -118,10 +118,6 @@ ALIGNsetH(BAT *b1, BAT *b2)
if (b2->halign == 0) {
b2->halign = OIDnew(1);
b2->batDirtydesc = TRUE;
- } else {
- /* propagate GDK_AGGR information */
- BATpropagate(b1, b2, GDK_AGGR_SIZE);
- BATpropagate(b1, b2, GDK_AGGR_CARD);
}
if (BAThvoid(b2)) {
/* b2 is either dense or has a void(nil) head */
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1739,7 +1739,6 @@ BATconst(BAT *b, int tailtype, const voi
* is a nil value present by mis-using the highest bits of both
* GDK_AGGR_SIZE and GDK_AGGR_CARD.
*/
-#define GDK_NIL_BIT 0x80000000 /* (1 << 31) */
void
PROPdestroy(PROPrec *p)
@@ -1787,15 +1786,6 @@ BATsetprop(BAT *b, int idx, int type, vo
}
}
-void
-BATpropagate(BAT *dst, BAT *src, int idx)
-{
- PROPrec *p = BATgetprop(src, idx);
-
- if (p)
- BATsetprop(dst, idx, p->v.vtype, VALget(&p->v));
-}
-
/*
* The BATcount_no_nil function counts all BUN in a BAT that have a
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -80,8 +80,6 @@ BAT *BATload_intern(bat bid, int lock)
__attribute__((__visibility__("hidden")));
BAT *BATmaterializet(BAT *b)
__attribute__((__visibility__("hidden")));
-void BATpropagate(BAT *dst, BAT *src, int idx)
- __attribute__((__visibility__("hidden")));
str BATrename(BAT *b, const char *nme)
__attribute__((__visibility__("hidden")));
void BATsetdims(BAT *b)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
