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 2009/07/07 04:04:55 UTC
svn commit: r791674 - in /openjpa/branches/subquery:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/
Author: fancy
Date: Tue Jul 7 02:04:55 2009
New Revision: 791674
URL: http://svn.apache.org/viewvc?rev=791674&view=rev
Log:
Reset alias count for Prepared Query Cache
Modified:
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java
openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java
Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java?rev=791674&r1=791673&r2=791674&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java Tue Jul 7 02:04:55 2009
@@ -180,6 +180,7 @@
setParameters(buffer.getParameters());
setUserParameterPositions(buffer.getUserParameters());
_initialized = true;
+ select.ctx().resetAliasCount();
return true;
}
Modified: openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java?rev=791674&r1=791673&r2=791674&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java (original)
+++ openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java Tue Jul 7 02:04:55 2009
@@ -87,6 +87,18 @@
}
/**
+ * Reset alias count for prepared query cache
+ *
+ */
+ public void resetAliasCount() {
+ Context p = this;
+ while (p.subquery != null) {
+ p = p.parent;
+ }
+ p.aliasCount = -1;
+ }
+
+ /**
* Register the select for this context.
* @param select
*/
Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java?rev=791674&r1=791673&r2=791674&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java Tue Jul 7 02:04:55 2009
@@ -49,32 +49,26 @@
em.close();
}
- @AllowFailure
public void testFirstThenMax() {
helper(true, 2, 3, 3);
}
- @AllowFailure
public void testMaxThenFirst() {
helper(false, 2, 3, 3);
}
- @AllowFailure
public void testNoResultsFirstFirst() {
helper(true, 10, 3, 0);
}
- @AllowFailure
public void testNoResultsFirstLast() {
helper(false, 10, 3, 0);
}
- @AllowFailure
public void testAllResultsFirstFirst() {
helper(true, 0, 10, 6);
}
- @AllowFailure
public void testAllResultsFirstLast() {
helper(false, 0, 10, 6);
}