DataNucleus

Email Archive: datanucleus-commits (read-only)

2008:	_Jan	_Feb	_Mar (97)	_Apr (765)	_May (572)	_Jun (488)	_Jul (427)	_Aug (666)	_Sep (277)	_Oct (381)	_Nov (422)	_Dec (332)
2009:	_Jan (416)	_Feb (461)	_Mar (506)	_Apr (398)	_May (380)	_Jun (368)	_Jul (383)	_Aug (238)	_Sep (151)	_Oct (213)	_Nov (237)	_Dec (203)
2010:	_Jan (246)	_Feb (290)	_Mar (442)	_Apr (353)	_May (236)	_Jun (369)	_Jul (136)	_Aug (5)	_Sep (55)	_Oct (370)	_Nov (383)	_Dec (292)
2011:	_Jan (358)	_Feb (456)	_Mar (254)	_Apr (135)	_May (208)	_Jun (178)	_Jul (215)	_Aug (103)	_Sep (94)	_Oct (152)	_Nov (114)	_Dec (106)
2012:	_Jan (189)	_Feb (196)	_Mar (160)	_Apr (132)	_May (129)	_Jun (203)	_Jul (338)	_Aug (168)	_Sep (94)	_Oct (299)	_Nov (264)	_Dec (147)
2013:	_Jan (189)	_Feb (184)	_Mar (170)	_Apr (128)	_May (195)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[DataNucleus-commits] SF.net SVN: datanucleus:[13189] platform/core/trunk/src/java/org/ datanucleus/store/types/sco/backed

From: <andy_jefferson@us...> - 2011-06-29 18:36

Revision: 13189
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13189&view=rev
Author:   andy_jefferson
Date:     2011-06-29 18:36:38 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
[NUCCORE-730] Add check on contains() within add() and just return if contained

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2011-06-29 14:19:56 UTC (rev 13188)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2011-06-29 18:36:38 UTC (rev 13189)
@@ -536,6 +536,11 @@
         {
             loadFromStore();
         }
+        if (!List.class.isAssignableFrom(delegate.getClass()) && contains(element))
+        {
+            return false;
+        }
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java	2011-06-29 14:19:56 UTC (rev 13188)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java	2011-06-29 18:36:38 UTC (rev 13189)
@@ -494,6 +494,11 @@
         {
             loadFromStore();
         }
+        if (contains(element))
+        {
+            return false;
+        }
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java	2011-06-29 14:19:56 UTC (rev 13188)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java	2011-06-29 18:36:38 UTC (rev 13189)
@@ -481,6 +481,11 @@
         {
             loadFromStore();
         }
+        if (contains(element))
+        {
+            return false;
+        }
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java	2011-06-29 14:19:56 UTC (rev 13188)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java	2011-06-29 18:36:38 UTC (rev 13189)
@@ -537,6 +537,11 @@
         {
             loadFromStore();
         }
+        if (contains(element))
+        {
+            return false;
+        }
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java	2011-06-29 14:19:56 UTC (rev 13188)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java	2011-06-29 18:36:38 UTC (rev 13189)
@@ -640,6 +640,11 @@
         {
             loadFromStore();
         }
+        if (contains(element))
+        {
+            return false;
+        }
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java	2011-06-29 14:19:56 UTC (rev 13188)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java	2011-06-29 18:36:38 UTC (rev 13189)
@@ -640,6 +640,11 @@
         {
             loadFromStore();
         }
+        if (contains(element))
+        {
+            return false;
+        }
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[14057] platform/core/trunk/src/java/org/ datanucleus/store/types/sco/backed

From: <andy_jefferson@us...> - 2012-01-18 09:17

Revision: 14057
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14057&view=rev
Author:   andy_jefferson
Date:     2012-01-18 09:17:07 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
[NUCCORE-803] Change ordering of clear/removeAll delegate update so it is always in step with makeDirty placement

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashMap.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Hashtable.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashMap.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Map.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Properties.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedMap.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeMap.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -794,6 +794,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -806,7 +807,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -921,6 +921,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (backingStore != null)
         {
             boolean backingSuccess = true;
@@ -951,12 +953,11 @@
                 }
             }
 
