Update of /cvsroot/monetdb/pathfinder/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11806
Modified Files:
Tag: M5XQ
xquery.mx xquery_serialize.mx xquery_shredder.mx
Log Message:
changing XQUERY_func* to XQUERYfunc* to have the same style as the SQL module.
added the signature of the SQL procedure for xmlshred.
U xquery.mx
Index: xquery.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/backends/monet5/Attic/xquery.mx,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- xquery.mx 28 Apr 2009 17:35:08 -0000 1.4.2.3
+++ xquery.mx 6 May 2009 15:08:59 -0000 1.4.2.4
@@ -36,54 +36,66 @@
@- XQuery shredder interface (xquery_shredder.mx)
@mal
command shred_url(doc:bat[:str,:bat], url:str, percentage:lng) : void
-address XQUERY_ShredURL
+address XQUERYShredURL
comment "Shred an XML document from a URL. Parameters: URL - document located
at this URL is shredded, percentage - a number [0,100] indicating the amount of
free space to reserve for updates (percentage=0 leads to a read-only document)"
command shred_str(doc:bat[:str,:bat], buffer:str, percentage:lng) : void
-address XQUERY_ShredStr
+address XQUERYShredStr
comment "Shred an XML document from a string. Parameters: buffer - the XML
string to shred, percentage - a number [0,100] indicating the amount of free
space to reserve for updates (percentage=0 leads to a read-only document)"
command shred_stream(doc:bat[:str,:bat], s:streams, percentage:lng) : void
-address XQUERY_ShredStream
+address XQUERYShredStream
comment "Shred an XML document from a stream. Parameters: s - XML input
stream, percentage - a number [0,100] indicating the amount of free space to
reserve for updates (percentage=0 leads to a read-only document)"
+pattern xmlshred (location:str, docname:str, colname:str, percentage:lng) :
void
+address XQueryXMLShred
+comment "wrapper for the SQL procedure to add an XML document into the SQL
catalog"
+
@- XML print functions (serialize.mx)
@mal
command print_doc(genType:str, ws:bat[:oid,:bat], docname:str) : void
-address XQUERY_PrintDocMain
+address XQUERYPrintDocMain
comment "C interface to Workset print routine"
command print_result(genType:str, ws:bat[:oid,:bat],
- loop:bat[:oid,:any], iter:bat[:oid,:oid],
item:bat[:oid,:oid], kind:bat[:oid,:int],
- int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
str_values:bat[:oid,:str]) : void
-address XQUERY_PrintResultLoop
+ loop:bat[:oid,:any], iter:bat[:oid,:oid],
+ item:bat[:oid,:oid], kind:bat[:oid,:int],
+ int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
+ str_values:bat[:oid,:str]) : void
+address XQUERYPrintResultLoop
comment "C interface to Workset result print routine, that can print multiple
iters"
command print_result(genType:str, ws:bat[:oid,:bat],
- loop:bat[:oid,:any], iter:bat[:oid,:oid],
item:bat[:oid,:oid], kind:bat[:oid,:int],
- int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
str_values:bat[:oid,:str],
- xrpc_module:str, xrpc_method:str, xrpc_qid:str,
xrpc_caller:str, xrpc_mode:str,
- xrpc_hostport:str, xrpc_updating:bit, xrpc_seqnr:lng,
xrpc_timeout:lng, xrpc_start:lng) : void
-address XQUERY_PrintResultXRPC
+ loop:bat[:oid,:any], iter:bat[:oid,:oid],
+ item:bat[:oid,:oid], kind:bat[:oid,:int],
+ int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
+ str_values:bat[:oid,:str],
+ xrpc_module:str, xrpc_method:str, xrpc_qid:str,
+ xrpc_caller:str, xrpc_mode:str,
+ xrpc_hostport:str, xrpc_updating:bit, xrpc_seqnr:lng,
+ xrpc_timeout:lng, xrpc_start:lng) : void
+address XQUERYPrintResultXRPC
comment "C interface to Workset result print routine, that can print multiple
iters"
command print_result(genType:str, ws:bat[:oid,:bat],
item:bat[:oid,:oid], kind:bat[:oid,:int],
- int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
str_values:bat[:oid,:str]) : void
-address XQUERY_PrintResultMain
+ int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
+ str_values:bat[:oid,:str]) : void
+address XQUERYPrintResultMain
comment "C interface to Workset result print routine"
command print_result(file:str, genType:str, ws:bat[:oid,:bat],
item:bat[:oid,:oid], kind:bat[:oid,:int],
- int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
str_values:bat[:oid,:str]) : void
-address XQUERY_PrintResultFile
+ int_values:bat[:oid,:lng], dbl_values:bat[:oid,:dbl],
+ str_values:bat[:oid,:str]) : void
+address XQUERYPrintResultFile
comment "C interface to Workset result print routine, but print to a file"
-command fn_deep_eq(ws:bat[:oid,:bat],
- litem:bat[:oid,:oid], lkind:bat[:oid,:int],
- ritem:bat[:oid,:oid], rkind:bat[:oid,:int]) :bat[:oid,:bit]
-address XQUERY_fn_deep_eq
+command fn_deep_eq(ws:bat[:oid,:bat],
+ litem:bat[:oid,:oid], lkind:bat[:oid,:int],
+ ritem:bat[:oid,:oid], rkind:bat[:oid,:int]) :bat[:oid,:bit]
+address XQUERYfn_deep_eq
comment "C interface to fn:deep_eq() implementation using the serializer"
@h
@@ -109,5 +121,12 @@
#endif /* _XQUERY_H */
@c
-#include "pf_config.h"
#include "xquery.h"
+#include <mal_session.h>
+
+str
+XQueryXMLShred (Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ (void) cntxt; (void) mb; (void) stk; (void) pci;
+ throw (XQUERY, "xquery.xmlshred", "not implemented yet");
+}
U xquery_shredder.mx
Index: xquery_shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/backends/monet5/Attic/xquery_shredder.mx,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- xquery_shredder.mx 28 Apr 2009 00:30:00 -0000 1.3.2.1
+++ xquery_shredder.mx 6 May 2009 15:09:03 -0000 1.3.2.2
@@ -43,9 +43,9 @@
#include "xquery.h"
/* MAL commands to shred XML from a {uri,string,stream} */
-xquery_export str XQUERY_ShredUrl(int retval, bat *doc, str location, lng
*percentage);
-xquery_export str XQUERY_ShredStr(int retval, bat *doc, str buffer, lng
*percentage);
-xquery_export str XQUERY_ShredStream(int retval, bat *doc, stream *s, lng
*percentage);
+xquery_export str XQUERYShredUrl(int retval, bat *doc, str location, lng
*percentage);
+xquery_export str XQUERYShredStr(int retval, bat *doc, str buffer, lng
*percentage);
+xquery_export str XQUERYShredStream(int retval, bat *doc, stream *s, lng
*percentage);
#endif /* _XQ_SHREDDER_H */
@c
@@ -1984,7 +1984,7 @@
}
str
-XQUERY_ShredUrl (int retval, bat *doc, str location, lng *percentage)
+XQUERYShredUrl (int retval, bat *doc, str location, lng *percentage)
{
int res;
BAT *docBAT;
@@ -2005,7 +2005,7 @@
}
str
-XQUERY_ShredStr (int retval, bat *doc, str buffer, lng *percentage)
+XQUERYShredStr (int retval, bat *doc, str buffer, lng *percentage)
{
int res;
BAT *docBAT;
@@ -2027,7 +2027,7 @@
}
str
-XQUERY_ShredStream (int retval, bat *doc, stream *s, lng *percentage)
+XQUERYShredStream (int retval, bat *doc, stream *s, lng *percentage)
{
int res;
BAT *docBAT;
U xquery_serialize.mx
Index: xquery_serialize.mx
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/backends/monet5/Attic/xquery_serialize.mx,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- xquery_serialize.mx 28 Apr 2009 00:30:00 -0000 1.1.2.1
+++ xquery_serialize.mx 6 May 2009 15:09:03 -0000 1.1.2.2
@@ -36,7 +36,7 @@
/* MAL commands to serialize XML */
xquery_export str
-XQUERY_PrintResultXRPC(
+XQUERYPrintResultXRPC(
str mode,
bat* ws_batid,
bat* loop_batid,
@@ -59,7 +59,7 @@
lng *xrpc_start);
xquery_export str
-XQUERY_PrintResultLoop(
+XQUERYPrintResultLoop(
str mode,
bat* ws_batid,
bat* loop_batid,
@@ -71,7 +71,7 @@
bat* strVAL_batid);
xquery_export str
-XQUERY_PrintResultMain(
+XQUERYPrintResultMain(
str mode,
bat* ws_batid,
bat* item_batid,
@@ -81,7 +81,7 @@
bat* strVAL_batid);
xquery_export str
-XQUERY_PrintResultFile (
+XQUERYPrintResultFile (
str file,
str mode,
bat* ws_batid,
@@ -92,13 +92,13 @@
bat* strVAL_batid);
xquery_export str
-XQUERY_PrintDocMain (
+XQUERYPrintDocMain (
str mode,
bat* ws_batid,
str docName);
xquery_export str
-XQUERY_fn_deep_eq(
+XQUERYfn_deep_eq(
bat* res_batid,
bat* ws_batid,
bat* litem_batid,
@@ -114,7 +114,7 @@
/* the main MAL wrapper with all BAT fixing/Unfixing */
static str
-XQUERY_PrintResult(
+XQUERYPrintResult(
BUN niters,
str mode,
bat* ws_batid,
@@ -210,7 +210,7 @@
}
str
-XQUERY_PrintResultXRPC(
+XQUERYPrintResultXRPC(
str mode,
bat* ws_batid,
bat* loop_batid,
@@ -242,7 +242,7 @@
assert(xrpc_seqnr);
assert(xrpc_timeout);
assert(xrpc_start);
- return XQUERY_PrintResult(0, mode,
+ return XQUERYPrintResult(0, mode,
ws_batid,
loop_batid,
iter_batid,
@@ -264,7 +264,7 @@
}
str
-XQUERY_PrintResultLoop(
+XQUERYPrintResultLoop(
str mode,
bat* ws_batid,
bat* loop_batid,
@@ -275,7 +275,7 @@
bat* dblVAL_batid,
bat* strVAL_batid)
{
- return XQUERY_PrintResult(0,
+ return XQUERYPrintResult(0,
mode,
ws_batid,
loop_batid, /* loop relation */
@@ -298,7 +298,7 @@
}
str
-XQUERY_PrintResultMain(
+XQUERYPrintResultMain(
str mode,
bat* ws_batid,
bat* item_batid,
@@ -307,7 +307,7 @@
bat* dblVAL_batid,
bat* strVAL_batid)
{
- return XQUERY_PrintResult(1,
+ return XQUERYPrintResult(1,
mode,
ws_batid,
item_batid, /* loop relation */
@@ -330,7 +330,7 @@
}
str
-XQUERY_PrintResultFile (
+XQUERYPrintResultFile (
str file,
str mode,
bat* ws_batid,
@@ -431,7 +431,7 @@
}
str
-XQUERY_PrintDocMain (
+XQUERYPrintDocMain (
str mode,
bat* ws_batid,
str docName)
@@ -452,7 +452,7 @@
}
xquery_export str
-XQUERY_fn_deep_eq(
+XQUERYfn_deep_eq(
bat* res_batid,
bat* ws_batid,
bat* litem_batid,
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
