Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15273
Modified Files:
Tag: xrpcdemo
pf_support.mx serialize.mx serialize_dflt.mx xrpc_client.mx
xrpc_server.mx
Log Message:
- add an extra updating field in the participant field
- add updating as an extra parameter to print_result
- fix updating check button in GUI
U xrpc_client.mx
Index: xrpc_client.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_client.mx,v
retrieving revision 1.45.4.12
retrieving revision 1.45.4.13
diff -u -d -r1.45.4.12 -r1.45.4.13
--- xrpc_client.mx 10 Jun 2008 20:51:41 -0000 1.45.4.12
+++ xrpc_client.mx 11 Jun 2008 07:28:23 -0000 1.45.4.13
@@ -1088,7 +1088,7 @@
NULL, NULL, ws, 1,
node_item, node_item, node_item, node_kind,
int_values, dbl_values, str_values,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL);
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL);
if(BBPreclaim(node_item) == -1){
GDKerror("byvalue_request: failed to destroy BAT
\"node_item\", "
U serialize_dflt.mx
Index: serialize_dflt.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/serialize_dflt.mx,v
retrieving revision 1.46.4.9
retrieving revision 1.46.4.10
diff -u -d -r1.46.4.9 -r1.46.4.10
--- serialize_dflt.mx 10 Jun 2008 04:55:43 -0000 1.46.4.9
+++ serialize_dflt.mx 11 Jun 2008 07:28:23 -0000 1.46.4.10
@@ -1022,8 +1022,9 @@
/* XRPC participants lists for nested transactions - append an extra
item for this call */
if(ret >= 0)
ret = stream_printf(ctx->out,
- " <xrpc:participants>\n
<xrpc:participant>%s,%s:%d:"LLFMT",%s,"LLFMT"</xrpc:participant>\n",
- ctx->xrpc_caller, xrpc_hostname, xrpc_port, ctx->xrpc_seqnr,
ctx->xrpc_method, ctx->time_exec);
+ " <xrpc:participants>\n
<xrpc:participant>%s,%s:%d:"LLFMT",%s,"LLFMT",%d</xrpc:participant>\n",
+ ctx->xrpc_caller, xrpc_hostname, xrpc_port, ctx->xrpc_seqnr,
ctx->xrpc_method, ctx->time_exec,
+ (int) ctx->xrpc_updating);
/* print all nested calls (obtained from response messages) */
bi = bat_iterator(b);
U serialize.mx
Index: serialize.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/serialize.mx,v
retrieving revision 1.109.4.7
retrieving revision 1.109.4.8
diff -u -d -r1.109.4.7 -r1.109.4.8
--- serialize.mx 10 Jun 2008 10:04:46 -0000 1.109.4.7
+++ serialize.mx 11 Jun 2008 07:28:22 -0000 1.109.4.8
@@ -156,6 +156,7 @@
str xrpc_qid;
str xrpc_caller;
str xrpc_mode;
+ bit xrpc_updating;
lng xrpc_seqnr;
lng xrpc_timeout;
lng time_exec;
@@ -270,6 +271,7 @@
str xrpc_qid,
str xrpc_caller,
str xrpc_mode,
+ bit *xrpc_updating,
lng *xrpc_seqnr,
lng *xrpc_timeout,
lng *xrpc_start);
@@ -296,6 +298,7 @@
str xrpc_qid,
str xrpc_caller,
str xrpc_mode,
+ bit *xrpc_updating,
lng *xrpc_seqnr,
lng *xrpc_timeout,
lng *time_exec);
@@ -1698,6 +1701,7 @@
str xrpc_qid,
str xrpc_caller,
str xrpc_mode,
+ bit *xrpc_updating,
lng *xrpc_seqnr,
lng *xrpc_timeout,
lng *time_exec)
@@ -1721,6 +1725,7 @@
ctx->xrpc_caller = xrpc_caller;
ctx->xrpc_mode = xrpc_mode;
ctx->xrpc_seqnr = *xrpc_seqnr;
+ ctx->xrpc_updating = *xrpc_updating;
ctx->xrpc_timeout = *xrpc_timeout;
ctx->time_exec = *time_exec;
@@ -2123,6 +2128,7 @@
str xrpc_qid,
str xrpc_caller,
str xrpc_mode,
+ bit *xrpc_updating,
lng *xrpc_seqnr,
lng *xrpc_timeout,
lng *xrpc_start)
@@ -2168,6 +2174,7 @@
xrpc_qid,
xrpc_caller,
xrpc_mode,
+ xrpc_updating,
xrpc_seqnr,
xrpc_timeout,
&time_exec);
U xrpc_server.mx
Index: xrpc_server.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_server.mx,v
retrieving revision 1.68.4.15
retrieving revision 1.68.4.16
diff -u -d -r1.68.4.15 -r1.68.4.16
--- xrpc_server.mx 10 Jun 2008 20:52:33 -0000 1.68.4.15
+++ xrpc_server.mx 11 Jun 2008 07:28:23 -0000 1.68.4.16
@@ -223,8 +223,8 @@
" xrpc:module=\"%s\"\n"\
" xrpc:location=\"%s\"\n"\
" xrpc:method=\"%s\"\n"\
- " xrpc:arity=\"%lld\"\n"\
- " xrpc:iter-count=\"%lld\"\n"\
+ " xrpc:arity=\""LLFMT"\"\n"\
+ " xrpc:iter-count=\""LLFMT"\"\n"\
" xrpc:caller=\"%s:%d:"LLFMT"\"\n"\
" xrpc:mode=\"%s\"\n"\
" xrpc:updCall=\"%s\">\n"
@@ -235,8 +235,8 @@
" xrpc:module=\"%s\"\n"\
" xrpc:location=\"%s\"\n"\
" xrpc:method=\"%s\"\n"\
- " xrpc:arity=\"%lld\"\n"\
- " xrpc:iter-count=\"%lld\"\n"\
+ " xrpc:arity=\""LLFMT"\"\n"\
+ " xrpc:iter-count=\""LLFMT"\"\n"\
" xrpc:caller=\"query\"\n"\
" xrpc:mode=\"%s\"\n"\
" xrpc:updCall=\"%s\">\n"
@@ -1047,11 +1047,6 @@
*errbuf ? errbuf : "",
err == ((char*)-1) ? "no further error message" : err);
send_err(mc->c->fdout, ERR404, "env:Sender", errbuf_all);
- } else if (req->updCall) {
- /* send empty HTTP OK header for updating request */
- stream_write(mc->c->fdout, "HTTP/1.1 200 OK\r\n"
- "Content-type: text/xml; charset=\"utf-8\"\r\n\r\n", 1,
60);
- stream_flush(mc->c->fdout);
}
GDKsetbuf(errbuf_bak);
return ret;
U pf_support.mx
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.299.4.6
retrieving revision 1.299.4.7
diff -u -d -r1.299.4.6 -r1.299.4.7
--- pf_support.mx 5 Jun 2008 21:17:52 -0000 1.299.4.6
+++ pf_support.mx 11 Jun 2008 07:28:22 -0000 1.299.4.7
@@ -64,9 +64,18 @@
BAT[oid,any] loop, BAT[void,oid] iter,
BAT[void,oid] item, BAT[void,int] kind,
BAT[oid,lng] int_values, BAT[oid,dbl] dbl_values,
+ BAT[oid,str] str_values) :
+ void = xquery_print_result_basic;
+
+ "C interface to Workset result print routine, that can print multiple iters"
+.COMMAND print_result(str genType,
+ BAT[oid,bat] ws,
+ BAT[oid,any] loop, BAT[void,oid] iter,
+ BAT[void,oid] item, BAT[void,int] kind,
+ BAT[oid,lng] int_values, BAT[oid,dbl] dbl_values,
BAT[oid,str] str_values,
str xrpc_module, str xrpc_method, str xrpc_qid, str
xrpc_caller,
- str xrpc_mode, lng xrpc_seqnr, lng xrpc_timeout, lng
xrpc_start) :
+ str xrpc_mode, bit xrpc_updating, lng xrpc_seqnr, lng
xrpc_timeout, lng xrpc_start) :
void = xquery_print_result_loop;
"C interface to Workset result print routine, that can print multiple iters"
@@ -8481,6 +8490,7 @@
str xrpc_qid,
str xrpc_caller,
str xrpc_mode,
+ bit *xrpc_updating,
lng *xrpc_seqnr,
lng *xrpc_timeout,
lng *xrpc_start)
@@ -8504,12 +8514,46 @@
xrpc_qid,
xrpc_caller,
xrpc_mode,
+ xrpc_updating,
xrpc_seqnr,
xrpc_timeout,
xrpc_start);
}
int
+xquery_print_result_basic (
+ str mode,
+ BAT* ws,
+ BAT* loop,
+ BAT* iter,
+ BAT* item,
+ BAT* kind,
+ BAT* intVAL,
+ BAT* dblVAL,
+ BAT* strVAL)
+{
+ return xquery_print_result_loop (
+ mode,
+ ws,
+ loop, /* loop relation */
+ iter, /* iter relation */
+ item, /* item relation */
+ kind, /* kind relation */
+ intVAL,
+ dblVAL,
+ strVAL,
+ NULL, /* xrpc_module */
+ NULL, /* xrpc_method */
+ NULL, /* xrpc_qid */
+ NULL, /* xrpc_caller */
+ NULL, /* xrpc_mode */
+ NULL, /* xrpc_updating */
+ NULL, /* xrpc_seqnr */
+ NULL, /* xrpc_timeout */
+ NULL);/* xrpc_start */
+}
+
+int
xquery_print_result_main (
str mode,
BAT* ws,
@@ -8522,27 +8566,16 @@
{
(void) decVAL;
- return xquery_print_result_DRIVER (
+ return xquery_print_result_basic (
mode,
- NULL, /* set of printing callback function */
- NULL, /* optional arguments for the callback functions */
ws,
- 1, /* number of iterations */
item, /* loop relation */
item, /* iter relation */
item, /* item relation */
kind, /* kind relation */
intVAL,
dblVAL,
- strVAL,
- NULL, /* xrpc_module */
- NULL, /* xrpc_method */
- NULL, /* xrpc_qid */
- NULL, /* xrpc_caller */
- NULL, /* xrpc_mode */
- NULL, /* xrpc_seqnr */
- NULL, /* xrpc_timeout */
- NULL);/* xrpc_start */
+ strVAL);
}
int
@@ -8600,6 +8633,7 @@
NULL, /* xrpc_qid */
NULL, /* xrpc_caller */
NULL, /* xrpc_mode */
+ NULL, /* xrpc_updating */
NULL, /* xrpc_seqnr */
NULL, /* xrpc_timeout */
NULL);/* xrpc_start */
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
