From d85d4ba720a0936ee636320be8cfefe9a72565f9 Mon Sep 17 00:00:00 2001 From: Cheng Su Date: Thu, 28 Oct 2021 11:39:33 -0700 Subject: [PATCH] Addressed all comments --- .../sql/execution/datasources/orc/OrcColumnStatistics.java | 2 +- .../spark/sql/execution/datasources/orc/OrcFooterReader.java | 2 +- .../apache/spark/sql/execution/datasources/orc/OrcUtils.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcColumnStatistics.java b/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcColumnStatistics.java index 77d82fd3d7f2d..8adb9e8ca20be 100644 --- a/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcColumnStatistics.java +++ b/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcColumnStatistics.java @@ -31,7 +31,7 @@ * tree pre-ordering. This is used for aggregate push down in ORC. * * For nested data types (array, map and struct), the sub-field statistics are stored recursively - * inside parent column's `children` field. Here is an example of `OrcColumnStatistics`: + * inside parent column's children field. Here is an example of {@link OrcColumnStatistics}: * * Data schema: * c1: int diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcFooterReader.java b/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcFooterReader.java index 74091e9bd8074..546b048648844 100644 --- a/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcFooterReader.java +++ b/sql/core/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcFooterReader.java @@ -27,7 +27,7 @@ import java.util.Queue; /** - * `OrcFooterReader` is a util class which encapsulates the helper + * {@link OrcFooterReader} is a util class which encapsulates the helper * methods of reading ORC file footer. */ public class OrcFooterReader { diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcUtils.scala index 56c63cb7e1977..b2624150a9151 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcUtils.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcUtils.scala @@ -402,7 +402,7 @@ object OrcUtils extends Logging { var columnsStatistics: OrcColumnStatistics = null try { columnsStatistics = OrcFooterReader.readStatistics(reader) - } catch { case e: RuntimeException => + } catch { case e: Exception => throw new SparkException( s"Cannot read columns statistics in file: $filePath. Please consider disabling " + s"ORC aggregate push down by setting 'spark.sql.orc.aggregatePushdown' to false.", e)