Changeset: 489d80359136 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=489d80359136
Modified Files:
monetdb5/modules/atoms/batxml.mx
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/bbp.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/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:
The sweep continues
diffs (truncated from 2586 to 300 lines):
diff --git a/monetdb5/modules/atoms/batxml.mx b/monetdb5/modules/atoms/batxml.mx
--- a/monetdb5/modules/atoms/batxml.mx
+++ b/monetdb5/modules/atoms/batxml.mx
@@ -34,99 +34,99 @@
@{
@mal
-command xml.xml(src:bat[:oid,:str]):bat[:oid,:xml]
+command xml.xml(src:col[:str]):col[:xml]
address BATXMLstr2xml
comment "Cast the string to an xml compliant string.";
-command xml.str(src:bat[:oid,:xml]):bat[:oid,:str]
+command xml.str(src:col[:xml]):col[:str]
address BATXMLxml2str
comment "Cast the xml to a string.";
-command xml.document(src:bat[:oid,:str]):bat[:oid,:xml]
+command xml.document(src:col[:str]):col[:xml]
address BATXMLdocument
comment "Parse the string as an XML document.";
-command xml.content(src:bat[:oid,:str]):bat[:oid,:xml]
+command xml.content(src:col[:str]):col[:xml]
address BATXMLcontent
comment "Parse the string as XML element content.";
-command xml.comment(val:bat[:oid,:str]):bat[:oid,:xml]
+command xml.comment(val:col[:str]):col[:xml]
address BATXMLcomment
comment "Create an XML comment element.";
-command xml.parse(doccont:str,val:bat[:oid,:str],option:str):bat[:oid,:xml]
+command xml.parse(doccont:str,val:col[:str],option:str):col[:xml]
address BATXMLparse
comment "Parse the XML document or element string values.";
-command xml.serialize(val:bat[:oid,:xml]):bat[:oid,:str]
+command xml.serialize(val:col[:xml]):col[:str]
address BATXMLxml2str
comment "Serialize the XML object to a string.";
-command xml.text(val:bat[:oid,:xml]):bat[:oid,:str]
+command xml.text(val:col[:xml]):col[:str]
address BATXMLxmltext
comment "Serialize the XML object to a string.";
-command xml.xquery(val:bat[:oid,:str],expr:str):bat[:oid,:xml]
+command xml.xquery(val:col[:str],expr:str):col[:xml]
address BATXMLxquery
comment "Execute the XQuery against the elements.";
@-
todo
-command xml.table(val:bat[:oid,:str],expr:str):bat[:oid,:xml]
+command xml.table(val:col[:str],expr:str):col[:xml]
address BATXMLquery
comment "Execute the XQuery against the elements";
@mal
-command xml.pi(target:str, val:bat[:oid,:xml]):bat[:oid,:xml]
+command xml.pi(target:str, val:col[:xml]):col[:xml]
address BATXMLpi
comment "Construct a processing instruction.";
-command xml.attribute(name:str, val:bat[:oid,:str]):bat[:oid,:xml]
+command xml.attribute(name:str, val:col[:str]):col[:xml]
address BATXMLattribute
comment "Construct an attribute value pair.";
-command xml.element(name:str, s:bat[:oid,:xml]) :bat[:oid,:xml]
+command xml.element(name:str, s:col[:xml]) :col[:xml]
address BATXMLelementSmall
comment "The basic building block for XML elements are namespaces, attributes
and a sequence of XML elements. The name space and the attributes may be left
unspecified.";
-command xml.options(tag:str, option:str,left:bat[:oid,:xml]):bat[:oid,:xml]
+command xml.options(tag:str, option:str,left:col[:xml]):col[:xml]
address BATXMLoptions
comment "Create the components including NULL conversions.";
-command xml.element(name:str, ns:xml, attr:xml,
s:bat[:oid,:xml]):bat[:oid,:xml]
+command xml.element(name:str, ns:xml, attr:xml, s:col[:xml]):col[:xml]
address BATXMLelement
comment "The basic building block for XML elements are namespaces, attributes
and a sequence of XML elements. The name space and the attributes may be left
unspecified(=nil).";
-command xml.concat(left:bat[:oid,:xml],right:bat[:oid,:xml] ):bat[:oid,:xml]
+command xml.concat(left:col[:xml],right:col[:xml] ):col[:xml]
address BATXMLconcat
comment "Concatenate the XML values.";
-pattern xml.forest(val:bat[:oid,:xml]...):bat[:oid,:xml]
+pattern xml.forest(val:col[:xml]...):col[:xml]
address BATXMLforest
comment "Construct an element list.";
-command
xml.agg(val:bat[:oid,:xml],grp:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:xml]
+command xml.agg(val:col[:xml],grp:col[:oid],e:col[:any_1]):col[:xml]
address BATXMLagg3
comment "Aggregate the XML values over groups specified.";
-command xml.agg(val:bat[:oid,:xml],grp:bat[:oid,:oid]):bat[:oid,:xml]
+command xml.agg(val:col[:xml],grp:col[:oid]):col[:xml]
address BATXMLagg
comment "Aggregate the XML values over groups specified.";
-command xml.agg(val:bat[:oid,:xml]):xml
+command xml.agg(val:col[:xml]):xml
address BATXMLgroup
comment "Aggregate the XML values over groups specified.";
-command xml.root(val:bat[:oid,:xml], version:str,
standalone:str):bat[:oid,:xml]
+command xml.root(val:col[:xml], version:str, standalone:str):col[:xml]
address BATXMLroot
comment "Contruct the root nodes.";
-command xml.isdocument(val:bat[:oid,:str]):bat[:oid,:bit]
+command xml.isdocument(val:col[:str]):col[:bit]
address BATXMLisdocument
comment "Validate the string as a XML document.";
module batcalc;
-command xml(src:bat[:oid,:str]):bat[:oid,:xml] address BATXMLstr2xml;
+command xml(src:col[:str]):col[:xml] address BATXMLstr2xml;
@{
@include ../../modules/kernel/kprelude.mx
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -51,7 +51,6 @@
mdb.mx \
mkey.mx \
pcre.mx \
- pma.mx \
pqueue.mx \
profiler.mx \
recycle.mx \
@@ -80,7 +79,7 @@
urlbox.mx statistics.mx transaction.mx \
mal_mapi.mx sabaoth.mx remote.mx \
bpm.mx txtsim.mx recycle.mx \
- cluster.mx trader.mx replication.mx pma.mx \
+ cluster.mx trader.mx replication.mx \
tokenizer.mx zorder.mx
}
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
@@ -111,11 +111,11 @@
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";
+comment "Generate a compressed image of the column on a specific file";
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";
+comment "Obtain a temporary decompressed image of a column from a specific
file";
command truncate(b:col[:any_1],fnme:str):col[:any_1]
address CMDbbptruncate
@@ -123,7 +123,7 @@
command expand(b:col[:any_1],fnme:str):col[:any_1]
address CMDbbpexpand
-comment "Expand a compressed image of BAT heaps";
+comment "Expand a compressed image of column heaps";
pattern getObjects():col[:str]
address CMDbbpGetObjects
@@ -149,53 +149,50 @@
buffer pool
@}
@mal
-command getIndex(b:col[:any_1,:any_2]):int
+command getIndex(b:col[:any_1]):int
address CMDbbpgetIndex
comment "Retrieve the index in the BBP";
-command getHeadType() :col[:int,:str]
-address CMDbbpHeadType
-comment "Map a BAT into its head type";
-command getTailType() :col[:int,:str]
-address CMDbbpTailType
-comment "Map a BAT into its tail type";
-command getNames() :col[:int,:str]
+command getType() :col[:str]
+address CMDbbpType
+comment "Map a column into its type";
+command getNames() :col[:str]
address CMDbbpNames
-comment "Map BAT into its bbp name";
-command getRNames() :col[:int,:str]
+comment "Map column into its bbp name";
+command getRNames() :col[:str]
address CMDbbpRNames
-comment "Map a BAT into its bbp physical name";
+comment "Map a column into its bbp physical name";
-command getName( b:col[:any_1,:any_2]):str
+command getName( b:col[:any_2]):str
address CMDbbpName
comment "Map a BAT into its internal name";
-command getCount() :col[:int,:lng]
+command getCount() :col[:lng]
address CMDbbpCount
comment "Create a BAT with the cardinalities of all known BATs";
-command getRefCount() :col[:int,:int]
+command getRefCount() :col[:int]
address CMDbbpRefCount
comment "Create a BAT with the (hard) reference counts";
-command getLRefCount() :col[:int,:int]
+command getLRefCount() :col[:int]
address CMDbbpLRefCount
comment "Create a BAT with the logical reference counts";
-command getLocation() :col[:int,:str]
+command getLocation() :col[:str]
address CMDbbpLocation
comment "Create a BAT with their disk locations";
-command getHeat() :col[:int,:int]
+command getHeat() :col[:int]
address CMDbbpHeat
comment "Create a BAT with the heat values";
-command getDirty() :col[:int,:str]
+command getDirty() :col[:str]
address CMDbbpDirty
comment "Create a BAT with the dirty/ diffs/clean status";
-command getStatus() :col[:int,:str]
+command getStatus() :col[:str]
address CMDbbpStatus
comment "Create a BAT with the disk/load status";
-command getKind():col[:int,:str]
+command getKind():col[:str]
address CMDbbpKind
comment "Create a BAT with the persistency status";
-command getRefCount(b:col[:any_1,:any_2]) :int
+command getRefCount(b:col[:any_1]) :int
address CMDgetBATrefcnt
comment "Utility for debugging MAL interpreter";
-command getLRefCount(b:col[:any_1,:any_2]) :int
+command getLRefCount(b:col[:any_1]) :int
address CMDgetBATlrefcnt
comment "Utility for debugging MAL interpreter";
command getDiskSpace() :lng
diff --git a/monetdb5/modules/mal/bpm.mx b/monetdb5/modules/mal/bpm.mx
--- a/monetdb5/modules/mal/bpm.mx
+++ b/monetdb5/modules/mal/bpm.mx
@@ -28,12 +28,12 @@
The BAT partition manager (BPM) module is designed to
support this strategy using range- and hash-partitioning.
-Consider we want to reorganize R:col[:oid,:int] into two partitions,
+Consider we want to reorganize R:col[:int] into two partitions,
based on splitting by tail value.
The following MAL program illustrates the snippet of actions needed:
@example
bpm.open();
-Ralias:= bpm.deposit("myversion",R:col[:oid,:int]);
+Ralias:= bpm.deposit("myversion",R:col[:int]);
bpm.rangePartition(Ralias,nil:int,100);
bpm.rangePartition(Ralias,101,200);
bpm.close();
@@ -52,7 +52,7 @@
Its argument is the number of hash bucket bits.
@example
bpm.open();
-Rev:= bat.reverse(R:col[:oid,:int]);
+Rev:= bat.reverse(R:col[:int]);
Ralias:= bpm.deposit("myHashVersion",Rev); # creates side effects
bpm.hashPartition(Ralias,2);
bpm.close();
@@ -83,7 +83,7 @@
results in the accumulator BAT U.
@example
bpm.open();
- Ralias:col[:oid,:int]:= bpm.take("myversion");
+ Ralias:col[:int]:= bpm.take("myversion");
U:= bat.new(:oid,:int);
barrier Rp:= bpm.newIterator(Ralias);
...
@@ -104,17 +104,17 @@
based on a known number of partitions:
@example
bpm.open();
- R:col[:oid,:int]:= bpm.take("myversion"); # get the partition alias
+ R:col[:int]:= bpm.take("myversion"); # get the partition alias
optimizer.mergetable();
T:= algebra.select(R,0,100);
@end example
is translated to the plan:
@example
bpm.open();
- R:col[:oid,:int]:= bpm.take("myversion"); # get the partition alias
- R0:col[:oid,:int]:= bpm.take(R,0, nil:oid,nil:oid, 0,100);
- R1:col[:oid,:int]:= bpm.take(R,1, nil:oid,nil:oid, 101,200);
- R2:col[:oid,:int]:= bpm.take(R,2, nil:oid,nil:oid, 201,nil:int);
+ R:col[:int]:= bpm.take("myversion"); # get the partition alias
+ R0:col[:int]:= bpm.take(R,0, nil:oid,nil:oid, 0,100);
+ R1:col[:int]:= bpm.take(R,1, nil:oid,nil:oid, 101,200);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
