Update of /cvsroot/monetdb/pathfinder/compiler/core
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9794/compiler/core
Modified Files:
fs.brg
Log Message:
propagated changes of Monday Oct 19 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/19 - sjoerd: compiler/core/fs.brg,1.74.6.4
propagated changes of Saturday Oct 17 2009 - Monday Oct 19 2009
from the Aug2009_NFI branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/17 - boncz: compiler/core/fs.brg,1.74.8.4
consistency fix -- thanks Jan!
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/18 - tsheyar: compiler/core/fs.brg,1.74.8.5
-- More consistency fixes and code simplification.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: fs.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/fs.brg,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- fs.brg 16 Oct 2009 16:07:04 -0000 1.77
+++ fs.brg 19 Oct 2009 09:30:38 -0000 1.78
@@ -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-immutable"),
- 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
