Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15356/runtime
Modified Files:
pf_support.mx shredder.mx xrpc_client.mx xrpc_server.mx
Log Message:
propagated changes of Tuesday Feb 27 2007 - Wednesday Feb 28 2007
from the XQuery_0-16 branch to the development trunk
Index: xrpc_client.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_client.mx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- xrpc_client.mx 27 Feb 2007 09:59:11 -0000 1.13
+++ xrpc_client.mx 28 Feb 2007 14:45:43 -0000 1.14
@@ -437,7 +437,7 @@
time_xrpcClntDeSeria := usec() - time_xrpcClntDeSeria;
if (options.search("timing") >= 0) {
- printf("XRPC_Client_DeSerialisation: %lld microsec\n\n",
+ printf("XRPC_Client_DeSerialisation: %lld microsec\n",
time_xrpcClntDeSeria);
}
@@ -1149,6 +1149,8 @@
}
return GDK_FAIL;
}
+ } else {
+ ptr = b->buf;
}
time_xrpcClntDeSeria = GDKusec() - time_xrpcClntDeSeria;
@@ -1156,23 +1158,28 @@
stream_printf(GDKout,
"XRPC_Client_Serialisation: %lld microsec\n"
"XRPC_Network_Client_2_Server: %lld microsec\n"
- "XRPC_Client_DeSerialisation: %lld microsec\n"
- "\n"
- "XRPC_Data_Sent: " SZFMT " bytes\n"
- "XRPC_Data_Received: " SZFMT " bytes\n\n",
+ "XRPC_Data_Sent/Received: " SZFMT " / "
+ SZFMT " bytes\n\n",
time_xrpcClntSeria,
time_xrpcClnt2Serv,
- time_xrpcClntDeSeria,
- bytes_sent,
- bytes_received);
+ bytes_sent, bytes_received);
}
- if( (ptr+= 2) && strstr(ptr, "XRPC_Server_Timing") ){
- ptr += 19;
+ ptr = strstr(ptr, "XRPC_Server_Timing");
+ if (ptr) {
+ ptr += 18; /* Skip "XRPC_Server_Timing" */
+ /* Find the start of the real timing info */
+ ptr = strstr(ptr, "XRPC");
stream_printf(GDKout, strstr(ptr, "XRPC_"));
stream_printf(GDKout, "\n");
}
+ if (options && strstr(options, "timing")) {
+ stream_printf(GDKout,
+ "XRPC_Client_DeSerialisation: %lld microsec\n",
+ time_xrpcClntDeSeria);
+ }
+
clean_up(sock, in, out, bs, b, argcnt, iterc);
*res = shredBAT;
return GDK_SUCCEED;
Index: xrpc_server.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_server.mx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- xrpc_server.mx 27 Feb 2007 09:59:12 -0000 1.15
+++ xrpc_server.mx 28 Feb 2007 14:45:43 -0000 1.16
@@ -1017,7 +1017,7 @@
if (timing) {
stream_printf(GDKout,
- "XRPC_Server_DeSerialisation: %lld microsec\n",
+ "XRPC_Server_DeSerialisation: %lld microsec\n",
time_xrpcServDeSeria);
}
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- pf_support.mx 20 Feb 2007 12:07:00 -0000 1.195
+++ pf_support.mx 28 Feb 2007 14:45:39 -0000 1.196
@@ -3283,7 +3283,7 @@
if (rid_nid_update.exist(rid)) {
nid := rid_nid_update.find(rid);
} else {
- nid := pre_nid.find(newpre);
+ nid := pre_nid.find(swizzle(rid, map_pid));
}
} else {
nid := rid_nid.find(rid);
Index: shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shredder.mx,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- shredder.mx 23 Feb 2007 12:51:42 -0000 1.117
+++ shredder.mx 28 Feb 2007 14:45:43 -0000 1.118
@@ -467,6 +467,8 @@
shredBAT *sb = & shredCtx->dstBAT[idx];
size_t oldsize, newsize;
+ if ( v == 0 )
+ v = (str)str_nil;
if (sb->def->compress) {
BAT *mb = BBP_cache(-(sb->bat->batCacheid));
BUN bun;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
