Update of /cvsroot/monetdb/pathfinder/compiler/xmlimport
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14484/xmlimport
Modified Files:
xml2lalg.c xml2lalg_converters.c
Log Message:
-- Implemented generic function application facility (for the logical algebra).
Generic functions can now be implemented in the logical algebra using
the following 4 operators:
o la_fun_call:
The head of a function call whose left child is the loop relation and the
right child a function parameter list. The operator is prepared for a set
of different kinds (e.g., xrpc and tijah), stores the function name and a
pointer to an arbitrary context (for XRPC this is a reference to the core
apply node).
o la_fun_param:
An item of the function parameter list refering to an algebra expression
(left child) and to the rest of the function parameter list (right child).
Its schema stores the names of all input columns. The order of columns
in the schema is important!
o la_fun_frag_param:
An item of the function parameter list refering to a fragment (left child)
and to the rest of the function parameter list (right child). It has a
further position argument that indicates to which column of the next
la_fun_param operator in the right child the fragment information refers
to. This operator is only used if a column contains node references.
o la_frag_extract:
If a function call returns nodes a frag_extract operator sits on top of
the la_fun_call operator to fix the fragment information needed by our
compilation scheme. Similar to the la_fun_frag_param operator it stores
the schema position of the item column it refers to.
Index: xml2lalg.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/xmlimport/xml2lalg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xml2lalg.c 10 Dec 2007 15:10:05 -0000 1.6
+++ xml2lalg.c 13 Dec 2007 13:08:19 -0000 1.7
@@ -1811,6 +1811,20 @@
/******************************************************************************/
/******************************************************************************/
+ case la_frag_extract :
+
+ {
+ newAlgNode = PFla_frag_extract
+ (
+ CHILDNODE(0),
+ PFLA_ATT("/content/column/@reference")
+ );
+ }
+ break;
+
+/******************************************************************************/
+/******************************************************************************/
+
case la_frag_union :
{
@@ -1977,6 +1991,36 @@
/******************************************************************************/
/******************************************************************************/
+ case la_fun_call :
+
+ {
+ PFoops (OOPS_FATAL, "Importing of la_fun_call operator is not
implemented yet");
+ }
+ break;
+
+/******************************************************************************/
+/******************************************************************************/
+
+ case la_fun_param :
+
+ {
+ PFoops (OOPS_FATAL, "Importing of la_fun_param operator is not
implemented yet");
+ }
+ break;
+
+/******************************************************************************/
+/******************************************************************************/
+
+ case la_fun_frag_param :
+
+ {
+ PFoops (OOPS_FATAL, "Importing of la_fun_frag_param operator is
not implemented yet");
+ }
+ break;
+
+/******************************************************************************/
+/******************************************************************************/
+
case la_proxy :
{
Index: xml2lalg_converters.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/xmlimport/xml2lalg_converters.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xml2lalg_converters.c 6 Dec 2007 08:42:44 -0000 1.4
+++ xml2lalg_converters.c 13 Dec 2007 13:08:19 -0000 1.5
@@ -403,6 +403,14 @@
{
return la_rec_base;
}
+ else if (strcmp(s, "function call") == 0)
+ {
+ return la_fun_call;
+ }
+ else if (strcmp(s, "function call parameter") == 0)
+ {
+ return la_fun_param;
+ }
else if (strcmp(s, "proxy") == 0)
{
return la_proxy;
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
