Update of /cvsroot/monetdb/pathfinder/compiler/core
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12685/core
Modified Files:
Tag: Aug2009_NFI
fs.brg
Log Message:
-- More consistency fixes and code simplification.
Index: fs.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/fs.brg,v
retrieving revision 1.74.8.4
retrieving revision 1.74.8.5
diff -u -d -r1.74.8.4 -r1.74.8.5
--- fs.brg 17 Oct 2009 15:35:47 -0000 1.74.8.4
+++ fs.brg 18 Oct 2009 09:10:55 -0000 1.74.8.5
@@ -3238,21 +3238,10 @@
PFqname (PFns_lib, "cache")) == 0)
C(p) = str (PFstrUtils_trim_spaces (
PFstrdup (L(p)->sem.pragma.content)));
+ /* transform session pragma into global session options */
else if (PFqname_eq (L(p)->sem.pragma.qn.qname,
- PFqname (PFns_lib, "session")) == 0) {
- char *content = PFstrUtils_trim_spaces (
- PFstrdup (L(p)->sem.pragma.content));
- PFenv_bind (PFoptions,
- PFqname (PFns_lib, "session-id"),
- PFstrUtils_dupUntil (content, ':'));
- PFenv_bind (PFoptions,
- PFqname (PFns_lib, "session-timeout"),
- PFstrUtils_skipUntilSubString (content, ":"));
- PFenv_bind (PFoptions,
- PFqname (PFns_lib, "session-mode"),
- PFstrdup ("cache-repeatable"));
- }
- else if (PFqname_eq (L(p)->sem.pragma.qn.qname,
+ PFqname (PFns_lib, "session")) == 0 ||
+ PFqname_eq (L(p)->sem.pragma.qn.qname,
PFqname (PFns_lib, "session-use")) == 0) {
char *content = PFstrUtils_trim_spaces (
PFstrdup (L(p)->sem.pragma.content));
@@ -3262,9 +3251,13 @@
PFenv_bind (PFoptions,
PFqname (PFns_lib, "session-timeout"),
PFstrUtils_skipUntilSubString (content, ":"));
- PFenv_bind (PFoptions,
- PFqname (PFns_lib, "session-nocache"),
- PFstrdup ("true"));
+
+ /* mark as ready-only caching session */
+ if (PFqname_eq (L(p)->sem.pragma.qn.qname,
+ PFqname (PFns_lib, "session-use")) == 0)
+ PFenv_bind (PFoptions,
+ PFqname (PFns_lib, "session-nocache"),
+ PFstrdup ("true"));
}
else
/* We don't understand pragmas anyway */
------------------------------------------------------------------------------
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
