[jira] [Commented] (PARQUET-1461) Third party code does not compile after parquet-mr minor version update

["ASF GitHub Bot (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/PARQUET-1461?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16697014#comment-16697014 ] 

ASF GitHub Bot commented on PARQUET-1461:
-----------------------------------------

zivanfi closed pull request #556: PARQUET-1461: Third party code does not compile after parquet-mr minor version update
URL: https://github.com/apache/parquet-mr/pull/556
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/parquet-column/src/main/java/org/apache/parquet/column/values/ValuesReader.java b/parquet-column/src/main/java/org/apache/parquet/column/values/ValuesReader.java
index 06771e975..6943d91eb 100644
--- a/parquet-column/src/main/java/org/apache/parquet/column/values/ValuesReader.java
+++ b/parquet-column/src/main/java/org/apache/parquet/column/values/ValuesReader.java
@@ -65,6 +65,9 @@
    */
   @Deprecated
   public void initFromPage(int valueCount, ByteBuffer page, int offset) throws IOException {
+    if (offset < 0) {
+      throw new IllegalArgumentException("Illegal offset: " + offset);
+    }
     actualOffset = offset;
     ByteBuffer pageWithOffset = page.duplicate();
     pageWithOffset.position(offset);
@@ -103,7 +106,14 @@ public void initFromPage(int valueCount, byte[] page, int offset) throws IOExcep
    *
    * @throws IOException if there is an exception while reading from the input stream
    */
-  public abstract void initFromPage(int valueCount, ByteBufferInputStream in) throws IOException;
+  public void initFromPage(int valueCount, ByteBufferInputStream in) throws IOException {
+    if (actualOffset != -1) {
+      throw new UnsupportedOperationException(
+          "Either initFromPage(int, ByteBuffer, int) or initFromPage(int, ByteBufferInputStream) must be implemented in "
+              + getClass().getName());
+    }
+    initFromPage(valueCount, in.slice(valueCount), 0);
+  }
 
   /**
    * Called to return offset of the next section
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/values/TestValuesReaderImpl.java b/parquet-column/src/test/java/org/apache/parquet/column/values/TestValuesReaderImpl.java
new file mode 100644
index 000000000..27ed7b550
--- /dev/null
+++ b/parquet-column/src/test/java/org/apache/parquet/column/values/TestValuesReaderImpl.java
@@ -0,0 +1,150 @@
+/*
+ * 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.parquet.column.values;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.function.Consumer;
+
+import org.apache.parquet.bytes.ByteBufferInputStream;
+import org.apache.parquet.io.api.Binary;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests how {@link ValuesReader} works in case of extending it.
+ */
+public class TestValuesReaderImpl {
+
+  private static class InvalidValuesReaderImpl extends ValuesReader {
+    @Override
+    public void skip() {
+    }
+  }
+
+  private static class ByteBufferValuesReaderImpl extends ValuesReader {
+    private byte[] data;
+
+    @Override
+    public void initFromPage(int valueCount, ByteBuffer page, int offset) throws IOException {
+      data = new byte[valueCount];
+      ByteBuffer buffer = page.duplicate();
+      buffer.position(offset);
+      buffer.get(data);
+    }
+
+    public void assertPageEquals(String expected) {
+      Assert.assertEquals(expected, new String(data));
+    }
+
+    @Override
+    public void skip() {
+    }
+
+    @Override
+    public Binary readBytes() {
+      return Binary.fromConstantByteArray(data);
+    }
+  }
+
+  private static class ByteBufferInputStreamValuesReaderImpl extends ValuesReader {
+    private byte[] data;
+
+    @Override
+    public void initFromPage(int valueCount, ByteBufferInputStream in) throws IOException {
+      data = new byte[valueCount];
+      int off = 0;
+      int len = valueCount;
+      int read;
+      while ((read = in.read(data, off, len)) != -1 && len > 0) {
+        off += read;
+        len -= read;
+      }
+    }
+
+    @Override
+    public void skip() {
+    }
+
+    @Override
+    public Binary readBytes() {
+      return Binary.fromConstantByteArray(data);
+    }
+  }
+
+  @Test
+  public void testInvalidValuesReaderImpl() throws IOException {
+    ValuesReader reader = new InvalidValuesReaderImpl();
+    try {
+      validateWithByteArray(reader);
+      fail("An UnsupportedOperationException should have been thrown");
+    } catch (UnsupportedOperationException e) {
+    }
+    try {
+      validateWithByteBuffer(reader);
+      fail("An UnsupportedOperationException should have been thrown");
+    } catch (UnsupportedOperationException e) {
+    }
+    try {
+      validateWithByteBufferInputStream(reader);
+      fail("An UnsupportedOperationException should have been thrown");
+    } catch (UnsupportedOperationException e) {
+    }
+  }
+
+  @Test
+  public void testByteBufferValuesReaderImpl() throws IOException {
+    ValuesReader reader = new ByteBufferValuesReaderImpl();
+    validateWithByteArray(reader);
+    validateWithByteBuffer(reader);
+    validateWithByteBufferInputStream(reader);
+  }
+
+  @Test
+  public void testByteBufferInputStreamValuesReaderImpl() throws IOException {
+    ValuesReader reader = new ByteBufferInputStreamValuesReaderImpl();
+    validateWithByteArray(reader);
+    validateWithByteBuffer(reader);
+    validateWithByteBufferInputStream(reader);
+  }
+
+  private void validateWithByteArray(ValuesReader reader) throws IOException {
+    reader.initFromPage(25, "==padding==The expected page content".getBytes(), 11);
+    assertEquals("The expected page content", reader.readBytes().toStringUsingUTF8());
+  }
+
+  private void validateWithByteBuffer(ValuesReader reader) throws IOException {
+    reader.initFromPage(25, ByteBuffer.wrap("==padding==The expected page content".getBytes()), 11);
+    assertEquals("The expected page content", reader.readBytes().toStringUsingUTF8());
+  }
+
+  private void validateWithByteBufferInputStream(ValuesReader reader) throws IOException {
+    ByteBufferInputStream bbis = ByteBufferInputStream.wrap(
+        ByteBuffer.wrap("==padding==".getBytes()),
+        ByteBuffer.wrap("The expected ".getBytes()),
+        ByteBuffer.wrap("page content".getBytes()));
+    bbis.skipFully(11);
+    reader.initFromPage(25, bbis);
+    assertEquals("The expected page content", reader.readBytes().toStringUsingUTF8());
+  }
+}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> Third party code does not compile after parquet-mr minor version update
> -----------------------------------------------------------------------
>
>                 Key: PARQUET-1461
>                 URL: https://issues.apache.org/jira/browse/PARQUET-1461
>             Project: Parquet
>          Issue Type: Bug
>          Components: parquet-mr
>    Affects Versions: 1.11.0
>            Reporter: Zoltan Ivanfi
>            Assignee: Gabor Szadovszky
>            Priority: Major
>              Labels: pull-request-available
>             Fix For: 1.11.0
>
>
> Third party code implemented public void initFromPage(int valueCount, ByteBuffer page, int offset), but new version has public abstract initFromPage(int valueCount, ByteBufferInputStream in) instead.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)