You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2010/03/19 00:52:33 UTC
svn commit: r925048 - in /openjpa/trunk:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/
openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/kernel/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/
Author: faywang
Date: Thu Mar 18 23:52:33 2010
New Revision: 925048
URL: http://svn.apache.org/viewvc?rev=925048&view=rev
Log:
OPENJPA-1580: disable query cache when pagination is involved.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java
openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/kernel/localizer.properties
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java?rev=925048&r1=925047&r2=925048&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java Thu Mar 18 23:52:33 2010
@@ -178,10 +178,14 @@ public class PreparedQueryImpl implement
SQLBuffer buffer = selector.getSQL();
if (buffer == null)
return new PreparedQueryCacheImpl.StrongExclusion(_id, _loc.get("exclude-no-sql", _id).getMessage());;
- boolean useFieldStrategy = isUsingFieldStrategy();
- if (useFieldStrategy)
+ if (isUsingFieldStrategy())
return new PreparedQueryCacheImpl.StrongExclusion(_id,
_loc.get("exclude-user-strategy", _id).getMessage());;
+
+ if (isPaginated())
+ return new PreparedQueryCacheImpl.StrongExclusion(_id,
+ _loc.get("exclude-pagination", _id).getMessage());;
+
setTargetQuery(buffer.getSQL());
setParameters(buffer.getParameters());
setUserParameterPositions(buffer.getUserParameters());
@@ -259,6 +263,14 @@ public class PreparedQueryImpl implement
return false;
}
+ private boolean isPaginated() {
+ if (select instanceof SelectImpl) {
+ if (((SelectImpl)select).getStartIndex() != 0 ||
+ ((SelectImpl)select).getEndIndex() != Long.MAX_VALUE)
+ return true;
+ }
+ return false;
+ }
private boolean isUsingFieldStrategy() {
for (int i = 0; i < _exps.length; i++) {
if (isUsingFieldStrategy(_exps[i])) {
Modified: openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/kernel/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/kernel/localizer.properties?rev=925048&r1=925047&r2=925048&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/kernel/localizer.properties (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/kernel/localizer.properties Thu Mar 18 23:52:33 2010
@@ -168,4 +168,6 @@ exclude-not-executor: Query "{0}" is not
exclude-externalized-param: Query "{0}" is not cached because some parameterized \
field values are externalized.
exclude-user-strategy: This query "{0}" is not cached because some parameterized \
- field value depends on user-defined field strategy.
\ No newline at end of file
+ field value depends on user-defined field strategy.
+exclude-pagination: This query "{0}" involves pagination and is not cached.
+
\ No newline at end of file
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java?rev=925048&r1=925047&r2=925048&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java Thu Mar 18 23:52:33 2010
@@ -974,7 +974,27 @@ public class TestPreparedQueryCache exte
em.getTransaction().rollback();
}
+ public void testRangeIsExcluded() {
+ List<Company> l = null;
+ l = getAllCompaniesPaged(0, 1);
+ assertEquals(1, l.size());
+ assertEquals("acme.org", l.get(0).getName());
+ l = getAllCompaniesPaged(1, 1);
+ assertEquals(1, l.size());
+ assertEquals("BEA", l.get(0).getName());
+ l = getAllCompaniesPaged(2, 1);
+ assertEquals(1, l.size());
+ assertEquals("IBM", l.get(0).getName());
+ }
+
+ public List<Company> getAllCompaniesPaged(int start, int max) {
+ EntityManager em = emf.createEntityManager();
+ Query q = em.createQuery("select p from Company p order by p.name");
+ q.setFirstResult(start);
+ q.setMaxResults(max);
+ return (List<Company>) q.getResultList();
+ }
PreparedQueryCache getPreparedQueryCache() {
return emf.getConfiguration().getQuerySQLCacheInstance();