You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2010/12/09 16:25:45 UTC
svn commit: r1044002 - in
/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa:
datacache/QueryCacheStoreQuery.java kernel/AbstractStoreQuery.java
kernel/ExpressionStoreQuery.java kernel/StoreQuery.java
Author: curtisr7
Date: Thu Dec 9 15:25:44 2010
New Revision: 1044002
URL: http://svn.apache.org/viewvc?rev=1044002&view=rev
Log:
OPENJPA-1810: Merge performance changes from trunk.
Modified:
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
Modified: openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java?rev=1044002&r1=1044001&r2=1044002&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java (original)
+++ openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java Thu Dec 9 15:25:44 2010
@@ -262,6 +262,10 @@ public class QueryCacheStoreQuery
return _query.newCompilation();
}
+ public Object getCompilation() {
+ return _query.getCompilation();
+ }
+
public void populateFromCompilation(Object comp) {
_query.populateFromCompilation(comp);
}
@@ -331,7 +335,7 @@ public class QueryCacheStoreQuery
public ResultObjectProvider executeQuery(StoreQuery q, Object[] params,
Range range) {
QueryCacheStoreQuery cq = (QueryCacheStoreQuery) q;
- Object parsed = cq.getDelegate().newCompilation();
+ Object parsed = cq.getDelegate().getCompilation();
QueryKey key = QueryKey.newInstance(cq.getContext(),
_ex.isPacking(q), params, _candidate, _subs, range.start,
range.end, parsed);
Modified: openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java?rev=1044002&r1=1044001&r2=1044002&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java (original)
+++ openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java Thu Dec 9 15:25:44 2010
@@ -72,6 +72,10 @@ public abstract class AbstractStoreQuery
return null;
}
+ public Object getCompilation() {
+ return null;
+ }
+
public void populateFromCompilation(Object comp) {
}
Modified: openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java?rev=1044002&r1=1044001&r2=1044002&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java (original)
+++ openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java Thu Dec 9 15:25:44 2010
@@ -154,6 +154,10 @@ public class ExpressionStoreQuery
return _parser.parse(ctx.getQueryString(), this);
}
+ public Object getCompilation() {
+ return _parsed;
+ }
+
public void populateFromCompilation(Object comp) {
_parser.populate(comp, this);
}
Modified: openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java?rev=1044002&r1=1044001&r2=1044002&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java (original)
+++ openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java Thu Dec 9 15:25:44 2010
@@ -90,6 +90,11 @@ public interface StoreQuery
* Create a new compilation for this query. May be null.
*/
public Object newCompilation();
+
+ /**
+ * Get the current compilation for this query. If it is null, do not create.
+ */
+ public Object getCompilation();
/**
* Populate internal data from compilation.