Skip to content

Commit 322c224

Browse files
committed
Bugfix: destoy delta encodedAdditions after its safe to do so
1 parent 391578b commit 322c224

8 files changed

+4
-4
lines changed

hollow/src/main/java/com/netflix/hollow/core/read/engine/list/HollowListDeltaApplicator.java

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public void applyDelta() {
7272

7373
from.encodedRemovals = null;
7474
removalsReader.destroy();
75-
additionsReader.destroy();
7675
}
7776

7877
private void slowDelta() {

hollow/src/main/java/com/netflix/hollow/core/read/engine/list/HollowListTypeReadState.java

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema schema, ArraySegmentRecy
123123
nextData.applyDelta(oldData, deltaData);
124124
shards[i].setCurrentData(nextData);
125125
notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
126+
deltaData.encodedAdditions.destroy();
126127
oldData.destroy();
127128
}
128129
deltaData.destroy();

hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapDeltaApplicator.java

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public void applyDelta() {
8181

8282
from.encodedRemovals = null;
8383
removalsReader.destroy();
84-
additionsReader.destroy();
8584
}
8685

8786
private void slowDelta() {

hollow/src/main/java/com/netflix/hollow/core/read/engine/map/HollowMapTypeReadState.java

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema schema, ArraySegmentRecy
130130
nextData.applyDelta(oldData, deltaData);
131131
shards[i].setCurrentData(nextData);
132132
notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
133+
deltaData.encodedAdditions.destroy();
133134
oldData.destroy();
134135
}
135136
deltaData.destroy();

hollow/src/main/java/com/netflix/hollow/core/read/engine/object/HollowObjectDeltaApplicator.java

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ void applyDelta() {
9898

9999
from.encodedRemovals = null;
100100
removalsReader.destroy();
101-
additionsReader.destroy();
102101
}
103102

104103
private boolean canDoFastDelta() {

hollow/src/main/java/com/netflix/hollow/core/read/engine/object/HollowObjectTypeReadState.java

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema deltaSchema, ArraySegmen
131131
nextData.applyDelta(oldData, deltaData);
132132
shards[i].setCurrentData(nextData);
133133
notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
134+
deltaData.encodedAdditions.destroy();
134135
oldData.destroy();
135136
}
136137
deltaData.destroy();

hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetDeltaApplicator.java

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public void applyDelta() {
7878

7979
from.encodedRemovals = null;
8080
removalsReader.destroy();
81-
additionsReader.destroy();
8281

8382
}
8483

hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetTypeReadState.java

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public void applyDelta(HollowBlobInput in, HollowSchema schema, ArraySegmentRecy
131131
nextData.applyDelta(oldData, deltaData);
132132
shards[i].setCurrentData(nextData);
133133
notifyListenerAboutDeltaChanges(deltaData.encodedRemovals, deltaData.encodedAdditions, i, shards.length);
134+
deltaData.encodedAdditions.destroy();
134135
oldData.destroy();
135136
}
136137
deltaData.destroy();

0 commit comments

Comments
 (0)