Author: ppoddar
Date: Thu Mar 18 23:01:30 2010
New Revision: 925036
URL: http://svn.apache.org/viewvc?rev=925036&view=rev
Log:
OPENJPA-1584: Reparameterization when main and subquery using share query
parameters in same or different declaration order
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java
(with props)
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java?rev=925036&r1=925035&r2=925036&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
Thu Mar 18 23:01:30 2010
@@ -156,30 +156,30 @@ public final class SQLBuffer
_cols.add(paramIndex, null);
}
}
- if (buf._userIndex != null) {
- if (_userIndex == null)
- _userIndex = new ArrayList();
- for (int i = 0; i < buf._userIndex.size(); i+=2) {
- int newIndex = ((Integer)buf._userIndex.get(i)).intValue()
- + paramIndex;
- Object userParam = buf._userIndex.get(i+1);
- _userIndex.add(newIndex);
- _userIndex.add(userParam);
- }
- } else {
- if (_userIndex != null) {
- List userIndex = new ArrayList();
- for (int i = 0; i < _userIndex.size(); i+=2) {
- int oldIndex = ((Integer)_userIndex.get(i)).intValue();
- Object userParam = _userIndex.get(i+1);
- if (oldIndex >= paramIndex)
- userIndex.add(oldIndex + paramIndex);
- else
- userIndex.add(oldIndex);
- userIndex.add(userParam);
- }
- _userIndex = userIndex;
+
+ // adding user parameters from another buffer to this buffer
+ // this buffer's user parameter index gets modified
+ if (buf._userIndex == null && this._userIndex == null) {
+ // do nothing
+ } else if (buf._userIndex != null && this._userIndex == null) {
+ // copy the other buffers data
+ this._userIndex = new ArrayList(buf._userIndex);
+ } else if (buf._userIndex == null && this._userIndex != null) {
+ // nothing to add from the other buffer
+ } else { // both has data.
+ // modify this buffer's user parameter index
+ int otherSize = buf._userIndex.size()/2;
+ for (int i = 0; i < _userIndex.size(); i+=2) {
+ int newIndex = ((Integer)_userIndex.get(i)).intValue() +
otherSize;
+ _userIndex.set(i, newIndex);
}
+ // append the other buffer's user parameters to this one
+ for (int i = 0; i < buf._userIndex.size(); i+=2) {
+ Object otherIndex = buf._userIndex.get(i);
+ Object otherParam = buf._userIndex.get(i+1);
+ _userIndex.add(otherIndex);
+ _userIndex.add(otherParam);
+ }
}
}
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java?rev=925036&view=auto
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java
(added)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java
Thu Mar 18 23:01:30 2010
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.jdbc.sqlcache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * A simple entity for a complex test.
+ * This entity is used to test complex parameterization and reparametrization
of Prepared Queries.
+ *
+ * @author Pinaki Poddar
+ *
+ */
+...@entity
+public class OrderJPA {
+ @Id
+ long OrderId;
+ int CustomerId;
+ int DistrictId;
+ int WarehouseId;
+
+
+ public long getOrderId() {
+ return OrderId;
+ }
+ public void setOrderId(long orderId) {
+ OrderId = orderId;
+ }
+ public int getCustomerId() {
+ return CustomerId;
+ }
+ public void setCustomerId(int customerId) {
+ CustomerId = customerId;
+ }
+ public int getDistrictId() {
+ return DistrictId;
+ }
+ public void setDistrictId(int districtId) {
+ DistrictId = districtId;
+ }
+ public int getWarehouseId() {
+ return WarehouseId;
+ }
+ public void setWarehouseId(int warehouseId) {
+ WarehouseId = warehouseId;
+ }
+}
Propchange:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/OrderJPA.java
------------------------------------------------------------------------------
svn:eol-style = native
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=925036&r1=925035&r2=925036&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:01:30 2010
@@ -187,7 +187,24 @@ public class TestPreparedQueryCache exte
em.persist(b1); em.persist(b2);
em.persist(c1); em.persist(c2);
- em.getTransaction().commit();
+ id = (int)System.currentTimeMillis();
+ OrderJPA o1 = new OrderJPA();
+ o1.setOrderId(id++);
+ o1.setCustomerId(339);
+ o1.setDistrictId(3);
+ o1.setWarehouseId(23);
+
+ OrderJPA o2 = new OrderJPA();
+ o2.setOrderId(id++);
+ o2.setCustomerId(2967);
+ o2.setDistrictId(5);
+ o2.setWarehouseId(22);
+
+ em.persist(o1);
+ em.persist(o2);
+
+
+ em.getTransaction().commit();
}
public void tearDown() throws Exception {
@@ -835,6 +852,129 @@ public class TestPreparedQueryCache exte
assertFalse(q2.getResultList().isEmpty());
}
+ public void testRepeatedParameterInSubqueryInDifferentOrder() {
+ OpenJPAEntityManager em = emf.createEntityManager();
+ String jpql = "select o from OrderJPA o "
+ + "where o.OrderId in (select max(o1.OrderId)
from OrderJPA o1 "
+ + "where ((o1.CustomerId = :customerId) "
+ + "and (o1.DistrictId = :districtId) "
+ + "and (o1.WarehouseId = :warehouseId)))
"
+ + "and (o.CustomerId = :customerId) "
+ + "and (o.WarehouseId = :warehouseId) "
+ + "and (o.DistrictId = :districtId)";
+
+ em.getTransaction().begin();
+ TypedQuery<OrderJPA> q1 = em.createQuery(jpql, OrderJPA.class);
+ q1.setParameter("customerId", 339)
+ .setParameter("districtId", 3)
+ .setParameter("warehouseId", 23);
+
+ assertEquals(JPQLParser.LANG_JPQL,
OpenJPAPersistence.cast(q1).getLanguage());
+ assertFalse(q1.getResultList().isEmpty());
+
+
+ TypedQuery<OrderJPA> q2 = em.createQuery(jpql, OrderJPA.class);
+ assertEquals(QueryLanguages.LANG_PREPARED_SQL,
OpenJPAPersistence.cast(q2).getLanguage());
+ q2.setParameter("customerId", 2967)
+ .setParameter("districtId", 5)
+ .setParameter("warehouseId", 22);
+
+ assertFalse(q2.getResultList().isEmpty());
+ em.getTransaction().rollback();
+ }
+
+ public void testRepeatedParameterInSubqueryInSameOrder() {
+ OpenJPAEntityManager em = emf.createEntityManager();
+ String jpql = "select o from OrderJPA o "
+ + "where o.OrderId in (select max(o1.OrderId)
from OrderJPA o1 "
+ + "where ((o1.CustomerId = :customerId) "
+ + "and (o1.DistrictId = :districtId) "
+ + "and (o1.WarehouseId = :warehouseId))) "
+ + "and (o.CustomerId = :customerId) "
+ + "and (o.DistrictId = :districtId) "
+ + "and (o.WarehouseId = :warehouseId)";
+
+ em.getTransaction().begin();
+ TypedQuery<OrderJPA> q1 = em.createQuery(jpql, OrderJPA.class);
+ q1.setParameter("customerId", 339)
+ .setParameter("districtId", 3)
+ .setParameter("warehouseId", 23);
+
+ assertEquals(JPQLParser.LANG_JPQL,
OpenJPAPersistence.cast(q1).getLanguage());
+ assertFalse(q1.getResultList().isEmpty());
+
+
+ TypedQuery<OrderJPA> q2 = em.createQuery(jpql, OrderJPA.class);
+ assertEquals(QueryLanguages.LANG_PREPARED_SQL,
OpenJPAPersistence.cast(q2).getLanguage());
+ q2.setParameter("customerId", 2967)
+ .setParameter("districtId", 5)
+ .setParameter("warehouseId", 22);
+
+ assertFalse(q2.getResultList().isEmpty());
+ em.getTransaction().rollback();
+ }
+
+ public void testPartiallyRepeatedParameterInSubquery() {
+ OpenJPAEntityManager em = emf.createEntityManager();
+ String jpql = "select o from OrderJPA o "
+ + "where o.OrderId in (select max(o1.OrderId)
from OrderJPA o1 "
+ + "where ((o1.CustomerId = :customerId) "
+ + "and (o1.WarehouseId = :warehouseId))) "
+ + "and (o.CustomerId = :customerId) "
+ + "and (o.DistrictId = :districtId) "
+ + "and (o.WarehouseId = :warehouseId)";
+
+ em.getTransaction().begin();
+ TypedQuery<OrderJPA> q1 = em.createQuery(jpql, OrderJPA.class);
+ q1.setParameter("customerId", 339)
+ .setParameter("districtId", 3)
+ .setParameter("warehouseId", 23);
+
+ assertEquals(JPQLParser.LANG_JPQL,
OpenJPAPersistence.cast(q1).getLanguage());
+ assertFalse(q1.getResultList().isEmpty());
+
+
+ TypedQuery<OrderJPA> q2 = em.createQuery(jpql, OrderJPA.class);
+ assertEquals(QueryLanguages.LANG_PREPARED_SQL,
OpenJPAPersistence.cast(q2).getLanguage());
+ q2.setParameter("customerId", 2967)
+ .setParameter("districtId", 5)
+ .setParameter("warehouseId", 22);
+
+ assertFalse(q2.getResultList().isEmpty());
+ em.getTransaction().rollback();
+ }
+
+ public void testPartiallyRepeatedParameterInMainquery() {
+ OpenJPAEntityManager em = emf.createEntityManager();
+ String jpql = "select o from OrderJPA o "
+ + "where o.OrderId in (select max(o1.OrderId)
from OrderJPA o1 "
+ + "where ((o1.CustomerId = :customerId) "
+ + "and (o1.DistrictId = :districtId) "
+ + "and (o1.WarehouseId = :warehouseId))) "
+ + "and (o.CustomerId = :customerId) "
+ + "and (o.WarehouseId = :warehouseId)";
+
+ em.getTransaction().begin();
+ TypedQuery<OrderJPA> q1 = em.createQuery(jpql, OrderJPA.class);
+ q1.setParameter("customerId", 339)
+ .setParameter("districtId", 3)
+ .setParameter("warehouseId", 23);
+
+ assertEquals(JPQLParser.LANG_JPQL,
OpenJPAPersistence.cast(q1).getLanguage());
+ assertFalse(q1.getResultList().isEmpty());
+
+
+ TypedQuery<OrderJPA> q2 = em.createQuery(jpql, OrderJPA.class);
+ assertEquals(QueryLanguages.LANG_PREPARED_SQL,
OpenJPAPersistence.cast(q2).getLanguage());
+ q2.setParameter("customerId", 2967)
+ .setParameter("districtId", 5)
+ .setParameter("warehouseId", 22);
+
+ assertFalse(q2.getResultList().isEmpty());
+ em.getTransaction().rollback();
+ }
+
+
PreparedQueryCache getPreparedQueryCache() {
return emf.getConfiguration().getQuerySQLCacheInstance();
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=925036&r1=925035&r2=925036&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Thu Mar 18 23:01:30 2010
@@ -207,6 +207,7 @@
<class>org.apache.openjpa.persistence.jdbc.sqlcache.Merchandise</class>
<class>org.apache.openjpa.persistence.jdbc.sqlcache.Person</class>
<class>org.apache.openjpa.persistence.jdbc.sqlcache.Singer</class>
+ <class>org.apache.openjpa.persistence.jdbc.sqlcache.OrderJPA</class>
<properties>
<property name="openjpa.jdbc.QuerySQLCache"
