Make assertion provide more info

niloc132 · Jun 25, 2024 · d327ca2 · d327ca2
1 parent 3b8992f
commit d327ca2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 21 deletions.
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
@@ -268,9 +268,7 @@ static WritableByteChunk<Values> extractChunkFromInputStreamWithConversion(
             // consumed entire validity buffer by here
 
             final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
 
             if (options.useDeephavenNulls()) {
                 useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);

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
@@ -264,9 +264,7 @@ static WritableCharChunk<Values> extractChunkFromInputStreamWithConversion(
             // consumed entire validity buffer by here
 
             final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
 
             if (options.useDeephavenNulls()) {
                 useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);

diff --git a/.../src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java b/.../src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java
@@ -269,9 +269,7 @@ static WritableDoubleChunk<Values> extractChunkFromInputStreamWithConversion(
             // consumed entire validity buffer by here
 
             final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
 
             if (options.useDeephavenNulls()) {
                 useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);

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
@@ -268,9 +268,7 @@ static WritableFloatChunk<Values> extractChunkFromInputStreamWithConversion(
             // consumed entire validity buffer by here
 
             final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
 
             if (options.useDeephavenNulls()) {
                 useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);

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
@@ -269,9 +269,7 @@ static WritableIntChunk<Values> extractChunkFromInputStreamWithConversion(
             // consumed entire validity buffer by here
 
             final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
 
             if (options.useDeephavenNulls()) {
                 useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);

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
@@ -269,9 +269,7 @@ static WritableLongChunk<Values> extractChunkFromInputStreamWithConversion(
             // consumed entire validity buffer by here
 
             final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
 
             if (options.useDeephavenNulls()) {
                 useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);

diff --git a/...e/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkInputStreamGenerator.java b/...e/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkInputStreamGenerator.java
@@ -268,9 +268,7 @@ static WritableShortChunk<Values> extractChunkFromInputStreamWithConversion(
             // consumed entire validity buffer by here
 
             final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
 
             if (options.useDeephavenNulls()) {
                 useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);