Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13724/compiler/mil
Modified Files:
Tag: M5XQ
milgen.brg
Log Message:
propagated changes of Friday Oct 16 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/16 - sjoerd: compiler/mil/milgen.brg,1.227
propagated changes of Friday Oct 16 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/16 - sjoerd: compiler/mil/milgen.brg,1.222.2.4
propagated changes of Friday Oct 16 2009
from the Aug2009_NFI branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/16 - boncz: compiler/mil/milgen.brg,1.221.2.1.2.5
instead of passing the low-level mode string ("use-cache-repeatable")
in the option pf:session-mode, we just have a boolean optional option
pf:session-nocache (default is "false") to ask for a session that uses
cached results, but can not add new cached results to the session (and
thus multiple such concurrent queries are allowed to run in parallel)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.215.2.11
retrieving revision 1.215.2.12
diff -u -d -r1.215.2.11 -r1.215.2.12
--- milgen.brg 16 Oct 2009 08:51:59 -0000 1.215.2.11
+++ milgen.brg 16 Oct 2009 16:16:55 -0000 1.215.2.12
@@ -11031,9 +11031,9 @@
{
PFmil_t *bodymilprog;
PFarray_t *opt;
+ bool nocache = 0;
long long timeout = 0;
- char *qid = "",
- *mode = "none";
+ char *qid = "";
/* Retrieve session information from the global option list. */
opt = PFenv_lookup (PFoptions, PFqname(PFns_lib, "session-id"));
@@ -11052,11 +11052,12 @@
PFlog ("Multiple session timeouts -- Choosing \"%s\".",
*((char **) PFarray_at (opt, 0)));
}
- opt = PFenv_lookup (PFoptions, PFqname(PFns_lib, "session-mode"));
+ opt = PFenv_lookup (PFoptions, PFqname(PFns_lib, "session-nocache"));
if (opt) {
- mode = *((char **) PFarray_at (opt, 0));
+ char *mode = *((char **) PFarray_at (opt, 0));
if (PFarray_last(opt) > 1)
PFlog ("Multiple session modes -- Choosing \"%s\".", mode);
+ nocache = strcmp(mode, "true") == 0 || strcmp(mode, "yes") == 0;
}
assert (n);
@@ -11182,7 +11183,7 @@
assgn (var (PF_MIL_VAR_XRPC_HDL), lit_int(0)),
assgn (var (PF_MIL_VAR_XRPC_SEQNR), lit_lng(0)),
assgn (var (PF_MIL_VAR_XRPC_TIMEOUT), lit_lng(timeout)),
- assgn (var (PF_MIL_VAR_XRPC_MODE), lit_str (mode)),
+ assgn (var (PF_MIL_VAR_XRPC_MODE), lit_str
(qid?nocache?"use-cache-repeatable":"cache-repeatable":"none")),
assgn (var (PF_MIL_VAR_XRPC_MODULE), lit_str("")),
assgn (var (PF_MIL_VAR_XRPC_METHOD), lit_str("")),
assgn (var (PF_MIL_VAR_XRPC_COORD), lit_str("")),
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