-            delegate.removeAll(elements);
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -636,6 +636,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -648,7 +649,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -713,10 +713,10 @@
 
     /**
      * Method to remove a Collection of elements.
-     * @param c The collection to remove
+     * @param elements The collection to remove
      * @return Whether they were removed successfully.
      **/
-    public synchronized boolean removeAll(java.util.Collection c)
+    public synchronized boolean removeAll(java.util.Collection elements)
     {
         makeDirty();
  
@@ -725,10 +725,12 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management
-            Iterator iter = c.iterator();
+            Iterator iter = elements.iterator();
             RelationshipManager relMgr = ownerSM.getExecutionContext().getRelationshipManager(ownerSM);
             while (iter.hasNext())
             {
@@ -744,7 +746,7 @@
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : c)
+                for (Object element : elements)
                 {
                     if (contains(element))
                     {
@@ -757,7 +759,7 @@
             {
                 try
                 {
-                    backingSuccess = backingStore.removeAll(ownerSM, c, size);
+                    backingSuccess = backingStore.removeAll(ownerSM, elements, size);
                 }
                 catch (NucleusDataStoreException dse)
                 {
@@ -766,12 +768,11 @@
                 }
             }
 
-            delegate.removeAll(c);
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(c);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashMap.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashMap.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -517,6 +517,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -529,7 +530,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
  
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -595,6 +595,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -607,7 +608,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -672,10 +672,10 @@
 
     /**
      * Method to remove all elements from the collection from the HashSet.
-     * @param c The collection of elements to remove 
+     * @param elements The collection of elements to remove 
      * @return Whether it was removed ok.
-     **/
-    public boolean removeAll(java.util.Collection c)
+     */
+    public boolean removeAll(java.util.Collection elements)
     {
         makeDirty();
  
@@ -684,10 +684,12 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management
-            Iterator iter = c.iterator();
+            Iterator iter = elements.iterator();
             RelationshipManager relMgr = ownerSM.getExecutionContext().getRelationshipManager(ownerSM);
             while (iter.hasNext())
             {
@@ -703,7 +705,7 @@
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : c)
+                for (Object element : elements)
                 {
                     if (contains(element))
                     {
@@ -716,7 +718,7 @@
             {
                 try
                 {
-                    backingSuccess = backingStore.removeAll(ownerSM, c, size);
+                    backingSuccess = backingStore.removeAll(ownerSM, elements, size);
                 }
                 catch (NucleusDataStoreException dse)
                 {
@@ -725,12 +727,11 @@
                 }
             }
 
-            delegate.removeAll(c); // Remove from the delegate too
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(c);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Hashtable.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Hashtable.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Hashtable.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -514,6 +514,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -526,7 +527,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashMap.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashMap.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -518,6 +518,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -530,7 +531,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
  
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -581,6 +581,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -593,7 +594,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -669,6 +669,9 @@
         {
             loadFromStore();
         }
+
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management
@@ -710,12 +713,11 @@
                 }
             }
 
-            delegate.removeAll(elements); // Remove from the delegate too
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -811,6 +811,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -823,7 +824,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -938,6 +938,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (backingStore != null)
         {
             boolean backingSuccess = true;
@@ -968,12 +970,11 @@
                 }
             }
 
-            delegate.removeAll(elements);
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -789,6 +789,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -801,7 +802,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -915,6 +915,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (backingStore != null)
         {
             boolean backingSuccess = true;
@@ -945,12 +947,11 @@
                 }
             }
 
-            delegate.removeAll(elements);
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Map.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Map.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Map.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -575,6 +575,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -587,7 +588,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -649,6 +649,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -661,7 +662,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -783,6 +783,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (backingStore != null)
         {
             boolean backingSuccess = true;
@@ -813,12 +815,11 @@
                 }
             }
 
-            delegate.removeAll(elements);
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Properties.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Properties.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Properties.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -538,6 +538,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
         
         if (backingStore != null)
         {
@@ -550,7 +551,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
     
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -614,6 +614,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -626,7 +627,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -748,6 +748,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (backingStore != null)
         {
             boolean backingSuccess = true;
@@ -778,12 +780,11 @@
                 }
             }
 
-            delegate.removeAll(elements);
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -637,6 +637,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -649,7 +650,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -714,10 +714,10 @@
 
     /**
      * Method to remove a Collection of elements.
-     * @param c The collection to remove
+     * @param elements The collection to remove
      * @return Whether they were removed successfully.
      **/
-    public synchronized boolean removeAll(java.util.Collection c)
+    public synchronized boolean removeAll(java.util.Collection elements)
     {
         makeDirty();
  
@@ -725,10 +725,13 @@
         {
             loadFromStore();
         }
+
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management
-            Iterator iter = c.iterator();
+            Iterator iter = elements.iterator();
             RelationshipManager relMgr = ownerSM.getExecutionContext().getRelationshipManager(ownerSM);
             while (iter.hasNext())
             {
@@ -744,7 +747,7 @@
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : c)
+                for (Object element : elements)
                 {
                     if (contains(element))
                     {
@@ -757,7 +760,7 @@
             {
                 try
                 {
-                    backingSuccess = backingStore.removeAll(ownerSM, c, size);
+                    backingSuccess = backingStore.removeAll(ownerSM, elements, size);
                 }
                 catch (NucleusDataStoreException dse)
                 {
@@ -766,12 +769,11 @@
                 }
             }
 
-            delegate.removeAll(c); // Remove from the delegate too
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(c);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedMap.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedMap.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -669,6 +669,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -681,7 +682,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
  
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -740,6 +740,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -752,7 +753,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -829,6 +829,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management
@@ -870,12 +872,11 @@
                 }
             }
 
-            delegate.removeAll(elements); // Remove from the delegate too
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -785,6 +785,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -797,7 +798,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -936,6 +936,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (backingStore != null)
         {
             boolean backingSuccess = true;
@@ -966,12 +968,11 @@
                 }
             }
 
-            delegate.removeAll(elements);
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeMap.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeMap.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeMap.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -670,6 +670,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -682,7 +683,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
  
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -740,6 +740,7 @@
     public void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -752,7 +753,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -829,6 +829,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
         {
             // Relationship management
@@ -870,12 +872,11 @@
                 }
             }
 
