Aggregating ring buffer correction to reset cleared buffer to identit…

…y value.
deephaven · Oct 21, 2024 · b3a02fb · b3a02fb
1 parent c969c11
commit b3a02fb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 32 deletions.
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingByteRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingByteRingBuffer.java
@@ -431,14 +431,12 @@ public byte[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingCharRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingCharRingBuffer.java
@@ -427,14 +427,12 @@ public char[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java
@@ -431,14 +431,12 @@ public double[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBuffer.java
@@ -431,14 +431,12 @@ public float[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingIntRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingIntRingBuffer.java
@@ -431,14 +431,12 @@ public int[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingLongRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingLongRingBuffer.java
@@ -431,14 +431,12 @@ public long[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java
@@ -431,14 +431,12 @@ public T[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingShortRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingShortRingBuffer.java
@@ -431,14 +431,12 @@ public short[] remove(int count) {
      * O(size).
      */
     public void clear() {
-        final long prevHead = internalBuffer.head;
-        final int prevSize = size();
-
         internalBuffer.clear();
 
         calcHead = calcTail = 0;
+
         // Reset the cleared storage entries to the identity value
-        fillWithIdentityVal(prevHead, prevSize);
+        Arrays.fill(internalBuffer.storage, identityVal);
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }