svn commit: r1406855 - in /openjpa/branches/2.2.x: openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/

[cu...@apache.org]

Author: curtisr7
Date: Wed Nov  7 23:01:43 2012
New Revision: 1406855

URL: http://svn.apache.org/viewvc?rev=1406855&view=rev
Log:
OPENJPA-2285: DataCacheStoreManager improvement. Merged from trunk.

Added:
    openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreLazyFk.java
      - copied unchanged from r1402635, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreLazyFk.java
Modified:
    openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
    openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java

Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java?rev=1406855&r1=1406854&r2=1406855&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java Wed Nov  7 23:01:43 2012
@@ -49,8 +49,7 @@ import org.apache.openjpa.util.Optimisti
  * @author Patrick Linskey
  * @nojavadoc
  */
-public class DataCacheStoreManager
-    extends DelegatingStoreManager {
+public class DataCacheStoreManager extends DelegatingStoreManager {
 
     // all the state managers changed in this transaction
     private Collection<OpenJPAStateManager> _inserts = null;
@@ -438,9 +437,12 @@ public class DataCacheStoreManager
         DataCache cache = _mgr.selectCache(sm);
 
         boolean found = false;
+        int loadedFieldsBefore = sm.getLoaded().cardinality();
         if (cache == null || sm.isEmbedded() || bypass(fetch, StoreManager.FORCE_LOAD_NONE)) {
             found = super.load(sm, fields, fetch, lockLevel, edata);
-            updateDataCache(found, sm, fetch);
+            int loadedFieldsAfter = sm.getLoaded().cardinality();
+            boolean changed = loadedFieldsAfter > loadedFieldsBefore;
+            updateDataCache(found, sm, fetch, changed);
             return found;
         }
 
@@ -458,10 +460,12 @@ public class DataCacheStoreManager
 
         // load from store manager; clone the set of still-unloaded fields
         // so that if the store manager decides to modify it it won't affect us
-        found = super.load(sm, (BitSet) fields.clone(), fetch, lockLevel, edata);
+        found = super.load(sm,(BitSet) fields.clone() , fetch, lockLevel, edata);
 
+        int loadedFieldsAfter = sm.getLoaded().cardinality();
+        boolean changed = loadedFieldsAfter > loadedFieldsBefore;
         // Get new instance of cache after DB load since it may have changed
-        updateDataCache(found, sm, fetch);
+        updateDataCache(found, sm, fetch, changed);
 
         return found;
     }
@@ -473,8 +477,10 @@ public class DataCacheStoreManager
      * @param found whether the entity was found by the store manager
      * @param sm the state manager
      * @param fetch fetch configuration
+     * @param loadedFieldsChanged
      */
-    private void updateDataCache(boolean found, OpenJPAStateManager sm, FetchConfiguration fetch) {
+    private void updateDataCache(boolean found, OpenJPAStateManager sm, FetchConfiguration fetch,
+        boolean loadedFieldsChanged) {
 
         if (!_ctx.getPopulateDataCache() || sm == null || fetch.getCacheStoreMode() == DataCacheStoreMode.BYPASS) {
             return;
@@ -486,10 +492,12 @@ public class DataCacheStoreManager
         }
 
         DataCachePCData data = cache.get(sm.getObjectId());
-        boolean alreadyCached = data != null;
-
-        if ((fetch.getCacheStoreMode() == DataCacheStoreMode.USE && !alreadyCached) ||
-             fetch.getCacheStoreMode() == DataCacheStoreMode.REFRESH) {
+        
+        // If loadedFieldsChanged = true, we don't care that data was already stored as we should update it.
+        boolean alreadyCached = (data != null && !loadedFieldsChanged);
+        DataCacheStoreMode storeMode = fetch.getCacheStoreMode();
+        
+        if ((storeMode == DataCacheStoreMode.USE && !alreadyCached) || storeMode == DataCacheStoreMode.REFRESH) {
             // If not found in the DB and the item is in the cache, and not locking remove the item
             if (!found && data != null && !isLocking(fetch)) {
                 cache.remove(sm.getObjectId());

Modified: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java?rev=1406855&r1=1406854&r2=1406855&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java (original)
+++ openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java Wed Nov  7 23:01:43 2012
@@ -115,6 +115,9 @@ public class TestStatistics extends Sing
         write++;
         write++;
         write++;
+        
+        write++;
+        write++;
         assertion(cls, hit,  read, write, stats);
 
         em.clear();
@@ -152,6 +155,8 @@ public class TestStatistics extends Sing
         assertEquals(1, p.getLazyList().size());
         read++;
         write++;
+        // +1 write for p which had its intermediate(fk) updated
+        write++;
         assertion(cls, hit,  read, write, stats);
         em.clear();