Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30982/compiler/mil
Modified Files:
Tag: xrpcdemo
milprint_summer.c
Log Message:
another premature checkin... it does not work fully yet.. just to share
U milprint_summer.c
Index: milprint_summer.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint_summer.c,v
retrieving revision 1.419.4.5
retrieving revision 1.419.4.6
diff -u -d -r1.419.4.5 -r1.419.4.6
--- milprint_summer.c 5 Jun 2008 12:55:12 -0000 1.419.4.5
+++ milprint_summer.c 6 Jun 2008 14:39:48 -0000 1.419.4.6
@@ -11460,7 +11460,7 @@
"var xrpc_method := str_nil; # and the method specified in the
request message.\n"
"var xrpc_shredBAT := int_nil; # bat-id (int) of a shredded XRPC
message 2b added to the ws\n"
"\n"
- "# output mode"
+ "# output mode\n"
"var genType := \"xml\";\n";
}
@@ -11522,17 +11522,17 @@
"time_shred := 0LL;\n"\
"time_print := 0LL;\n"\
"time_exec := 0LL;\n"\
- "time_start := usec();\n"
+ "time_start := usec();\n"\
+ "var try := 1;\n"
#define PF_STARTMIL_NORMAL(STMT) PF_STARTMIL_START\
- "var err;\n"\
+ "var err := str_nil;\n"\
"{{var ws := empty_bat;\n"\
" err := CATCH({\n"\
" ws := ws_create(" STMT ");\n" PF_STARTMIL_END
#define PF_STARTMIL_UPDATE PF_STARTMIL_START\
- "var try := 1;\n"\
"var err := \"!ERROR: conflicting update\";\n"\
"var ws_log_wsid := 0LL;\n"\
- "{while(((try :+= 1) <= 3) and not(isnil(err))) {\n"\
+ "{while(try <= 2) and not(isnil(err))) {\n"\
" if (not(err.startsWith(\"!ERROR: conflicting update\"))) break;\n"\
" var ws := empty_bat;\n"\
" err := CATCH({\n"\
@@ -11601,9 +11601,7 @@
PF_PLAY_TIJAH_TAPE PF_STOPMIL_END("Update")
#define PF_STOPMIL_END(LASTPHASE)\
" });\n"\
- " ws_log_wsid := ws_id(ws);\n"\
- " if (not(isnil(err))) ws_log(ws, err);\n"\
- " ws_destroy(ws);\n"\
+ " try := try + ws_end(ws, err);\n"\
"}}\n"\
PF_STOP_PFTIJAH\
PF_STOPMIL_END_PRINT_TIMING(LASTPHASE)
-------------------------------------------------------------------------
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
