Changeset: 84d05815e233 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84d05815e233
Modified Files:
monetdb5/modules/mal/algebraExtensions.mx
monetdb5/modules/mal/attach.mx
monetdb5/modules/mal/batExtensions.mx
monetdb5/modules/mal/bbp.mx
monetdb5/modules/mal/box.mx
monetdb5/modules/mal/bpm.mx
monetdb5/modules/mal/chopper.mx
monetdb5/modules/mal/clients.mx
monetdb5/modules/mal/cluster.mx
monetdb5/modules/mal/constraints.mx
monetdb5/modules/mal/factories.mx
monetdb5/modules/mal/groupby.mx
monetdb5/modules/mal/inspect.mx
monetdb5/modules/mal/language.mx
monetdb5/modules/mal/mal_io.mx
monetdb5/modules/mal/mal_mapi.mx
monetdb5/modules/mal/manual.mx
monetdb5/modules/mal/mat.mx
monetdb5/modules/mal/mdb.mx
monetdb5/modules/mal/mkey.mx
monetdb5/modules/mal/pcre.mx
monetdb5/modules/mal/pma.mx
monetdb5/modules/mal/pqueue.mx
monetdb5/modules/mal/profiler.mx
monetdb5/modules/mal/remote.mx
monetdb5/modules/mal/replication.mx
monetdb5/modules/mal/statistics.mx
monetdb5/modules/mal/tablet.mx
monetdb5/modules/mal/tokenizer.mx
monetdb5/modules/mal/transaction.mx
monetdb5/modules/mal/txtsim.mx
monetdb5/modules/mal/urlbox.mx
monetdb5/modules/mal/zorder.mx
Branch: headless
Log Message:
A few more sqeeping statements
diffs (truncated from 1978 to 300 lines):
diff --git a/monetdb5/modules/mal/algebraExtensions.mx
b/monetdb5/modules/mal/algebraExtensions.mx
--- a/monetdb5/modules/mal/algebraExtensions.mx
+++ b/monetdb5/modules/mal/algebraExtensions.mx
@@ -26,10 +26,10 @@
module.
@mal
-pattern algebra.project( b:bat[:any_1,:any_3], val:any_2) :bat[:any_1,:any_2]
+pattern algebra.project( b:col[:any_1], val:any_2) :col[:any_2]
address ALGprojectCst
comment "Fill the tail column with a newly typed constant.";
-pattern algebra.project(b:bat[:any_1,:any_3], val:bat[:any_1,:any_2])
:bat[:any_1,:any_2]
+pattern algebra.project(b:col[:any_1], val:col[:any_2]) :col[:any_2]
address ALGprojectCst
comment "Fill the tail column with a constant taken from the aligned BAT.";
diff --git a/monetdb5/modules/mal/attach.mx b/monetdb5/modules/mal/attach.mx
--- a/monetdb5/modules/mal/attach.mx
+++ b/monetdb5/modules/mal/attach.mx
@@ -38,15 +38,15 @@
@mal
module attach;
-pattern bind(nme:str,low:oid,hgh:oid):bat[:any_1,:any_2]
+pattern bind(nme:str,low:oid,hgh:oid):col[:any_2]
address ATTbindPartition
comment "Find a cheap way to make a BAT partition accessible locally";
-pattern bind(nme:str):bat[:any_1,:any_2]
+pattern bind(nme:str):col[:any_1]
address ATTbind
comment "Find a cheap way to make the BAT nme accessible locally";
-command location(b:bat[:any_1,:any_2]):str
+command location(b:col[:any_1]):str
address ATTlocation
comment "Locate the base of a particulat BAT in the dbfarm";
@{
diff --git a/monetdb5/modules/mal/batExtensions.mx
b/monetdb5/modules/mal/batExtensions.mx
--- a/monetdb5/modules/mal/batExtensions.mx
+++ b/monetdb5/modules/mal/batExtensions.mx
@@ -33,58 +33,51 @@
access the runtime stack to (push)pull the values needed.
@mal
-pattern bat.new(ht:any_1, tt:any_2, b:bat[:any_3,:any_4]) :bat[:any_1,:any_2]
-address CMDBATclone
-comment "Creates a new empty transient BAT by cloning another.";
-pattern bat.new(ht:any_1, tt:any_2) :bat[:any_1,:any_2]
+pattern column.new(ht:any_1) :col[:any_1]
address CMDBATnew
-comment "Creates a new empty transient BAT,
- with head- and tail-types as indicated.";
-pattern bat.new(ht:any_1, tt:any_2, size:int) :bat[:any_1,:any_2]
+comment "Creates a new empty transient column,
+ with type as indicated.";
+pattern column.new(ht:any_1, size:int) :col[:any_1]
address CMDBATnewint
comment "Creates a new BAT with sufficient space.";
-pattern bat.new(ht:any_1, tt:any_2, size:lng) :bat[:any_1,:any_2]
+pattern column.new(ht:any_1, size:lng) :col[:any_1]
address CMDBATnew
comment "Creates a new BAT and allocate space.";
-pattern bat.new(ht:oid, tt:any_2, size:int) :bat[:oid,:any_2]
-address CMDBATnewint;
-pattern bat.new(ht:oid, tt:any_2, size:lng) :bat[:oid,:any_2]
-address CMDBATnew;
-pattern bat.new(b:bat[:any_1,:any_2] ) :bat[:any_1,:any_2]
+pattern column.new(b:col[:any_1] ) :col[:any_1]
address CMDBATnewDerived;
-pattern bat.new(b:bat[:any_1,:any_2], size:lng) :bat[:any_1,:any_2]
+pattern column.new(b:col[:any_1], size:lng) :col[:any_1]
address CMDBATnewDerived;
-command bat.new(nme:str):bat[:any_1,:any_2]
+command column.new(nme:str):col[:any_1]
address CMDBATderivedByName
comment "Localize a bat by name and produce a clone.";
-command bat.reduce(b:bat[:any_1,:any_2]):bat[:any_1,:any_2]
+command column.reduce(b:col[:any_1]):col[:any_1]
address CMDBATreduce
comment "Drop auxillary BAT structures.";
-command bat.flush(b:bat[:any_1,:any_2]):void
+command column.flush(b:col[:any_1]):void
address CMDBATflush
comment "Designate a BAT as not needed anymore.";
-pattern bat.setGarbage(b:bat[:any_1,:any_2]):void
+pattern column.setGarbage(b:col[:any_1]):void
address CMDBATsetGarbage
comment "Designate a BAT as garbage.";
-pattern bat.partition(b:bat[:any_1,:any_2]):bat[:any_1,:any_2]...
+pattern column.partition(b:col[:any_1]):col[:any_1]...
address CMDbatpartition
comment "Create a series of cheap slices over the first argument. The BUNs are
distributed evenly.";
-pattern
bat.partition(b:bat[:any_1,:any_2],pieces:int,part:int):bat[:any_1,:any_2]
+pattern column.partition(b:col[:any_1],pieces:int,part:int):col[:any_1]
address CMDbatpartition2
comment "Create a series of cheap slices over the first argument. The BUNs are
distributed evenly.";
-pattern bat.unpack(b:bat[:any_1,:any_2])(h:any_1,t:any_2)
+pattern column.unpack(b:col[:any_1])(h:any_1,t:any_2)
address CMDbatunpack
comment "Extract the first tuple from a BAT.";
-pattern bat.pack(h:any_1,t:any_2):bat[:any_1,:any_2]
+pattern column.pack(t:any_1):col[:any_1]
address CMDbatpack
comment "Pack a pair of values into a BAT.";
-pattern bat.setBase(b:bat[:any_1,:any_2],c:bat[:any_1,:any_2]...):void
+pattern column.setBase(b:col[:any_1],c:col[:any_1]...):void
address CMDsetBase
comment "Give the non-empty BATs consecutive oid bases.";
@@ -116,7 +109,6 @@
be_export str CMDBATsetGarbage(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
be_export str CMDBATflush(int *res, int *bid);
be_export str CMDBATreduce(int *ret, int *bid);
-be_export str CMDBATclone(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
be_export str CMDBATnew(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
be_export str CMDBATnewDerived(Client cntxt, MalBlkPtr m, MalStkPtr s,
InstrPtr p);
be_export str CMDBATderivedByName(int *ret, str *nme);
@@ -215,43 +207,6 @@
@+ BAT enhancements
The code to enhance the kernel.
@c
-str
-CMDBATclone(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p)
-{
- BAT *b, *bn;
- int bid = 0, ht, tt;
- int *res;
- BUN cap;
-
- (void) m;
- (void) cntxt;
-
- bid = *(int *) getArgReference(s, p, 3);
- if ((b = BATdescriptor(bid)) == NULL) {
- throw(MAL, "bat.new", INTERNAL_BAT_ACCESS);
- }
- res = (int *) getArgReference(s, p, 0);
- ht = getArgType(m, p, 1);
- tt = getArgType(m, p, 2);
- cap = BATcount(b) + 64;
-@-
-Cloning should include copying of the properties.
-@c
- BBPunfix(b->batCacheid);
- bn= BATnew(ht,tt,cap);
- if( bn == NULL){
- BBPunfix(b->batCacheid);
- throw(MAL,"bat.new", INTERNAL_OBJ_CREATE);
- }
- if( b->hseqbase)
- BATseqbase(bn, b->hseqbase);
- bn->hkey= b->hkey;
- bn->tkey= b->tkey;
- bn->hsorted= b->hsorted;
- bn->tsorted= b->tsorted;
- BBPkeepref(*res = bn->batCacheid);
- return MAL_SUCCEED;
-}
str
CMDBATnew(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p)
diff --git a/monetdb5/modules/mal/bbp.mx b/monetdb5/modules/mal/bbp.mx
--- a/monetdb5/modules/mal/bbp.mx
+++ b/monetdb5/modules/mal/bbp.mx
@@ -52,16 +52,16 @@
command destroy():void
address CMDbbpdestroy
comment "Destroy the box";
-pattern take(name:str) :bat[:any_1,:any_2]
+pattern take(name:str) :col[:any_t]
address CMDbbptake
comment "Load a particular bat.";
-pattern deposit(name:str,v:bat[:any_1,:any_2]) :void
+pattern deposit(name:str,v:col[:any_1]) :void
address CMDbbpdeposit
comment "Enter a new bat into the bbp box.";
-pattern deposit(name:str,loc:str) :bat[:any_1,:any_2]
+pattern deposit(name:str,loc:str) :col[:any_1]
address CMDbbpbindDefinition
comment "Relate a logical name to a physical BAT in the buffer pool.";
-command commit(b:bat[:any_1,:any_2]):void
+command commit(b:col[:any_1]):void
address CMDbbpSubCommit
comment "Commit updates for single BAT.";
pattern commit():void
@@ -70,16 +70,16 @@
pattern releaseAll():void
address CMDbbpReleaseAll
comment "Commit updates for this client.";
-pattern release(name:str,val:bat[:any_1,:any_2]) :void
+pattern release(name:str,val:col[:any_1]) :void
address CMDbbprelease
comment "Commit updates and release this BAT.";
-pattern release(b:bat[:any_1,:any_2]):void
+pattern release(b:col[:any_1]):void
address CMDbbpreleaseBAT
comment "Remove the BAT from further consideration";
-pattern destroy(b:bat[:any_1,:any_2]):void
+pattern destroy(b:col[:any_1]):void
address CMDbbpdestroyBAT1
comment "Schedule a BAT for removal at session end.";
-pattern destroy(b:bat[:any_1,:any_2],immediate:bit)
+pattern destroy(b:col[:any_1],immediate:bit)
address CMDbbpdestroyBAT
comment "Schedule a BAT for removal at session end or immediately.";
pattern toString(name:str):str
@@ -97,35 +97,35 @@
address CMDbbpprelude
comment "Initialize the bbp box.";
-pattern bind(name:str):bat[:any_1,:any_2]
+pattern bind(name:str):col[:any_1]
address CMDbbpbind
comment "Locate the BAT using its logical name";
-pattern bind(head:str,tail:str):bat[:any_1,:any_2]
+pattern bind(head:str,tail:str):col[:any_1]
address CMDbbpbind2
comment "Locate the BAT using the head and tail names in the BAT buffer pool");
-pattern bind(idx:int):bat[:any_1,:any_2]
+pattern bind(idx:int):col[:any_1]
address CMDbbpbindindex
comment "Locate the BAT using its BBP index in the BAT buffer pool";
-command compress(b:bat[:any_1,:any_2],fnme:str):bat[:any_1,:any_2]
+command compress(b:col[:any_1],fnme:str):col[:any_1]
address CMDbbpcompress
comment "Generate a compressed image of the BAT on a specific file";
-command decompress(b:bat[:any_1,:any_2],fnme:str):bat[:any_1,:any_2]
+command decompress(b:col[:any_1],fnme:str):col[:any_1]
address CMDbbpdecompress
comment "Obtain a temporary decompressed image of a BAT from a specific file";
-command truncate(b:bat[:any_1,:any_2],fnme:str):bat[:any_1,:any_2]
+command truncate(b:col[:any_1],fnme:str):col[:any_1]
address CMDbbptruncate
comment "Truncate the heaps if a compressed image exist";
-command expand(b:bat[:any_1,:any_2],fnme:str):bat[:any_1,:any_2]
+command expand(b:col[:any_1],fnme:str):col[:any_1]
address CMDbbpexpand
comment "Expand a compressed image of BAT heaps";
-pattern getObjects():bat[:int,:str]
+pattern getObjects():col[:str]
address CMDbbpGetObjects
comment "View of the box content.";
@@ -149,53 +149,53 @@
buffer pool
@}
@mal
-command getIndex(b:bat[:any_1,:any_2]):int
+command getIndex(b:col[:any_1,:any_2]):int
address CMDbbpgetIndex
comment "Retrieve the index in the BBP";
-command getHeadType() :bat[:int,:str]
+command getHeadType() :col[:int,:str]
address CMDbbpHeadType
comment "Map a BAT into its head type";
-command getTailType() :bat[:int,:str]
+command getTailType() :col[:int,:str]
address CMDbbpTailType
comment "Map a BAT into its tail type";
-command getNames() :bat[:int,:str]
+command getNames() :col[:int,:str]
address CMDbbpNames
comment "Map BAT into its bbp name";
-command getRNames() :bat[:int,:str]
+command getRNames() :col[:int,:str]
address CMDbbpRNames
comment "Map a BAT into its bbp physical name";
-command getName( b:bat[:any_1,:any_2]):str
+command getName( b:col[:any_1,:any_2]):str
address CMDbbpName
comment "Map a BAT into its internal name";
-command getCount() :bat[:int,:lng]
+command getCount() :col[:int,:lng]
address CMDbbpCount
comment "Create a BAT with the cardinalities of all known BATs";
-command getRefCount() :bat[:int,:int]
+command getRefCount() :col[:int,:int]
address CMDbbpRefCount
comment "Create a BAT with the (hard) reference counts";
-command getLRefCount() :bat[:int,:int]
+command getLRefCount() :col[:int,:int]
address CMDbbpLRefCount
comment "Create a BAT with the logical reference counts";
-command getLocation() :bat[:int,:str]
+command getLocation() :col[:int,:str]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
