You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by dz...@apache.org on 2022/07/20 17:13:46 UTC
[drill] 03/10: DRILL-8249: Parquet decoding error reading nation.dict.parquet from test framework (#2594)
This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch 1.20
in repository https://gitbox.apache.org/repos/asf/drill.git
commit ae02cf5abb5ff4d8153fd27eb59c4801630364dd
Author: James Turton <91...@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 | 4 ++++
.../apache/drill/exec/store/parquet/columnreaders/ColumnReader.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
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 e184a91f49..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,6 +306,10 @@ public class SSLConfigServer extends SSLConfig {
@Override
public int getHandshakeTimeout() {
+ // 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 {