-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Iceberg/Comet integration POC #9841
base: main
Are you sure you want to change the base?
Conversation
...k/src/main/java/org/apache/iceberg/spark/data/vectorized/comet/CometIcebergColumnReader.java
Outdated
Show resolved
Hide resolved
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.
I think this is the right direction to take. I did an initial high-level pass. Looking forward to having a Comet release soon.
...k/src/main/java/org/apache/iceberg/spark/data/vectorized/comet/CometIcebergColumnReader.java
Outdated
Show resolved
Hide resolved
...k/src/main/java/org/apache/iceberg/spark/data/vectorized/comet/CometIcebergColumnReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/build.gradle
Outdated
} | ||
|
||
compileOnly "org.apache.comet:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.1.0-SNAPSHOT" |
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.
I assume this library will only contain the reader, not the operators.
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.
Right. This only contains the 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.
Does it need to be Spark Version Dependent? Just wondering
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 are currently doing some experiments to see if we can provide a Spark Version independent jar.
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.
+1 for exploring that.
...ain/java/org/apache/iceberg/spark/data/vectorized/comet/CometIcebergColumnarBatchReader.java
Outdated
Show resolved
Hide resolved
...ain/java/org/apache/iceberg/spark/data/vectorized/comet/CometIcebergColumnarBatchReader.java
Outdated
Show resolved
Hide resolved
...ain/java/org/apache/iceberg/spark/data/vectorized/comet/CometIcebergColumnarBatchReader.java
Outdated
Show resolved
Hide resolved
...rk/src/main/java/org/apache/iceberg/spark/data/vectorized/VectorizedSparkParquetReaders.java
Outdated
Show resolved
Hide resolved
...in/java/org/apache/iceberg/spark/data/vectorized/comet/CometIcebergPositionColumnReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkConfParser.java
Outdated
Show resolved
Hide resolved
...v3.4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/BaseColumnBatchLoader.java
Outdated
Show resolved
Hide resolved
....4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/comet/CometColumnReader.java
Outdated
Show resolved
Hide resolved
@@ -45,6 +45,7 @@ buildscript { | |||
} | |||
} | |||
|
|||
String sparkMajorVersion = '3.4' |
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.
I hope we can soon have a snapshot for Comet jar independent of Spark to clean up deps here.
We can't have parquet
module depend on a jar with any Spark deps.
spark/v3.4/build.gradle
Outdated
} | ||
|
||
compileOnly "org.apache.comet:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.1.0-SNAPSHOT" |
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.
+1 for exploring that.
import org.apache.spark.sql.vectorized.ColumnVector; | ||
import org.apache.spark.sql.vectorized.ColumnarBatch; | ||
|
||
@SuppressWarnings("checkstyle:VisibilityModifier") |
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.
These changes would require a bit more time to review. I'll do that tomorrow. I think we would want to restructure the original implementation a bit. Not a concern for now.
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 would want to structure this a bit differently. Let me think more.
...rk/src/main/java/org/apache/iceberg/spark/data/vectorized/VectorizedSparkParquetReaders.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkColumnarReaderFactory.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/BaseBatchReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatch.java
Outdated
Show resolved
Hide resolved
@aokolnychyi I have addressed the comments. Could you please take one more look when you have a moment? Thanks a lot! |
Will check today. |
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/ParquetReaderType.java
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkSQLProperties.java
Outdated
Show resolved
Hide resolved
import org.apache.spark.sql.vectorized.ColumnVector; | ||
import org.apache.spark.sql.vectorized.ColumnarBatch; | ||
|
||
@SuppressWarnings("checkstyle:VisibilityModifier") |
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 would want to structure this a bit differently. Let me think more.
...k/v3.4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/ColumnarBatchReader.java
Outdated
Show resolved
Hide resolved
....4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/comet/CometColumnReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/BaseBatchReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatch.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkColumnarReaderFactory.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkColumnarReaderFactory.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/BatchReadConf.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkReadConf.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkReadConf.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkSQLProperties.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/BaseBatchReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/BatchDataReader.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatch.java
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkReadConf.java
Outdated
Show resolved
Hide resolved
spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/BatchReadConf.java
Outdated
Show resolved
Hide resolved
@huaxingao - Hi, is the Comet Parquet reader able to support page skipping/use page indexes? -eg see #193 for the Iceberg Parquet reader initial issue. |
@cornelcreanga Comet Parquet reader doesn't support page skipping yet |
hey @huaxingao |
@PaulLiang1 Thank you for your interest! We are currently working on a binary release of DataFusion Comet. Once the binary release is available, I will proceed with this PR. |
@huaxingao Thanks |
@PaulLiang1 Thanks! I'll check with my colleague tomorrow to find out where we are in the binary release process. |
@PaulLiang1 We are pretty close to this and will have a binary release for Comet soon. |
got it, thanks for letting me know. please feel free to let us know if there is anything we could help on. thanks! |
that's an interesting proposal for sure! |
@findepi We have TPCH benchmark results for Parquet files (without iceberg) on the DataFusion Comet website. We are still working on improving performance. We don't have benchmarks for Iceberg yet. We will post the benchmarks once they are available. |
The query-level benchmarks like TPCH aren't needed, I guess. It would good to know how different Parquet reader implementations compare against each other, so that we know what do we gain by embracing native. |
@findepi Comet's Parquet reader is a hybrid implementation: IO and decompression are done in the JVM while decoding is done natively. There is some performance gain from native decoding, but the gain is not substantial. However, by switching to the Comet Parquet reader, Comet will recognize that this is a Comet scan and will convert the Spark physical plan into a Comet plan for native execution. The major performance gain will be from this native execution. |
thanks @huaxingao for this additional explanation. This makes sense. Can you please replicate that information in the PR description as well? thanks! |
@aokolnychyi We finally have a Comet binary release, and I've updated the PR to use it. Could you please take a look at the PR when you have time? Thanks a lot! |
@huaxingao Very interested in this work and thanks a bunch for taking this on! Wanted to see if this PR addresses all changes needed on the iceberg side needed to integrate comet with iceberg. For example do we also need to do things such as
Wanted to also see if you think this is at a place where we can try to port this change into our iceberg fork? Also wanted to see if there is anything we can do to help out here! |
@bmorck Thanks for your interest! Currently, this PR only enables the CometBatchReader for batch reading; it does not yet turn on Comet's native operators. In the next step, I will make |
This pull request has been marked as stale due to 30 days of inactivity. It will be closed in 1 week if no further activity occurs. If you think that’s incorrect or this pull request requires a review, please simply write any comment. If closed, you can revive the PR at any time and @mention a reviewer or discuss it on the [email protected] list. Thank you for your contributions. |
This PR shows how I will integrate Comet with iceberg. The PR doesn't compile yet because we haven't released Comet yet, but it shows the ideas how we are going to change iceberg code to integrate Comet. Also, Comet doesn't have Spark3.5 support yet so I am doing this on 3.4, but we will add 3.5 support in Comet.
In
VectorizedSparkParquetReaders.buildReader
, if Comet library is available, aCometIcebergColumnarBatchReader
will be created, which will use Comet batch reader to read data. We can also add a property later to control whether we want to use Comet or not.The logic in
CometIcebergVectorizedReaderBuilder
is very similar toVectorizedReaderBuilder
. It builds Comet column reader instead of iceberg column reader.The delete logic in
CometIcebergColumnarBatchReader
is exactly the same as the one inColumnarBatchReader
. I will extract the common code and put the common code in a base class.The main motivation of this PR is to improve performance using native execution. Comet's Parquet reader is a hybrid implementation: IO and decompression are done in the JVM while decoding is done natively. There is some performance gain from native decoding, but the gain is not much. However, by switching to the Comet Parquet reader, Comet will recognize that this is a Comet scan and will convert the Spark physical plan into a Comet plan for native execution. The major performance gain will be from this native execution.