Changeset: ef4c925429d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef4c925429d1
Modified Files:
monetdb5/modules/kernel/bat5.mal
Branch: default
Log Message:
More headless patches
diffs (truncated from 307 to 300 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
@@ -17,18 +17,6 @@
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]
@@ -43,95 +31,102 @@ comment "Returns the head-mirror image o
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)";
+comment "Puts all BUNs in a BAT in reverse order. (Belongs to the BAT
sequence module)";
-command insert(b:bat[:any_1,:any_2], src:bat[:any_1,:any_2]):bat[:any_1,:any_2]
+command insert(b:bat[:oid,:any_1], h:oid, t:any_1) :bat[:oid,:any_1]
+address BKCinsert_bun
+comment "Insert one BUN[h,t] in a BAT.";
+
+command insert(b:bat[:oid,:any_1], h:oid, t:any_1, force:bit) :bat[:oid,:any_1]
+address BKCinsert_bun_force
+comment "Insert one BUN[h,t] in a BAT.";
+
+command replace(b:bat[:oid, :any_1], h:oid, t:any_1) :bat[:oid,:any_1]
+address BKCreplace_bun
+comment "Replace the tail value of one BUN that has some head value.";
+
+command replace(b:bat[:oid, :any_1], h:oid, t:any_1, force:bit)
:bat[:oid,:any_1]
+address BKCreplace_bun_force
+comment "Replace the tail value of one BUN that has some head value.";
+
+command delete(b:bat[:oid, :any_1], h:oid, t:any_1) :bat[:oid,:any_1]
+address BKCdelete_bun
+comment "Delete one specific BUN.";
+
+# END TO BE MADE HEADLESS PLAN
+
+command order(b:bat[:oid,:any_1]) :bat[:oid,:any_1]
+address BKCorder
+comment "Sorts the BAT itself on the head, in place. ";
+
+command orderReverse(b:bat[:oid,:any_1]) :bat[:oid,:any_1]
+address BKCorder_rev
+comment "Reverse sorts the BAT itself on the head, in place. ";
+
+command insert(b:bat[:oid,:any_1], src:bat[:oid,:any_1]):bat[:oid,:any_1]
address BKCinsert_bat
comment "Insert all BUNs of the second BAT into the first.";
-command insert(b:bat[:any_1,:any_2], src:bat[:any_1,:any_2],
force:bit):bat[:any_1,:any_2]
+command insert(b:bat[:oid,:any_1], src:bat[:oid,:any_1],
force:bit):bat[:oid,:any_1]
address BKCinsert_bat_force
comment "Insert all BUNs of the second BAT into the first.";
-command insert(b:bat[:any_1,:any_2], h:any_1, t:any_2) :bat[:any_1,:any_2]
-address BKCinsert_bun
-comment "Insert one BUN[h,t] in a BAT.";
-
-command insert(b:bat[:any_1,:any_2], h:any_1, t:any_2, force:bit)
:bat[:any_1,:any_2]
-address BKCinsert_bun_force
-comment "Insert one BUN[h,t] in a BAT.";
-
-command replace(b:bat[:oid, :any_2], src:bat[:oid,:any_2]) :bat[:oid,:any_2]
+command replace(b:bat[:oid, :any_1], src:bat[:oid,:any_1]) :bat[:oid,:any_1]
address BKCreplace_bat
comment "Perform replace for all BUNs of the second BAT into the first.";
-command replace(b:bat[:oid, :any_2], src:bat[:oid,:any_2], force:bit)
:bat[:oid,:any_2]
+command replace(b:bat[:oid, :any_1], src:bat[:oid,:any_1], force:bit)
:bat[:oid,:any_1]
address BKCreplace_bat_force
comment "Perform replace for all BUNs of the second BAT into the first.";
-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[: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[:oid,:any_2], u:bat[:oid,:any_2] ) :bat[:oid,:any_2]
+command append( i:bat[:oid,:any_1], u:bat[:oid,:any_1] ) :bat[:oid,:any_1]
address BKCappend_wrap
comment "append the content of u to i";
-command append( i:bat[:oid,:any_2], u:bat[:oid,:any_2], force:bit )
:bat[:oid,:any_2]
+command append( i:bat[:oid,:any_1], u:bat[:oid,:any_1], force:bit )
:bat[:oid,:any_1]
address BKCappend_force_wrap
comment "append the content of u to i";
-command append(i:bat[:oid,:any_2], u:any_2, force:bit):bat[:oid,:any_2]
+command append(i:bat[:oid,:any_1], u:any_1, force:bit):bat[:oid,:any_1]
address BKCappend_val_force_wrap
comment "append the value u to i";
-command inplace( o:bat[:oid,:any_2], id:oid, t:any_2) :bat[:oid,:any_2]
+command inplace( o:bat[:oid,:any_1], id:oid, t:any_1) :bat[:oid,:any_1]
address BKCbun_inplace
comment "Inplace replace values on the given positions";
-command inplace( o:bat[:oid,:any_2], d:bat[:oid,:any_2]) :bat[:oid,:any_2]
+command inplace( o:bat[:oid,:any_1], d:bat[:oid,:any_1]) :bat[:oid,:any_1]
address BKCbat_inplace
comment "Inplace replace values on the given positions";
-command inplace( o:bat[:oid,:any_2], id:oid, t:any_2, force:bit)
:bat[:oid,:any_2]
+command inplace( o:bat[:oid,:any_1], id:oid, t:any_1, force:bit)
:bat[:oid,:any_1]
address BKCbun_inplace_force
comment "Inplace replace values on the given positions";
-command inplace( o:bat[:oid,:any_2], d:bat[:oid,:any_2], force:bit)
:bat[:oid,:any_2]
+command inplace( o:bat[:oid,:any_1], d:bat[:oid,:any_1], force:bit)
:bat[:oid,:any_1]
address BKCbat_inplace_force
comment "inplace replace values on the given locations";
-command delete(b:bat[:oid, :any_2], h:oid, t:any_2) :bat[:oid,:any_2]
-address BKCdelete_bun
-comment "Delete one specific BUN.";
-
-command delete(b:bat[:oid, :any_2], h:oid) :bat[:oid,:any_2]
+command delete(b:bat[:oid, :any_1], h:oid) :bat[:oid,:any_1]
address BKCdelete
comment "Delete all BUNs with a certain head value.";
-command delete(b:bat[:oid, :any_2]) :bat[:oid,:any_2]
+command delete(b:bat[:oid, :any_1]) :bat[:oid,:any_1]
address BKCdelete_all
comment "Delete all BUNs in a BAT.";
-command delete(b:bat[:any_1, :any_2], src:bat[:any_1,:any_2])
:bat[:any_1,:any_2]
+command delete(b:bat[:oid, :any_1], src:bat[:oid,:any_1]) :bat[:oid,:any_1]
address BKCdelete_bat_bun
comment "Delete from the first BAT all BUNs with a corresponding BUN
in the second.";
-command getAlpha(b:bat[:any_1,:any_2]) :bat[:any_1,:any_2]
+command getAlpha(b:bat[:oid,:any_1]) :bat[:oid,:any_1]
address BKCgetAlpha
comment "Obtain the list of BUNs added";
-command getDelta(b:bat[:any_1,:any_2]) :bat[:any_1,:any_2]
+command getDelta(b:bat[:oid,:any_1]) :bat[:oid,:any_1]
address BKCgetDelta
comment "Obtain the list of BUNs deleted";
-#END OF HEADLESS PLAN
-
command attach(tt:int, heapfile:str) :bat[:oid,:any_1]
address BKCattach
comment "Returns a new BAT with dense head and tail of the given type and uses
@@ -141,30 +136,30 @@ comment "Returns a new BAT with dense he
command densebat(sz:wrd) :bat[:oid,:oid]
address BKCdensebat
comment "Creates a new [void,void] BAT of size 'sz'.";
-command info ( b:bat[:oid,:any_2]) (:bat[:oid,:str], :bat[:oid,:str])
+
+command info ( b:bat[:oid,:any_1]) (:bat[:oid,:str], :bat[:oid,:str])
address BKCinfo
comment "Produce a table containing information about a BAT in
[attribute,value] format.
- It contains all properties of the BAT record. See the BAT
documentation
- in GDK for more information.";
+ It contains all properties of the BAT record. ";
command getSize ( b:bat[:oid,:any_1]) :lng
address BKCgetSize
comment "Calculate the actual size of the BAT descriptor, heaps, hashes and
imprint indices in bytes
rounded to the memory page size (see bbp.getPageSize()).";
-command getCapacity(b:bat[:oid,:any_2]):lng
+command getCapacity(b:bat[:oid,:any_1]):lng
address BKCgetCapacity
comment "Returns the current allocation size (in max number of elements) of a
BAT.";
-command getColumnType( b:bat[:oid,:any_2] ) :str
+command getColumnType( b:bat[:oid,:any_1] ) :str
address BKCgetColumnType
comment "Returns the type of the tail column of a BAT, as an integer type
number.";
-command getRole ( bid:bat[:oid,:any_2] ) :str
+command getRole ( bid:bat[:oid,:any_1] ) :str
address BKCgetRole
comment "Returns the rolename of the head column of a BAT.";
-command setKey( b:bat[:oid,:any_2], mode:bit) :bat[:oid,:any_2]
+command setKey( b:bat[:oid,:any_1], mode:bit) :bat[:oid,:any_1]
address BKCsetkey
comment "Sets the 'key' property of the tail column to 'mode'. In 'key' mode,
the kernel will silently block insertions that cause a duplicate
@@ -205,44 +200,44 @@ command append(i:bat[:oid,:any_1], u:any
address BKCappend_val_wrap
comment "append the value u to i";
-command setName ( b:bat[:oid,:any_2] , s:str) :void
+command setName ( b:bat[:oid,:any_1] , s:str) :void
address BKCsetName
comment "Give a logical name to a BAT. ";
-command getName ( b:bat[:oid,:any_2]) :str
+command getName ( b:bat[:oid,:any_1]) :str
address BKCgetBBPname
comment "Gives back the logical name of a BAT.";
-command setRole( b:bat[:oid,:any_2], h:str, t:str) :void
+command setRole( b:bat[:oid,:any_1], h:str, t:str) :void
address BKCsetRole
comment "Give a logical name to the columns of a BAT.";
-command setColumn( b:bat[:oid,:any_2], t:str) :void
+command setColumn( b:bat[:oid,:any_1], t:str) :void
address BKCsetColumn
comment "Give a logical name to the tail column of a BAT.";
-command setColumn( b:bat[:oid,:any_2], h:str, t:str) :void
+command setColumn( b:bat[:oid,:any_1], h:str, t:str) :void
address BKCsetColumns
comment "Give both columns of a BAT a new name.";
-command isTransient( b:bat[:oid,:any_2]) :bit
+command isTransient( b:bat[:oid,:any_1]) :bit
address BKCisTransient;
-command setTransient( b:bat[:oid,:any_2]) :void
+command setTransient( b:bat[:oid,:any_1]) :void
address BKCsetTransient
comment "Make the BAT transient. Returns
boolean which indicates if the
BAT administration has indeed changed.";
-command isPersistent( b:bat[:oid,:any_2]) :bit
+command isPersistent( b:bat[:oid,:any_1]) :bit
address BKCisPersistent;
-command setPersistent( b:bat[:oid,:any_2],f:bit) :void
+command setPersistent( b:bat[:oid,:any_1],f:bit) :void
address BKCpersists
comment "Backward compatibility";
-command setPersistent( b:bat[:oid,:any_2]) :void
+command setPersistent( b:bat[:oid,:any_1]) :void
address BKCsetPersistent
comment "Make the BAT persistent.";
-command save(nme:bat[:oid,:any_2]) :void
+command save(nme:bat[:oid,:any_1]) :void
address BKCsave2;
command save(nme:str) :bit
@@ -252,7 +247,7 @@ comment "Save a BAT to storage, if it wa
calling this function violates the atomic commit protocol!!";
-command load(name:str) :bat[:oid,:any_2]
+command load(name:str) :bat[:oid,:any_1]
address BKCload
comment "Load a particular BAT from disk";
@@ -265,12 +260,12 @@ command setCold(b:bat[:oid,:any_1]) :voi
address BKCsetColdBAT
comment "Makes a BAT very cold for the BBP. The chance of being choses
for swapout is big, afterwards.";
-command setHot(b:bat[:oid,:any_2]) :void
+command setHot(b:bat[:oid,:any_1]) :void
address BKCsetHotBAT
comment "Makes a BAT very hot for the BBP. The chance of being chosen for
swapout is small, afterwards.";
-command setMemoryMap(b:bat[:oid,:any_2], head_mode:int, tail_mode:int,
hheap_mode:int, theap_mode:int) :bit
+command setMemoryMap(b:bat[:oid,:any_1], head_mode:int, tail_mode:int,
hheap_mode:int, theap_mode:int) :bit
address BKCmmap
comment "For each individual heap, you can change the allocation mode
to either STORE_MEM or STORE_MMAP. Passing an int(nil) means:
@@ -278,19 +273,19 @@ comment "For each individual heap, you c
will cause a BAT save (this has to happen before the heap can
be mapped into virtual memory). These modes are persistent. ";
-command setMemoryMap(b:bat[:oid,:any_2], mode:int):bit
+command setMemoryMap(b:bat[:oid,:any_1], mode:int):bit
address BKCmmap2
comment "Alias for mmap(b, mode, mode, mode, mode)";
-command setHash(b:bat[:oid,:any_2]):bit
+command setHash(b:bat[:oid,:any_1]):bit
address BKCsetHash
comment "Create a hash structure on the column";
-command setImprints(b:bat[:oid,:any_2]):bit
+command setImprints(b:bat[:oid,:any_1]):bit
address BKCsetImprints
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
