Changeset: 207373b4ee3c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=207373b4ee3c
Modified Files:
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.mal
Branch: default
Log Message:
A few more headless oids added
diffs (96 lines):
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
@@ -1127,23 +1127,6 @@ BKCgetCapacity(lng *res, const bat *bid)
}
str
-BKCgetHeadType(str *res, const bat *bid)
-{
- const char *ret = str_nil;
-
- if (BBPcheck(*bid, "bat.getHeadType")) {
- BAT *b = lock_desc(*bid);
-
- if (b) {
- ret = *bid > 0 ? ATOMname(b->htype) :
ATOMname(b->ttype);
- }
- unlock_desc(*bid);
- }
- *res = GDKstrdup(ret);
- return MAL_SUCCEED;
-}
-
-str
BKCgetColumnType(str *res, const bat *bid)
{
const char *ret = str_nil;
diff --git a/monetdb5/modules/kernel/bat5.mal b/monetdb5/modules/kernel/bat5.mal
--- a/monetdb5/modules/kernel/bat5.mal
+++ b/monetdb5/modules/kernel/bat5.mal
@@ -20,13 +20,14 @@ module bat;
command order(b:bat[:oid,:any_2]) :bat[:oid,:any_2]
address BKCorder
comment "Sorts the BAT itself on the head, in place. ";
+
command orderReverse(b:bat[:oid,:any_2]) :bat[:oid,:any_2]
address BKCorder_rev
comment "Reverse sorts the BAT itself on the head, in place. ";
-command getHeadType(b:bat[:oid,:any_2] ) :str
-address BKCgetHeadType
-comment "Returns the type of the head column of a BAT, as an integer type
number.";
+#command getHeadType(b:bat[:oid,:any_2] ) :str
+#address BKCgetHeadType
+#comment "Returns the type of the head column of a BAT, as an integer type
number.";
#TO BE MADE HEADLESS PLAN
@@ -61,23 +62,23 @@ command insert(b:bat[:any_1,:any_2], h:a
address BKCinsert_bun_force
comment "Insert one BUN[h,t] in a BAT.";
-command replace(b:bat[:any_1, :any_2], src:bat[:any_1,:any_2])
:bat[:any_1,:any_2]
+command replace(b:bat[:oid, :any_2], src:bat[:oid,:any_2]) :bat[:oid,:any_2]
address BKCreplace_bat
comment "Perform replace for all BUNs of the second BAT into the first.";
-command replace(b:bat[:any_1, :any_2], src:bat[:any_1,:any_2], force:bit)
:bat[:any_1,:any_2]
+command replace(b:bat[:oid, :any_2], src:bat[:oid,:any_2], force:bit)
:bat[:oid,:any_2]
address BKCreplace_bat_force
comment "Perform replace for all BUNs of the second BAT into the first.";
-command replace(b:bat[:any_1, :any_2], h:any_1, t:any_2) :bat[:any_1,:any_2]
+command replace(b:bat[:oid, :any_2], h:oid, t:any_2) :bat[:oid,:any_2]
address BKCreplace_bun
comment "Replace the tail value of one BUN that has some head value.";
-command replace(b:bat[:any_1, :any_2], h:any_1, t:any_2, force:bit)
:bat[:any_1,:any_2]
+command replace(b:bat[:oid, :any_2], h:oid, t:any_2, force:bit)
:bat[:oid,:any_2]
address BKCreplace_bun_force
comment "Replace the tail value of one BUN that has some head value.";
-command append( i:bat[:any_1,:any_2], u:bat[:any_1,:any_2] )
:bat[:any_1,:any_2]
+command append( i:bat[:oid,:any_2], u:bat[:oid,:any_2] ) :bat[:oid,:any_2]
address BKCappend_wrap
comment "append the content of u to i";
@@ -91,15 +92,15 @@ comment "append the value u to i";
command inplace( o:bat[:any_1,:any_2], id:oid, t:any_2) :bat[:oid,:any_2]
address BKCbun_inplace
-comment "inplace replace values on the given locations";
+comment "Inplace replace values on the given positions";
command inplace( o:bat[:any_1,:any_2], d:bat[:any_1,:any_2])
:bat[:any_1,:any_2]
address BKCbat_inplace
-comment "inplace replace values on the given locations";
+comment "Inplace replace values on the given positions";
command inplace( o:bat[:any_1,:any_2], id:oid, t:any_2, force:bit)
:bat[:oid,:any_2]
address BKCbun_inplace_force
-comment "inplace replace values on the given locations";
+comment "Inplace replace values on the given positions";
command inplace( o:bat[:any_1,:any_2], d:bat[:any_1,:any_2], force:bit)
:bat[:any_1,:any_2]
address BKCbat_inplace_force
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
