-
Notifications
You must be signed in to change notification settings - Fork 28.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SPARK-34862][SQL] Support nested column in ORC vectorized reader #31958
Conversation
cc @cloud-fan, @maropu and @dongjoon-hyun could you help take a look when you have time, thanks. |
Test build #136514 has finished for PR 31958 at commit
|
Kubernetes integration test starting |
Kubernetes integration test status failure |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for working on this, @c21 .
Thank you @dongjoon-hyun and look forward to getting your feedback on this. |
cc @viirya too |
Test build #136538 has finished for PR 31958 at commit
|
Kubernetes integration test starting |
Kubernetes integration test status failure |
The unit test failed with MiMa tests
However in this PR, the class |
Test build #136577 has finished for PR 31958 at commit
|
Kubernetes integration test starting |
Kubernetes integration test status failure |
Kubernetes integration test starting |
Kubernetes integration test status failure |
Test build #136578 has finished for PR 31958 at commit
|
Kubernetes integration test starting |
Kubernetes integration test status failure |
Test build #136580 has finished for PR 31958 at commit
|
Kubernetes integration test starting |
Kubernetes integration test status failure |
schema.forall(_.dataType.isInstanceOf[AtomicType]) | ||
schema.forall(s => supportDataType(s.dataType) && | ||
!s.dataType.isInstanceOf[UserDefinedType[_]]) && | ||
supportBatchForNestedColumn(sparkSession, schema) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we do the same thing for Parquet, @c21 ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dongjoon-hyun - do you mean implementing Parquet vectorized reader for nested column? I created https://issues.apache.org/jira/browse/SPARK-34863 and plan to do it after this one, thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, thank you for creating SPARK-34863.
Also, cc @viirya since this is related to the nested columns. |
Test build #136635 has started for PR 31958 at commit |
@cloud-fan and @viirya could you help take a look? Thanks. |
private final long[] lengths; | ||
|
||
OrcArrayColumnVector( | ||
DataType type, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: 4 spaces indentation for parameters.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cloud-fan - updated.
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.streaming.SourceProgress.this") | ||
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.sql.streaming.SourceProgress.this"), | ||
|
||
// [SPARK-34862][SQL] Support nested column in ORC vectorized reader |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is weird, where do we change org.apache.spark.sql.vectorized.ColumnVector
in this PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cloud-fan - yeah it's weird. We don't change ColumnVector
class at all. Do you have any idea for how to debug on this? I am still checking why, thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe it's some bugs in Mima, not a bit deal as we know this PR doesn't break binary compatibility.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cloud-fan - spent some time checking, but still not sure where the issue is, so I agree with you that might be some bug in Mima.
private final long[] lengths; | ||
|
||
OrcMapColumnVector( | ||
DataType type, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto, indentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cloud-fan - updated.
For orc files without nested schema, do we observe perf regression after this PR? |
@cloud-fan - in theory here the difference for non-nested schema: Before this PR:
After this PR:
The only overhead introduced here is one more layer in classes, and might be some overhead for virtual function call and class loading. Tested on same type of machine in AWS EC2 for all ORC reader benchmarks: OrcReadBenchmark-results.txt and DataSourceReadBenchmark-results.txt (java 8 here). Do not see regression compared ORC vectorized reader and other ORC readers. Results: OrcReadBenchmark-results.txt Machine:
|
Kubernetes integration test starting |
Kubernetes integration test status failure |
Test build #136764 has finished for PR 31958 at commit
|
import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; | ||
import org.apache.spark.sql.types.ArrayType; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have a blank line between third party import and Spark's import.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@viirya - yes, I missed somehow, thanks for the careful review, updated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One comment about style, otherwise lgtm
Kubernetes integration test starting |
Kubernetes integration test status failure |
Test build #136781 has finished for PR 31958 at commit
|
Thanks. Merging to master. |
Thank you @viirya, @cloud-fan and @dongjoon-hyun for review! |
Thank you, @c21 and all! |
### What changes were proposed in this pull request? This PR is to support nested column type in Spark ORC vectorized reader. Currently ORC vectorized reader [does not support nested column type (struct, array and map)](https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala#L138). We implemented nested column vectorized reader for FB-ORC in our internal fork of Spark. We are seeing performance improvement compared to non-vectorized reader when reading nested columns. In addition, this can also help improve the non-nested column performance when reading non-nested and nested columns together in one query. Before this PR: * `OrcColumnVector` is the implementation class for Spark's `ColumnVector` to wrap Hive's/ORC's `ColumnVector` to read `AtomicType` data. After this PR: * `OrcColumnVector` is an abstract class to keep interface being shared between multiple implementation class of orc column vectors, namely `OrcAtomicColumnVector` (for `AtomicType`), `OrcArrayColumnVector` (for `ArrayType`), `OrcMapColumnVector` (for `MapType`), `OrcStructColumnVector` (for `StructType`). So the original logic to read `AtomicType` data is moved from `OrcColumnVector` to `OrcAtomicColumnVector`. The abstract class of `OrcColumnVector` is needed here because of supporting nested column (i.e. nested column vectors). * A utility method `OrcColumnVectorUtils.toOrcColumnVector` is added to create Spark's `OrcColumnVector` from Hive's/ORC's `ColumnVector`. * A new user-facing config `spark.sql.orc.enableNestedColumnVectorizedReader` is added to control enabling/disabling vectorized reader for nested columns. The default value is false (i.e. disabling by default). For certain tables having deep nested columns, vectorized reader might take too much memory for each sub-column vectors, compared to non-vectorized reader. So providing a config here to work around OOM for query reading wide and deep nested columns if any. We plan to enable it by default on 3.3. Leave it disable in 3.2 in case for any unknown bugs. ### Why are the changes needed? Improve query performance when reading nested columns from ORC file format. Tested with locally adding a small benchmark in `OrcReadBenchmark.scala`. Seeing more than 1x run time improvement. ``` Running benchmark: SQL Nested Column Scan Running case: Native ORC MR Stopped after 2 iterations, 37850 ms Running case: Native ORC Vectorized (Enabled Nested Column) Stopped after 2 iterations, 15892 ms Running case: Native ORC Vectorized (Disabled Nested Column) Stopped after 2 iterations, 37954 ms Running case: Hive built-in ORC Stopped after 2 iterations, 35118 ms Java HotSpot(TM) 64-Bit Server VM 1.8.0_181-b13 on Mac OS X 10.15.7 Intel(R) Core(TM) i9-9980HK CPU 2.40GHz SQL Nested Column Scan: Best Time(ms) Avg Time(ms) Stdev(ms) Rate(M/s) Per Row(ns) Relative ------------------------------------------------------------------------------------------------------------------------------ Native ORC MR 18706 18925 310 0.1 17839.6 1.0X Native ORC Vectorized (Enabled Nested Column) 7625 7946 455 0.1 7271.6 2.5X Native ORC Vectorized (Disabled Nested Column) 18415 18977 796 0.1 17561.5 1.0X Hive built-in ORC 17469 17559 127 0.1 16660.1 1.1X ``` Benchmark: ``` nestedColumnScanBenchmark(1024 * 1024) def nestedColumnScanBenchmark(values: Int): Unit = { val benchmark = new Benchmark(s"SQL Nested Column Scan", values, output = output) withTempPath { dir => withTempTable("t1", "nativeOrcTable", "hiveOrcTable") { import spark.implicits._ spark.range(values).map(_ => Random.nextLong).map { x => val arrayOfStructColumn = (0 until 5).map(i => (x + i, s"$x" * 5)) val mapOfStructColumn = Map( s"$x" -> (x * 0.1, (x, s"$x" * 100)), (s"$x" * 2) -> (x * 0.2, (x, s"$x" * 200)), (s"$x" * 3) -> (x * 0.3, (x, s"$x" * 300))) (arrayOfStructColumn, mapOfStructColumn) }.toDF("col1", "col2") .createOrReplaceTempView("t1") prepareTable(dir, spark.sql(s"SELECT * FROM t1")) benchmark.addCase("Native ORC MR") { _ => withSQLConf(SQLConf.ORC_VECTORIZED_READER_ENABLED.key -> "false") { spark.sql("SELECT SUM(SIZE(col1)), SUM(SIZE(col2)) FROM nativeOrcTable").noop() } } benchmark.addCase("Native ORC Vectorized (Enabled Nested Column)") { _ => spark.sql("SELECT SUM(SIZE(col1)), SUM(SIZE(col2)) FROM nativeOrcTable").noop() } benchmark.addCase("Native ORC Vectorized (Disabled Nested Column)") { _ => withSQLConf(SQLConf.ORC_VECTORIZED_READER_NESTED_COLUMN_ENABLED.key -> "false") { spark.sql("SELECT SUM(SIZE(col1)), SUM(SIZE(col2)) FROM nativeOrcTable").noop() } } benchmark.addCase("Hive built-in ORC") { _ => spark.sql("SELECT SUM(SIZE(col1)), SUM(SIZE(col2)) FROM hiveOrcTable").noop() } benchmark.run() } } } ``` ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Added one simple test in `OrcSourceSuite.scala` to verify correctness. Definitely need more unit tests and add benchmark here, but I want to first collect feedback before crafting more tests. Closes apache#31958 from c21/orc-vector. Authored-by: Cheng Su <chengsu@fb.com> Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com> (cherry picked from commit 1fc66f6)
What changes were proposed in this pull request?
This PR is to support nested column type in Spark ORC vectorized reader. Currently ORC vectorized reader does not support nested column type (struct, array and map). We implemented nested column vectorized reader for FB-ORC in our internal fork of Spark. We are seeing performance improvement compared to non-vectorized reader when reading nested columns. In addition, this can also help improve the non-nested column performance when reading non-nested and nested columns together in one query.
Before this PR:
OrcColumnVector
is the implementation class for Spark'sColumnVector
to wrap Hive's/ORC'sColumnVector
to readAtomicType
data.After this PR:
OrcColumnVector
is an abstract class to keep interface being shared between multiple implementation class of orc column vectors, namelyOrcAtomicColumnVector
(forAtomicType
),OrcArrayColumnVector
(forArrayType
),OrcMapColumnVector
(forMapType
),OrcStructColumnVector
(forStructType
). So the original logic to readAtomicType
data is moved fromOrcColumnVector
toOrcAtomicColumnVector
. The abstract class ofOrcColumnVector
is needed here because of supporting nested column (i.e. nested column vectors).OrcColumnVectorUtils.toOrcColumnVector
is added to create Spark'sOrcColumnVector
from Hive's/ORC'sColumnVector
.spark.sql.orc.enableNestedColumnVectorizedReader
is added to control enabling/disabling vectorized reader for nested columns. The default value is false (i.e. disabling by default). For certain tables having deep nested columns, vectorized reader might take too much memory for each sub-column vectors, compared to non-vectorized reader. So providing a config here to work around OOM for query reading wide and deep nested columns if any. We plan to enable it by default on 3.3. Leave it disable in 3.2 in case for any unknown bugs.Why are the changes needed?
Improve query performance when reading nested columns from ORC file format.
Tested with locally adding a small benchmark in
OrcReadBenchmark.scala
. Seeing more than 1x run time improvement.Benchmark:
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Added one simple test in
OrcSourceSuite.scala
to verify correctness.Definitely need more unit tests and add benchmark here, but I want to first collect feedback before crafting more tests.