[drill] branch master updated: DRILL-8249: Parquet decoding error reading nation.dict.parquet from test framework (#2594)

[dzamo]

This is an automated email from the ASF dual-hosted git repository.

dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new 769e200229 DRILL-8249: Parquet decoding error reading 
nation.dict.parquet from test framework (#2594)
769e200229 is described below

commit 769e2002290ee528bb7920bea9ca42da4b577581
Author: James Turton <9107319+jntur...@users.noreply.github.com>
AuthorDate: Wed Jul 13 06:53:23 2022 +0200

    DRILL-8249: Parquet decoding error reading nation.dict.parquet from test 
framework (#2594)
    
    The usingDictionary flag may be updated by the Parquet page reader
    and become true even though the column chunk metadata indicates no
    use of a dictionary page.
---
 .../src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java   | 7 ++++---
 .../drill/exec/store/parquet/columnreaders/ColumnReader.java       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java 
b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java
index cafb2ef213..e3a1ca6516 100644
--- 
a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java
+++ 
b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java
@@ -306,9 +306,10 @@ public class SSLConfigServer extends SSLConfig {
 
   @Override
   public int getHandshakeTimeout() {
-    // TODO: (DRILL-8183) why do we hard code this when we provide
-    // {@link ExecConstants.SSL_HANDSHAKE_TIMEOUT}?
-    // A value of 0 is interpreted by Netty as "no timeout".
+    // A value of 0 is interpreted by Netty as "no timeout". This is hard coded
+    // here instead being read from {@link ExecConstants.SSL_HANDSHAKE_TIMEOUT}
+    // because the SSL handshake timeout is managed from the client end only
+    // (see {@link SSLConfigClient}).
     return 0;
   }
 
diff --git 
a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java
 
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java
index 1bc62b18dc..3cd63aeea4 100644
--- 
a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java
+++ 
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java
@@ -223,7 +223,7 @@ public abstract class ColumnReader<V extends ValueVector> {
   }
 
   protected boolean recordsRequireDecoding() {
-    return !Collections.disjoint(VALUE_ENCODINGS, 
columnChunkMetaData.getEncodings());
+    return usingDictionary || !Collections.disjoint(VALUE_ENCODINGS, 
columnChunkMetaData.getEncodings());
   }
 
   protected boolean processPageData(int recordsToReadInThisPass) throws 
IOException {