-            delegate.removeAll(elements); // Remove from the delegate too
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java	2012-01-17 18:28:39 UTC (rev 14056)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java	2012-01-18 09:17:07 UTC (rev 14057)
@@ -899,6 +899,7 @@
     public synchronized void clear()
     {
         makeDirty();
+        delegate.clear();
 
         if (backingStore != null)
         {
@@ -911,7 +912,6 @@
                 backingStore.clear(ownerSM);
             }
         }
-        delegate.clear();
     }
 
     /**
@@ -1026,6 +1026,8 @@
             loadFromStore();
         }
 
+        boolean delegateSuccess = delegate.removeAll(elements);
+
         if (backingStore != null)
         {
             boolean backingSuccess = true;
@@ -1056,12 +1058,11 @@
                 }
             }
 
-            delegate.removeAll(elements); // Remove from the delegate too
             return backingSuccess;
         }
         else
         {
-            return delegate.removeAll(elements);
+            return delegateSuccess;
         }
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[14419] platform/core/trunk/src/java/org/ datanucleus/store/types/sco/backed

From: <andy_jefferson@us...> - 2012-03-15 15:21

Revision: 14419
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14419&view=rev
Author:   andy_jefferson
Date:     2012-03-15 15:21:14 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
[NUCCORE-821] Further update to removeAll to only remove from the delegate when we have all info

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -921,23 +921,32 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -725,6 +725,20 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        java.util.Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
@@ -741,18 +755,13 @@
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/HashSet.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -684,6 +684,20 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
@@ -700,18 +714,14 @@
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
 
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedHashSet.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -670,6 +670,20 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
@@ -686,18 +700,13 @@
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/LinkedList.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -938,23 +938,32 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/List.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -915,23 +915,32 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/PriorityQueue.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -18,6 +18,7 @@
 package org.datanucleus.store.types.sco.backed;
 
 import java.io.ObjectStreamException;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
 
@@ -783,23 +784,32 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Queue.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -18,6 +18,7 @@
 package org.datanucleus.store.types.sco.backed;
 
 import java.io.ObjectStreamException;
+import java.util.Collection;
 import java.util.Iterator;
 
 import org.datanucleus.ClassLoaderResolver;
@@ -748,23 +749,32 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Set.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -21,6 +21,7 @@
 package org.datanucleus.store.types.sco.backed;
 
 import java.io.ObjectStreamException;
+import java.util.Collection;
 import java.util.Iterator;
 
 import org.datanucleus.ClassLoaderResolver;
@@ -726,6 +727,20 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
@@ -742,18 +757,13 @@
         if (backingStore != null)
         {
             boolean backingSuccess = false;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/SortedSet.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -829,6 +829,20 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
@@ -845,18 +859,13 @@
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Stack.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -936,23 +936,32 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/TreeSet.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -829,6 +829,20 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (ownerSM != null && ownerSM.getExecutionContext().getManageRelations())
@@ -845,18 +859,13 @@
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java	2012-03-15 15:16:56 UTC (rev 14418)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Vector.java	2012-03-15 15:21:14 UTC (rev 14419)
@@ -1026,23 +1026,32 @@
             loadFromStore();
         }
 
+        int size = (useCache ? delegate.size() : -1);
+        Collection contained = null;
+        if (backingStore != null && SCOUtils.useQueuedUpdate(queued, ownerSM))
+        {
+            // Check which are contained before updating the delegate
+            contained = new java.util.HashSet();
+            for (Object elem : elements)
+            {
+                if (contains(elem))
+                {
+                    contained.add(elem);
+                }
+            }
+        }
         boolean delegateSuccess = delegate.removeAll(elements);
 
         if (backingStore != null)
         {
             boolean backingSuccess = true;
-            int size = (useCache ? delegate.size() : -1);
-
             if (SCOUtils.useQueuedUpdate(queued, ownerSM))
             {
                 backingSuccess = false;
-                for (Object element : elements)
+                for (Object element : contained)
                 {
-                    if (contains(element))
-                    {
-                        backingSuccess = true;
-                        addQueuedOperation(new RemoveCollectionOperation(element, true));
-                    }
+                    backingSuccess = true;
+                    addQueuedOperation(new RemoveCollectionOperation(element, true));
                 }
             }
             else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[DataNucleus-commits] SF.net SVN: datanucleus:[14426] platform/core/trunk/src/java/org/ datanucleus/store/types/sco/backed

From: <andy_jefferson@us...> - 2012-03-19 18:09

Revision: 14426
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14426&view=rev
Author:   andy_jefferson
Date:     2012-03-19 18:09:02 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
[NUCCORE-822] Change update process for Sets so that when the user updates a Collection with a new one it doesn't just delete then add

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java
    platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java	2012-03-19 17:59:51 UTC (rev 14425)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/ArrayList.java	2012-03-19 18:09:02 UTC (rev 14426)
@@ -157,6 +157,8 @@
                     NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("023008", 
                         ownerSM.toPrintableID(), fieldName, "" + c.size()));
                 }
+
+                // TODO Improve this and work out which elements are added and which deleted
                 clear();
                 addAll(c);
             }

Modified: platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2012-03-19 17:59:51 UTC (rev 14425)
+++ platform/core/trunk/src/java/org/datanucleus/store/types/sco/backed/Collection.java	2012-03-19 18:09:02 UTC (rev 14426)
@@ -24,6 +24,7 @@
 
 import java.io.ObjectStreamException;
 import java.util.Iterator;
+import java.util.Set;
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusDataStoreException;
@@ -174,8 +175,55 @@
                         ownerSM.toPrintableID(), fieldName, "" + c.size()));
                 }
 
-                clear();
-                addAll(c);
+                if (delegate instanceof Set)
+                {
+                    // Detect which objects are added and which are deleted
+                    if (useCache)
+                    {
+                        isCacheLoaded = false; // Mark as false since need to load the old collection
+                        loadFromStore();
+
+                        for (Object elem : c)
+                        {
+                            if (!delegate.contains(elem))
+                            {
+                                add(elem);
+                            }
+                        }
+                        java.util.HashSet delegateCopy = new java.util.HashSet(delegate);
+                        for (Object elem : delegateCopy)
+                        {
+                            if (!c.contains(elem))
+                            {
+                                remove(elem);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        for (Object elem : c)
+                        {
+                            if (!contains(elem))
+                            {
+                                add(elem);
+                            }
+                        }
+                        Iterator iter = iterator();
+                        while (iter.hasNext())
+                        {
+                            Object elem = iter.next();
+                            if (!c.contains(elem))
+                            {
+                                remove(elem);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    clear();
+                    addAll(c);
+                }
             }
             else
             {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.