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/10/27 16:47:45 UTC
svn commit: r1027983 - in /openjpa/trunk:
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/
Author: curtisr7
Date: Wed Oct 27 14:47:44 2010
New Revision: 1027983
URL: http://svn.apache.org/viewvc?rev=1027983&view=rev
Log:
OPENJPA-1856: Executing bulk updates should evict from DataCache.
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java (with props)
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java?rev=1027983&r1=1027982&r2=1027983&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java Wed Oct 27 14:47:44 2010
@@ -21,6 +21,7 @@ package org.apache.openjpa.kernel;
import java.util.Map;
import org.apache.commons.collections.map.LinkedMap;
+import org.apache.openjpa.datacache.DataCache;
import org.apache.openjpa.kernel.exps.AggregateListener;
import org.apache.openjpa.kernel.exps.FilterListener;
import org.apache.openjpa.kernel.exps.QueryExpressions;
@@ -121,11 +122,29 @@ public abstract class AbstractStoreQuery
implements Executor {
public Number executeDelete(StoreQuery q, Object[] params) {
- return q.getContext().deleteInMemory(q, this, params);
+ try {
+ return q.getContext().deleteInMemory(q, this, params);
+ } finally {
+ for (ClassMetaData cmd : getAccessPathMetaDatas(q)) {
+ DataCache cache = cmd.getDataCache();
+ if (cache != null) {
+ cache.removeAll(cmd.getDescribedType(), true);
+ }
+ }
+ }
}
public Number executeUpdate(StoreQuery q, Object[] params) {
- return q.getContext().updateInMemory(q, this, params);
+ try {
+ return q.getContext().updateInMemory(q, this, params);
+ } finally {
+ for (ClassMetaData cmd : getAccessPathMetaDatas(q)) {
+ DataCache cache = cmd.getDataCache();
+ if (cache != null) {
+ cache.removeAll(cmd.getDescribedType(), true);
+ }
+ }
+ }
}
public String[] getDataStoreActions(StoreQuery q, Object[] params,
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java?rev=1027983&r1=1027982&r2=1027983&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java Wed Oct 27 14:47:44 2010
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.commons.collections.map.LinkedMap;
import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.datacache.DataCache;
import org.apache.openjpa.kernel.exps.Subquery;
import org.apache.openjpa.kernel.exps.AbstractExpressionVisitor;
import org.apache.openjpa.kernel.exps.AggregateListener;
@@ -778,19 +779,37 @@ public class ExpressionStoreQuery
}
public Number executeDelete(StoreQuery q, Object[] params) {
- Number num = ((ExpressionStoreQuery) q).executeDelete(this, _meta,
- _metas, _subs, _facts, _exps, params);
- if (num == null)
- return q.getContext().deleteInMemory(q, this, params);
- return num;
+ try {
+ Number num =
+ ((ExpressionStoreQuery) q).executeDelete(this, _meta, _metas, _subs, _facts, _exps, params);
+ if (num == null)
+ return q.getContext().deleteInMemory(q, this, params);
+ return num;
+ } finally {
+ for (ClassMetaData cmd : getAccessPathMetaDatas(q)) {
+ DataCache cache = cmd.getDataCache();
+ if (cache != null) {
+ cache.removeAll(cmd.getDescribedType(), true);
+ }
+ }
+ }
}
public Number executeUpdate(StoreQuery q, Object[] params) {
- Number num = ((ExpressionStoreQuery) q).executeUpdate(this, _meta,
- _metas, _subs, _facts, _exps, params);
- if (num == null)
- return q.getContext().updateInMemory(q, this, params);
- return num;
+ try {
+ Number num =
+ ((ExpressionStoreQuery) q).executeUpdate(this, _meta, _metas, _subs, _facts, _exps, params);
+ if (num == null)
+ return q.getContext().updateInMemory(q, this, params);
+ return num;
+ } finally {
+ for (ClassMetaData cmd : getAccessPathMetaDatas(q)) {
+ DataCache cache = cmd.getDataCache();
+ if (cache != null) {
+ cache.removeAll(cmd.getDescribedType(), true);
+ }
+ }
+ }
}
public String[] getDataStoreActions(StoreQuery q, Object[] params,
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java?rev=1027983&r1=1027982&r2=1027983&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java Wed Oct 27 14:47:44 2010
@@ -46,11 +46,11 @@ public class CachedEntityStatistics {
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
Set<CachedEntityStatistics> lazyList = new HashSet<CachedEntityStatistics>();
+ String firstName, lastName;
+
public CachedEntityStatistics() {
}
- private String firstName, lastName;
-
public int getId() {
return id;
}
Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java?rev=1027983&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java (added)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java Wed Oct 27 14:47:44 2010
@@ -0,0 +1,98 @@
+/*
+ * 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.datacache;
+
+import javax.persistence.Cache;
+import javax.persistence.EntityManager;
+
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestBulkUpdatesDataCacheEviction extends SingleEMFTestCase {
+ Object[] props = new Object[] { CLEAR_TABLES, CachedEntityStatistics.class, "openjpa.DataCache", "true" };
+
+ public void setUp() throws Exception {
+ super.setUp(props);
+ }
+
+ /**
+ * This test ensures that after executing an update against the db, the updated type is purged from
+ * the DataCache.
+ */
+ public void testUpdate() throws Exception {
+ EntityManager em = emf.createEntityManager();
+ Cache cache = emf.getCache();
+ try {
+ CachedEntityStatistics e = createEntity(em);
+ assertTrue(cache.contains(CachedEntityStatistics.class, e.getId()));
+ em.clear();
+
+ String update = "UPDATE CachedEntityStatistics s SET s.firstName = :name WHERE s.id = :id";
+ String name = "name_" + System.currentTimeMillis();
+ // execute update, this should result in a cache eviction
+ em.getTransaction().begin();
+ assertEquals(1, em.createQuery(update).setParameter("name", name).setParameter("id", e.getId())
+ .executeUpdate());
+ em.getTransaction().commit();
+ assertFalse(cache.contains(CachedEntityStatistics.class, e.getId()));
+
+ CachedEntityStatistics postUpdate = em.find(CachedEntityStatistics.class, e.getId());
+ assertEquals(name, postUpdate.getFirstName());
+
+ } finally {
+ em.close();
+ }
+ }
+
+ /**
+ * This test ensures that after executing a delete against the db, the deleted type is purged from
+ * the DataCache.
+ */
+ public void testDelete() throws Exception {
+ EntityManager em = emf.createEntityManager();
+ Cache cache = emf.getCache();
+ try {
+ CachedEntityStatistics e = createEntity(em);
+ assertTrue(cache.contains(CachedEntityStatistics.class, e.getId()));
+ em.clear();
+
+ String delete = "DELETE FROM CachedEntityStatistics s WHERE s.id = :id";
+ // execute update, this should result in a cache eviction
+ em.getTransaction().begin();
+ assertEquals(1, em.createQuery(delete).setParameter("id", e.getId()).executeUpdate());
+ em.getTransaction().commit();
+ assertFalse(cache.contains(CachedEntityStatistics.class, e.getId()));
+
+ CachedEntityStatistics postUpdate = em.find(CachedEntityStatistics.class, e.getId());
+ assertNull(postUpdate);
+
+ } finally {
+ em.close();
+ }
+ }
+
+ private CachedEntityStatistics createEntity(EntityManager em) {
+ em.getTransaction().begin();
+ CachedEntityStatistics e = new CachedEntityStatistics();
+ em.persist(e);
+ em.getTransaction().commit();
+
+ return e;
+ }
+
+}
Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java
------------------------------------------------------------------------------
svn:eol-style = native