Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31565/runtime
Modified Files:
Tag: M5XQ
pathfinder.mx
Log Message:
propagated changes of Thursday Oct 08 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/08 - stmane: runtime/pathfinder.mx,1.467
propagated changes of Thursday Oct 08 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/08 - stmane: runtime/pathfinder.mx,1.462.4.4
propagated changes of Thursday Oct 08 2009
from the Aug2009_NFI branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/08 - boncz: runtime/pathfinder.mx,1.462.6.8
last fixes made during the introduction of the NFI performance release at
NFI
- bugfix in generation of pf:text()
- enable index heuristic in where clauses (..)
- fix a recently introduced issue in the subexpression cache
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U pathfinder.mx
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.458.2.8
retrieving revision 1.458.2.9
diff -u -d -r1.458.2.8 -r1.458.2.9
--- pathfinder.mx 8 Oct 2009 11:29:38 -0000 1.458.2.8
+++ pathfinder.mx 8 Oct 2009 17:18:29 -0000 1.458.2.9
@@ -1530,6 +1530,7 @@
if (bit(xrpc_timeout)) timeout := usec() + *(1000LL, xrpc_timeout);
xrpc_timeouts.inplace(idx, timeout);
xrpc_statuses.inplace(idx, "reserved");
+ if (xrpc_mode.search("use") < 0) return ws;
}
ws := [access]([copy](ws),BAT_WRITE); # use a copy, no locking required
} else {
@@ -1588,9 +1589,11 @@
lock_set(xrpc_lock);
var aborted := (xrpc_statuses.find(idx) = "abort");
- if ((xrpc_mode = "use-cache-repeatable") or aborted) {
+ if (aborted) {
lock_unset(wslock);
- if (not(aborted)) xrpc_statuses.inplace(idx, "wait");
+ } else if (xrpc_mode = "use-cache-repeatable") {
+ lock_unset(wslock);
+ xrpc_statuses.inplace(idx, "wait");
} else {
xrpc_statuses.inplace(idx, "exec");
}
------------------------------------------------------------------------------
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
