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.
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 cafb2ef..e3a1ca6 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 @@
@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 1bc62b1..3cd63ae 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 @@
}
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 {
