This is an automated email from the ASF dual-hosted git repository.
pvary pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 9203eaff9e Arrow: Fix valuesRead accumulation in
VectorizedDeltaEncodedValuesReader (#17121)
9203eaff9e is described below
commit 9203eaff9eb97fef9d1f5a3ef4460e8453adaed9
Author: Yuya Ebihara <[email protected]>
AuthorDate: Fri Nov 6 23:27:28 2026 +0900
Arrow: Fix valuesRead accumulation in VectorizedDeltaEncodedValuesReader
(#17121)
---
.../VectorizedDeltaEncodedValuesReader.java | 4 +-
.../TestVectorizedDeltaEncodedValuesReader.java | 72 ++++++++++++++++++++++
2 files changed, 74 insertions(+), 2 deletions(-)
diff --git
a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedDeltaEncodedValuesReader.java
b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedDeltaEncodedValuesReader.java
index a0f4b113a8..16939cc18d 100644
---
a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedDeltaEncodedValuesReader.java
+++
b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedDeltaEncodedValuesReader.java
@@ -150,7 +150,7 @@ public class VectorizedDeltaEncodedValuesReader extends
ValuesReader
int currentRowId = rowId;
// First value
if (valuesRead == 0 && total > 0) {
- outputWriter.write(vec, ((long) (currentRowId + valuesRead) *
typeWidth), firstValue);
+ outputWriter.write(vec, ((long) currentRowId * typeWidth), firstValue);
lastValueRead = firstValue;
currentRowId++;
remaining--;
@@ -166,7 +166,7 @@ public class VectorizedDeltaEncodedValuesReader extends
ValuesReader
currentRowId += loadedRows;
remaining -= loadedRows;
}
- valuesRead = total - remaining;
+ valuesRead += total - remaining;
}
/**
diff --git
a/arrow/src/test/java/org/apache/iceberg/arrow/vectorized/parquet/TestVectorizedDeltaEncodedValuesReader.java
b/arrow/src/test/java/org/apache/iceberg/arrow/vectorized/parquet/TestVectorizedDeltaEncodedValuesReader.java
new file mode 100644
index 0000000000..e21bb7ba00
--- /dev/null
+++
b/arrow/src/test/java/org/apache/iceberg/arrow/vectorized/parquet/TestVectorizedDeltaEncodedValuesReader.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iceberg.arrow.vectorized.parquet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.apache.parquet.bytes.ByteBufferInputStream;
+import org.apache.parquet.bytes.ByteBufferReleaser;
+import org.apache.parquet.bytes.HeapByteBufferAllocator;
+import
org.apache.parquet.column.values.delta.DeltaBinaryPackingValuesWriterForInteger;
+import org.apache.parquet.io.ParquetDecodingException;
+import org.junit.jupiter.api.Test;
+
+class TestVectorizedDeltaEncodedValuesReader {
+ @Test
+ void readIntegersNoMoreValues() throws Exception {
+ // 10 values: read in two batches of 6 then 4, then assert the overflow
guard fires
+ int[] values = {10, 20, 30, 40, 50, 60, 70, 80, 90, 100};
+ VectorizedDeltaEncodedValuesReader reader = readerFor(values);
+
+ int[] batch1 = reader.readIntegers(6, 0);
+ int[] batch2 = reader.readIntegers(4, 0);
+
+ assertThat(batch1).containsExactly(10, 20, 30, 40, 50, 60);
+ assertThat(batch2).containsExactly(70, 80, 90, 100);
+
+ assertThat(reader.totalValueCount()).isEqualTo(10);
+ assertThatThrownBy(() -> reader.readIntegers(1, 0))
+ .isInstanceOf(ParquetDecodingException.class)
+ .hasMessageContaining("No more values to read");
+ }
+
+ private static VectorizedDeltaEncodedValuesReader readerFor(int... values)
throws IOException {
+ ByteBuffer encoded = write(values);
+ VectorizedDeltaEncodedValuesReader reader = new
VectorizedDeltaEncodedValuesReader();
+ reader.initFromPage(values.length, ByteBufferInputStream.wrap(encoded));
+ return reader;
+ }
+
+ private static ByteBuffer write(int[] values) {
+ try (DeltaBinaryPackingValuesWriterForInteger writer =
+ new DeltaBinaryPackingValuesWriterForInteger(
+ 128, 4, 100, 200, HeapByteBufferAllocator.getInstance())) {
+ for (int value : values) {
+ writer.writeInteger(value);
+ }
+
+ return writer
+ .getBytes()
+ .toByteBuffer(new
ByteBufferReleaser(HeapByteBufferAllocator.getInstance()));
+ }
+ }
+}
