Bugfix: destoy delta encodedAdditions after its safe to do so

Netflix · Sep 9, 2023 · 322c224 · 322c224
1 parent 391578b
commit 322c224
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/list/HollowListDeltaApplicator.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/list/HollowListDeltaApplicator.java
@@ -72,7 +72,6 @@ public void applyDelta() {
 
         from.encodedRemovals = null;
         removalsReader.destroy();
-        additionsReader.destroy();
     }
 
     private void slowDelta() {

diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/list/HollowListTypeReadState.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/list/HollowListTypeReadState.java
@@ -123,6 +123,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema schema, ArraySegmentRecy
                 nextData.applyDelta(oldData, deltaData);
                 shards[i].setCurrentData(nextData);
                 notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
+                deltaData.encodedAdditions.destroy();
                 oldData.destroy();
             }
             deltaData.destroy();

diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapDeltaApplicator.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapDeltaApplicator.java
@@ -81,7 +81,6 @@ public void applyDelta() {
 
         from.encodedRemovals = null;
         removalsReader.destroy();
-        additionsReader.destroy();
     }
 
     private void slowDelta() {

diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapTypeReadState.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapTypeReadState.java
@@ -130,6 +130,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema schema, ArraySegmentRecy
                 nextData.applyDelta(oldData, deltaData);
                 shards[i].setCurrentData(nextData);
                 notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
+                deltaData.encodedAdditions.destroy();
                 oldData.destroy();
             }
             deltaData.destroy();

diff --git a/...src/main/java/com/netflix/hollow/core/read/engine/object/HollowObjectDeltaApplicator.java b/...src/main/java/com/netflix/hollow/core/read/engine/object/HollowObjectDeltaApplicator.java
@@ -98,7 +98,6 @@ void applyDelta() {
 
         from.encodedRemovals = null;
         removalsReader.destroy();
-        additionsReader.destroy();
     }
 
     private boolean canDoFastDelta() {

diff --git a/...w/src/main/java/com/netflix/hollow/core/read/engine/object/HollowObjectTypeReadState.java b/...w/src/main/java/com/netflix/hollow/core/read/engine/object/HollowObjectTypeReadState.java
@@ -131,6 +131,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema deltaSchema, ArraySegmen
                 nextData.applyDelta(oldData, deltaData);
                 shards[i].setCurrentData(nextData);
                 notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
+                deltaData.encodedAdditions.destroy();
                 oldData.destroy();
             }
             deltaData.destroy();

diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetDeltaApplicator.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetDeltaApplicator.java
@@ -78,7 +78,6 @@ public void applyDelta() {
 
         from.encodedRemovals = null;
         removalsReader.destroy();
-        additionsReader.destroy();
 
     }
 

diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetTypeReadState.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetTypeReadState.java
@@ -131,6 +131,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema schema, ArraySegmentRecy
                 nextData.applyDelta(oldData, deltaData);
                 shards[i].setCurrentData(nextData);
                 notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
+                deltaData.encodedAdditions.destroy();
                 oldData.destroy();
             }
             deltaData.destroy();