Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9816
Modified Files:
Tag: xquery-decomposition
pathfinder.mx rt_projection.mx xrpc_client.mx xrpc_server.mx
Log Message:
yesterday's fix. to get things running.
Index: xrpc_client.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_client.mx,v
retrieving revision 1.41.2.14
retrieving revision 1.41.2.15
diff -u -d -r1.41.2.14 -r1.41.2.15
--- xrpc_client.mx 13 Mar 2008 03:12:36 -0000 1.41.2.14
+++ xrpc_client.mx 14 Mar 2008 12:11:01 -0000 1.41.2.15
@@ -1430,21 +1430,17 @@
/* Stop timing Network Send Client2Server */
time_xrpcClnt2Serv= GDKusec() - time_xrpcClnt2Serv;
- lng time_remoteExec = GDKusec();
shredBAT = response2bat(sock, dst, port, b, *updCall);
- time_remoteExec = GDKusec() - time_remoteExec;
if (options && strstr(options, "timing")) {
stream_printf(GDKout,
"XRPC_Data_Sent: " SZFMT " bytes\n"
" XRPC_Fragments_Size: " SZFMT " bytes\n"
"XRPC_Client_Serialisation (create_req_msg): %10.2f msec\n"
- "XRPC_Network_Client_2_Server: %10.2f msec\n"
- "XRPC_Remote_Execution_Total (response2bat): %10.2f msec\n",
+ "XRPC_Network_Client_2_Server: %10.2f msec\n",
bytes_sent, (b->pos - bytes_prj),
(time_xrpcClntSeria/1000.0),
- (time_xrpcClnt2Serv/1000.0),
- (time_remoteExec/1000.0));
+ (time_xrpcClnt2Serv/1000.0));
}
clean_up(-1, out, bs, argcnt, iterc, pm);
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.391.2.10
retrieving revision 1.391.2.11
diff -u -d -r1.391.2.10 -r1.391.2.11
--- pathfinder.mx 11 Mar 2008 03:59:41 -0000 1.391.2.10
+++ pathfinder.mx 14 Mar 2008 12:10:56 -0000 1.391.2.11
@@ -6117,7 +6117,7 @@
}
time_xrpcServApp = GDKusec() - time_xrpcServApp;
-#if 0
+
/* this timing seems not accurate/correct */
if (flags&1){
/* print timing ourselves */
@@ -6127,7 +6127,6 @@
(*ctx->time_shred + *ctx->time_compile +
*ctx->time_exec)/1000.0,
*ctx->time_print/1000.0);
}
-#endif
if (s) {
stream_close(ctx->fderr);
Index: xrpc_server.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_server.mx,v
retrieving revision 1.58.2.12
retrieving revision 1.58.2.13
diff -u -d -r1.58.2.12 -r1.58.2.13
--- xrpc_server.mx 13 Mar 2008 03:12:36 -0000 1.58.2.12
+++ xrpc_server.mx 14 Mar 2008 12:11:05 -0000 1.58.2.13
@@ -976,6 +976,7 @@
/* Post-processing: transform each "xrpc:fragment" node into a
* document node and invalidate all nodes above them */
+ BATsetcount(frag_root, 0);
if(!isSimpleParam){
oid start_invalidate = 0;
for(i = 0; (size_t)i < nrFrags; i++){
@@ -1048,8 +1049,6 @@
* Again, print time info at the XRPC server side, but is usually
* not used.
*/
- lng time_servExec = GDKusec();
-
stream_printf(mc->c->fdout, "HTTP/1.1 200 OK\r\n"
"Content-type: text/xml; "
"charset=\"utf-8\"\r\n\r\n");
@@ -1069,12 +1068,6 @@
stream_flush(mc->c->fdout);
GDKsetbuf(errbuf_bak);
- time_servExec = GDKusec() - time_servExec;
- if(timing) {
- fprintf(stdout, "XRPC_Server_Execution: %10.2f msec\n",
- (time_servExec/1000.0));
- }
-
return GDK_SUCCEED;
}
Index: rt_projection.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Attic/rt_projection.mx,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- rt_projection.mx 13 Mar 2008 03:12:35 -0000 1.1.2.18
+++ rt_projection.mx 14 Mar 2008 12:10:59 -0000 1.1.2.19
@@ -248,7 +248,6 @@
"cp2Container: contIDnew MUST be larger than contIDfrom\n");
wsbi = bat_iterator(ws);
- //for(off = MAP_PID; off <= ATTR_OWN_SHARED; off++){
for(off = MAP_PID; off <= _ATTR_PROP; off++){
BUNfndVOID(wsbun, wsbi, (ptr)&off);
if(wsbun == BUN_NONE) {
@@ -263,6 +262,7 @@
return -1;
}
bi = bat_iterator(wsbat);
+ batid = int_nil;
switch(off){
case PRE_SIZE:
batid = BBPcacheid(pre_size);
@@ -279,6 +279,14 @@
case PRE_NID:
batid = BBPcacheid(pre_nid);
break;
+ /* the ws bats do *not* contain one bat for every
+ * cont -- they are filled with oter kind of data
+ */
+ case OPEN_NAME:
+ case OPEN_DOCID:
+ case OPEN_CONT:
+ case CONT_LOCKED:
+ break;
default: /* copy other ws BATs */
if(BATcount(wsbat) >0) {
BUNfndVOID(bun, bi, (ptr)&contIDfrom);
@@ -290,8 +298,6 @@
return GDK_FAIL;
}
batid = *(bat*)BUNtail(bi, bun);
- } else {
- batid = int_nil;
}
break;
}
@@ -811,7 +817,7 @@
push(&stk, pre);
/* since this pre is already written to output,
* remember its offset in output */
- stk.off[stk.depth-1] = BATcount(res[0]) - 1;
+ stk.off[stk.depth-1] = off - 1;
pre = skipholes(pre+1, pre_size);
}
} else {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
