Replace usage of trove in Chunk APIs (deephaven#5058)

Partial deephaven#188
malhotrashivam · Feb 9, 2024 · 4d3947b · 4d3947b
1 parent e505d65
commit 4d3947b
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 86 deletions.
diff --git a/...src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkInputStreamGenerator.java b/...src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkInputStreamGenerator.java
@@ -3,7 +3,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
@@ -23,6 +22,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -162,7 +162,7 @@ public interface ByteConversion {
     static WritableChunk<Values> extractChunkFromInputStream(
             final StreamReaderOptions options,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
@@ -175,15 +175,15 @@ static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
             final StreamReaderOptions options,
             final ByteConversion conversion,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableByteChunk<Values> chunk;
         if (outChunk != null) {

diff --git a/...ge/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkInputStreamGenerator.java b/...ge/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkInputStreamGenerator.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
@@ -28,6 +27,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -165,7 +165,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final int elementSize,
             final StreamReaderOptions options,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
@@ -179,15 +179,15 @@ static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
             final StreamReaderOptions options,
             final ByteConversion conversion,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableByteChunk<Values> chunk;
         if (outChunk != null) {

diff --git a/...ge/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkInputStreamGenerator.java b/...ge/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkInputStreamGenerator.java
@@ -3,7 +3,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
@@ -23,6 +22,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -160,7 +160,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final int elementSize,
             final StreamReaderOptions options,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
@@ -174,15 +174,15 @@ static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
             final StreamReaderOptions options,
             final CharConversion conversion,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableCharChunk<Values> chunk;
         if (outChunk != null) {

diff --git a/...arrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkInputStreamGenerator.java b/...arrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkInputStreamGenerator.java
@@ -4,7 +4,6 @@
 package io.deephaven.extensions.barrage.chunk;
 
 import com.google.common.base.Charsets;
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.WritableLongChunk;
@@ -28,10 +27,10 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 public interface ChunkInputStreamGenerator extends SafeCloseable {
 
@@ -158,7 +157,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final StreamReaderOptions options,
             final ChunkType chunkType, final Class<?> type, final Class<?> componentType,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk, final int offset, final int totalRows) throws IOException {
         return extractChunkFromInputStream(options, 1, chunkType, type, componentType, fieldNodeIter, bufferInfoIter, is,
@@ -170,7 +169,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final int factor,
             final ChunkType chunkType, final Class<?> type, final Class<?> componentType,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk, final int outOffset, final int totalRows) throws IOException {
         switch (chunkType) {

diff --git a/.../src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java b/.../src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
@@ -28,6 +27,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -165,7 +165,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final int elementSize,
             final StreamReaderOptions options,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
@@ -179,15 +179,15 @@ static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
             final StreamReaderOptions options,
             final DoubleConversion conversion,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableDoubleChunk<Values> chunk;
         if (outChunk != null) {

diff --git a/.../main/java/io/deephaven/extensions/barrage/chunk/FixedWidthChunkInputStreamGenerator.java b/.../main/java/io/deephaven/extensions/barrage/chunk/FixedWidthChunkInputStreamGenerator.java
@@ -3,7 +3,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.chunk.WritableObjectChunk;
@@ -14,6 +13,7 @@
 import java.io.DataInput;
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 public class FixedWidthChunkInputStreamGenerator {
     private static final String DEBUG_NAME = "FixedWidthChunkInputStreamGenerator";
@@ -45,15 +45,15 @@ static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTypeCon
             final StreamReaderOptions options,
             final TypeConversion<T> conversion,
             final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableObjectChunk<T, Values> chunk;
         if (outChunk != null) {

diff --git a/...e/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkInputStreamGenerator.java b/...e/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkInputStreamGenerator.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
@@ -28,6 +27,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -165,7 +165,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final int elementSize,
             final StreamReaderOptions options,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
@@ -179,15 +179,15 @@ static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
             final StreamReaderOptions options,
             final FloatConversion conversion,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableFloatChunk<Values> chunk;
         if (outChunk != null) {

diff --git a/...age/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkInputStreamGenerator.java b/...age/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkInputStreamGenerator.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
@@ -28,6 +27,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -165,7 +165,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final int elementSize,
             final StreamReaderOptions options,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
@@ -179,15 +179,15 @@ static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
             final StreamReaderOptions options,
             final IntConversion conversion,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableIntChunk<Values> chunk;
         if (outChunk != null) {

diff --git a/...ge/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkInputStreamGenerator.java b/...ge/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkInputStreamGenerator.java
@@ -8,7 +8,6 @@
  */
 package io.deephaven.extensions.barrage.chunk;
 
-import gnu.trove.iterator.TLongIterator;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
@@ -28,6 +27,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
+import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -165,7 +165,7 @@ static WritableChunk<Values> extractChunkFromInputStream(
             final int elementSize,
             final StreamReaderOptions options,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
@@ -179,15 +179,15 @@ static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
             final StreamReaderOptions options,
             final LongConversion conversion,
             final Iterator<FieldNodeInfo> fieldNodeIter,
-            final TLongIterator bufferInfoIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
             final DataInput is,
             final WritableChunk<Values> outChunk,
             final int outOffset,
             final int totalRows) throws IOException {
 
         final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.next();
-        final long payloadBuffer = bufferInfoIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
 
         final WritableLongChunk<Values> chunk;
         if (outChunk != null) {