Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9159/compiler/mil
Modified Files:
Tag: xrpcdemo
milprint_summer.c
Log Message:
Index: compiler/mil/milprint_summer.c
- make sure try variable is not optimized away
Index: compiler/semantics/functions.c
- fix the atURI property as set to functions by pf
Index: runtime/pathfinder.mx
- do not restart any XRPC update call (to avoid restarts
in circular queries going into exclusive mode, thus
causing deadlock)
Index: runtime/pf_support.mx
- bad bug in docsused
Index: runtime/serialize.mx
- bug in serialization
Index: runtime/xrpc_client.mx
- do parse the response message of update queries
(otherwise we loose the participant info)
Index: runtime/xrpc/demo/demo-xrpcmod.xq
- some fixes in the demo file
(note: it is not consistent with the texts in the GUI)
U milprint_summer.c
Index: milprint_summer.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint_summer.c,v
retrieving revision 1.419.4.12
retrieving revision 1.419.4.13
diff -u -d -r1.419.4.12 -r1.419.4.13
--- milprint_summer.c 11 Jun 2008 07:29:01 -0000 1.419.4.12
+++ milprint_summer.c 12 Jun 2008 14:47:27 -0000 1.419.4.13
@@ -11557,10 +11557,12 @@
" time_exec := time_print - time_start;\n"
#define PF_STOPMIL_RDONLY_BODY\
" # 'none' could theoretically occur in genType as root tagname
('xml-root-none'), so check for 'xml'\n"\
+ " if (xrpc_coord) xrpc_shredBAT;\n"\
" if ((genType.search(\"none\") < 0) or (genType.search(\"xml\") >=
0))\n"\
"
print_result(genType,ws,tunique(iter),constant2bat(iter),item.materialize(ipik),constant2bat(kind),int_values,dbl_values,str_values,\n"\
"
xrpc_module,xrpc_method,xrpc_qid,xrpc_caller,xrpc_mode,false,xrpc_seqnr,xrpc_timeout,time_start);\n"
#define PF_STOPMIL_UPDATE_BODY\
+ " if (xrpc_coord) xrpc_shredBAT;\n"\
" if (xrpc_method != \"\") \n"\
"
print_result(genType,ws,empty_bat,empty_bat,empty_bat,bat(void,int),int_values,dbl_values,str_values,\n"\
"
xrpc_module,xrpc_method,xrpc_qid,xrpc_caller,xrpc_mode,true,xrpc_seqnr,xrpc_timeout,time_start);\n"\
@@ -11588,7 +11590,7 @@
PF_STOPMIL_END_PRINT_TIMING(LASTPHASE)
#define PF_STOPMIL_END_PRINT_TIMING(LASTPHASE)\
"if (not(isnil(err))) {\n"\
- " ERROR(err);\n"\
+ " ERROR(err); -(try);\n"\
"} else if (genType.startsWith(\"timing\")) {\n"\
" time_print := usec() - time_print;\n"\
" printf(\"\\nTrans %% 10.3f msec\\nShred %% 10.3f msec\\nQuery %%
10.3f msec\\n" LASTPHASE " %% 10.3f msec\\n\","\
-------------------------------------------------------------------------
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
