Changeset: 506d6007db90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=506d6007db90
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_private.h
monetdb5/ChangeLog.Oct2014
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: Oct2014
Log Message:
Removed algebra.materialize. It wasn't used anymore.
diffs (209 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -2533,10 +2533,6 @@ command algebra.like(b:bat[:oid,:str],su
address ALGlike;
comment Selects all elements that have 'substr' as in the tail.
-command algebra.materialize(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address ALGmaterialize;
-comment Materialize the void column
-
command
algebra.mark_grp(b:bat[:any_1,:oid],g:bat[:oid,:any_2],s:oid):bat[:any_1,:oid]
address ALGmark_grp_2;
comment "grouped mark": Produces a new BAT with per group a locally unique
dense ascending sequense of OIDs in the tail. The tail of the first BAT (b)
identifies the group that each BUN of b belongs to. The second BAT (g)
represents the group extent, i.e., the head is the unique list of group IDs
from b's tail. The third argument (s) gives the base value for the new OID
sequence of each group.
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -2534,10 +2534,6 @@ command algebra.like(b:bat[:oid,:str],su
address ALGlike;
comment Selects all elements that have 'substr' as in the tail.
-command algebra.materialize(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address ALGmaterialize;
-comment Materialize the void column
-
command
algebra.mark_grp(b:bat[:any_1,:oid],g:bat[:oid,:any_2],s:oid):bat[:any_1,:oid]
address ALGmark_grp_2;
comment "grouped mark": Produces a new BAT with per group a locally unique
dense ascending sequense of OIDs in the tail. The tail of the first BAT (b)
identifies the group that each BUN of b belongs to. The second BAT (g)
represents the group extent, i.e., the head is the unique list of group IDs
from b's tail. The third argument (s) gives the base value for the new OID
sequence of each group.
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -2534,10 +2534,6 @@ command algebra.like(b:bat[:oid,:str],su
address ALGlike;
comment Selects all elements that have 'substr' as in the tail.
-command algebra.materialize(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address ALGmaterialize;
-comment Materialize the void column
-
command
algebra.mark_grp(b:bat[:any_1,:oid],g:bat[:oid,:any_2],s:oid):bat[:any_1,:oid]
address ALGmark_grp_2;
comment "grouped mark": Produces a new BAT with per group a locally unique
dense ascending sequense of OIDs in the tail. The tail of the first BAT (b)
identifies the group that each BUN of b belongs to. The second BAT (g)
represents the group extent, i.e., the head is the unique list of group IDs
from b's tail. The third argument (s) gives the base value for the new OID
sequence of each group.
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -2533,10 +2533,6 @@ command algebra.like(b:bat[:oid,:str],su
address ALGlike;
comment Selects all elements that have 'substr' as in the tail.
-command algebra.materialize(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address ALGmaterialize;
-comment Materialize the void column
-
command
algebra.mark_grp(b:bat[:any_1,:oid],g:bat[:oid,:any_2],s:oid):bat[:any_1,:oid]
address ALGmark_grp_2;
comment "grouped mark": Produces a new BAT with per group a locally unique
dense ascending sequense of OIDs in the tail. The tail of the first BAT (b)
identifies the group that each BUN of b belongs to. The second BAT (g)
represents the group extent, i.e., the head is the unique list of group IDs
from b's tail. The third argument (s) gives the base value for the new OID
sequence of each group.
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -147,8 +147,6 @@ BAT *BATleftfetchjoin(BAT *b, BAT *s, BU
BAT *BATleftjoin(BAT *l, BAT *r, BUN estimate);
BAT *BATmark(BAT *b, oid base);
BAT *BATmark_grp(BAT *b, BAT *g, oid *base);
-BAT *BATmaterialize(BAT *b);
-BAT *BATmaterializeh(BAT *b);
void *BATmax(BAT *b, void *aggr);
size_t BATmemsize(BAT *b, int dirty);
BAT *BATmergecand(BAT *a, BAT *b);
@@ -760,7 +758,6 @@ str ALGmarkHead(int *result, int *bid, o
str ALGmarkHead_default(int *result, int *bid);
str ALGmark_grp_1(int *result, int *bid, int *gid);
str ALGmark_grp_2(int *result, int *bid, int *gid, oid *base);
-str ALGmaterialize(int *ret, int *bid);
str ALGmaxany(ptr result, int *bid);
str ALGminany(ptr result, int *bid);
str ALGouterjoin(int *result, int *lid, int *rid);
@@ -2448,7 +2445,6 @@ str markHRef;
str markTRef;
str mark_grpRef;
str matRef;
-str materializeRef;
str maxRef;
str max_no_nilRef;
int mayhaveSideEffects(Client cntxt, MalBlkPtr mb, InstrPtr p, int strict);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2911,8 +2911,6 @@ gdk_export BAT *VIEWcreate_(BAT *h, BAT
gdk_export BAT *VIEWhead(BAT *b);
gdk_export BAT *VIEWhead_(BAT *b, int mode);
gdk_export BAT *VIEWcombine(BAT *b);
-gdk_export BAT *BATmaterialize(BAT *b);
-gdk_export BAT *BATmaterializeh(BAT *b);
gdk_export void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
/* low level functions */
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -76,6 +76,10 @@ void BATinit_idents(BAT *bn)
__attribute__((__visibility__("hidden")));
BAT *BATload_intern(bat bid, int lock)
__attribute__((__visibility__("hidden")));
+BAT *BATmaterialize(BAT *b)
+ __attribute__((__visibility__("hidden")));
+BAT *BATmaterializeh(BAT *b)
+ __attribute__((__visibility__("hidden")));
BAT *BATmaterializet(BAT *b)
__attribute__((__visibility__("hidden")));
str BATrename(BAT *b, const char *nme)
diff --git a/monetdb5/ChangeLog.Oct2014 b/monetdb5/ChangeLog.Oct2014
--- a/monetdb5/ChangeLog.Oct2014
+++ b/monetdb5/ChangeLog.Oct2014
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon Sep 15 2014 Sjoerd Mullender <[email protected]>
+- Removed algebra.materialize.
+
* Fri Aug 29 2014 Sjoerd Mullender <[email protected]>
- Removed algebra.kunique and algebra.tunique. They were subsumed by
algebra.subunique.
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
@@ -2201,23 +2201,6 @@ ALGidentity(int *ret, int *bid)
BBPkeepref(*ret = b->batCacheid);
return MAL_SUCCEED;
}
-str
-ALGmaterialize(int *ret, int *bid)
-{
- BAT *b, *bn;
-
- if ((b = BATdescriptor(*bid)) == NULL)
- throw(MAL, "algebra.materialize", RUNTIME_OBJECT_MISSING);
- if( b->htype == TYPE_void){
- bn= BATmaterialize(b);
- if( bn == NULL)
- throw(MAL, "algebra.materialize", MAL_MALLOC_FAIL);
- if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ);
- BBPkeepref(*ret= bn->batCacheid);
- } else
- BBPkeepref(*ret = b->batCacheid);
- return MAL_SUCCEED;
-}
str ALGreuse(int *ret, int *bid)
{
diff --git a/monetdb5/modules/kernel/algebra.h
b/monetdb5/modules/kernel/algebra.h
--- a/monetdb5/modules/kernel/algebra.h
+++ b/monetdb5/modules/kernel/algebra.h
@@ -149,6 +149,5 @@ algebra_export str ALGprojecthead(Client
algebra_export str ALGprojecttail(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
algebra_export str ALGidentity(int *ret, int *bid);
-algebra_export str ALGmaterialize(int *ret, int *bid);
algebra_export str ALGreuse(int *ret, int *bid);
#endif
diff --git a/monetdb5/modules/kernel/algebra.mal
b/monetdb5/modules/kernel/algebra.mal
--- a/monetdb5/modules/kernel/algebra.mal
+++ b/monetdb5/modules/kernel/algebra.mal
@@ -641,15 +641,6 @@ comment "\"grouped mark\": Produces a ne
from b's tail. The third argument (s) gives the base value for the new
OID sequence of each group.";
-# @+ BAT fragmentation commands
-# Various operations for splitting BATs into useful fragments.
-#
-# @- Variable management
-# It is sometimes needed to cast a type at runtime
-command materialize(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address ALGmaterialize
-comment "Materialize the void column";
-
command reuse(b:bat[:oid,:any_2]):bat[:oid,:any_2]
address ALGreuse
comment "Reuse a temporary BAT if you can. Otherwise,
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -144,7 +144,6 @@ str mapiRef;
str markHRef;
str markTRef;
str mark_grpRef;
-str materializeRef;
str mtimeRef;
str multicolumnRef;
str dense_rank_grpRef;
@@ -402,7 +401,6 @@ void optimizerInit(void)
markHRef = putName("markH", 5);
markTRef = putName("markT", 5);
mark_grpRef = putName("mark_grp", 8);
- materializeRef = putName("materialize", 11);
mtimeRef = putName("mtime", 5);
multicolumnRef = putName("multicolumn", 11);
dense_rank_grpRef = putName("dense_rank_grp", 14);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -142,7 +142,6 @@ opt_export str mapiRef;
opt_export str markHRef;
opt_export str markTRef;
opt_export str mark_grpRef;
-opt_export str materializeRef;
opt_export str mtimeRef;
opt_export str dense_rank_grpRef;
opt_export str matRef;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
