Changeset: 2f007bc52f71 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f007bc52f71
Modified Files:
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
Branch: default
Log Message:
Merger of old patches
diffs (76 lines):
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
@@ -16,6 +16,18 @@
# All Rights Reserved.
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.";
+
#TO BE MADE HEADLESS PLAN
command reverse(b:bat[:any_1,:any_2]) :bat[:any_2,:any_1]
@@ -28,22 +40,11 @@ command mirror(b:bat[:any_1,:any_2]) :ba
address BKCmirror
comment "Returns the head-mirror image of a BAT (two head columns).";
-command order(b:bat[:any_1,:any_2]) :bat[:any_1,:any_2]
-address BKCorder
-comment "Sorts the BAT itself on the head, in place. ";
-command orderReverse(b:bat[:any_1,:any_2]) :bat[:any_1,:any_2]
-address BKCorder_rev
-comment "Reverse sorts the BAT itself on the head, in place. ";
-
command revert(b:bat[:any_1,:any_2]) :bat[:any_1,:any_2]
address BKCrevert
comment "Puts all BUNs in a BAT in reverse order. (Belongs to the
BAT sequence module)";
-command getHeadType(b:bat[:any_1,:any_2] ) :str
-address BKCgetHeadType
-comment "Returns the type of the head column of a BAT, as an integer type
number.";
-
command insert(b:bat[:any_1,:any_2], src:bat[:any_1,:any_2]):bat[:any_1,:any_2]
address BKCinsert_bat
comment "Insert all BUNs of the second BAT into the first.";
@@ -75,15 +76,16 @@ comment "Replace the tail value of one B
command replace(b:bat[:any_1, :any_2], h:any_1, t:any_2, force:bit)
:bat[:any_1,: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]
address BKCappend_wrap
comment "append the content of u to i";
-command append( i:bat[:any_1,:any_2], u:bat[:any_1,:any_2], force:bit )
:bat[:any_1,:any_2]
+command append( i:bat[:oid,:any_2], u:bat[:oid,:any_2], force:bit )
:bat[:oid,:any_2]
address BKCappend_force_wrap
comment "append the content of u to i";
-command append(i:bat[:any_1,:any_2], u:any_2, force:bit):bat[:any_1,:any_2]
+command append(i:bat[:oid,:any_2], u:any_2, force:bit):bat[:oid,:any_2]
address BKCappend_val_force_wrap
comment "append the value u to i";
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -17,7 +17,7 @@ stdout of test 'inspect05` in directory
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-
+!TypeException:user.main[7]:'algebra.ssort' undefined in: f2:any :=
algebra.ssort(f1:bat[:str,:oid])
function user.main():void;
#Illustrate the modules loaded after start
k := inspect.getKind();
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
