-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-54337][PS] Add support for PyCapsule to Pyspark #53391
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
Open
devin-petersohn
wants to merge
13
commits into
apache:master
Choose a base branch
from
devin-petersohn:devin/pycapsule
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+182
−1
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8bd06bf
[SPARK-54337][PS] Add support for PyCapsule to Pyspark
devin-petersohn 51c341f
Lint
devin-petersohn 0de26e3
Add test
devin-petersohn 6ab12e3
License on new files
devin-petersohn db30a25
Remove __dataframe__
devin-petersohn b3c0cd9
Avoid copy to python bytes, manually build the pyarrow array from buf…
devin-petersohn b380413
lint
devin-petersohn a2009f1
Apply suggestions from code review
devin-petersohn 9a56f09
Address comments
devin-petersohn 101636f
Move file
devin-petersohn 2748ef5
Merge remote-tracking branch 'upstream/master' into devin/pycapsule
devin-petersohn 0af8766
Update skip comment
devin-petersohn deb4df5
Lint
devin-petersohn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| from typing import Iterator, Optional | ||
|
|
||
| import pyarrow as pa | ||
|
|
||
| import pyspark.sql | ||
| from pyspark.sql.types import StructType, StructField, BinaryType | ||
| from pyspark.sql.pandas.types import to_arrow_schema | ||
|
|
||
|
|
||
| def _get_arrow_array_partition_stream(df: pyspark.sql.DataFrame) -> Iterator[pa.RecordBatch]: | ||
| """Return all the partitions as Arrow arrays in an Iterator.""" | ||
| # We will be using mapInArrow to convert each partition to Arrow RecordBatches. | ||
| # The return type of the function will be a single binary column containing | ||
| # the serialized RecordBatch in Arrow IPC format. | ||
| binary_schema = StructType([StructField("arrow_ipc_bytes", BinaryType(), nullable=False)]) | ||
|
|
||
| def batch_to_bytes_iter(batch_iter: Iterator[pa.RecordBatch]) -> Iterator[pa.RecordBatch]: | ||
| """ | ||
| A generator function that converts RecordBatches to serialized Arrow IPC format. | ||
|
|
||
| Spark sends each partition as an iterator of RecordBatches. In order to return | ||
| the entire partition as a stream of Arrow RecordBatches, we need to serialize | ||
| each RecordBatch to Arrow IPC format and yield it as a single binary blob. | ||
| """ | ||
| # The size of the batch can be controlled by the Spark config | ||
| # `spark.sql.execution.arrow.maxRecordsPerBatch`. | ||
| for arrow_batch in batch_iter: | ||
| # We create an in-memory byte stream to hold the serialized batch | ||
| sink = pa.BufferOutputStream() | ||
| # Write the batch to the stream using Arrow IPC format | ||
| with pa.ipc.new_stream(sink, arrow_batch.schema) as writer: | ||
| writer.write_batch(arrow_batch) | ||
| buf = sink.getvalue() | ||
| # The second buffer contains the offsets we are manually creating. | ||
| offset_buf = pa.array([0, len(buf)], type=pa.int32()).buffers()[1] | ||
| null_bitmap = None | ||
| # Wrap the bytes in a new 1-row, 1-column RecordBatch to satisfy mapInArrow return | ||
| # signature. This serializes the whole batch into a single pyarrow serialized cell. | ||
| storage_arr = pa.Array.from_buffers( | ||
| type=pa.binary(), length=1, buffers=[null_bitmap, offset_buf, buf] | ||
| ) | ||
| yield pa.RecordBatch.from_arrays([storage_arr], names=["arrow_ipc_bytes"]) | ||
|
|
||
| # Convert all partitions to Arrow RecordBatches and map to binary blobs. | ||
| byte_df = df.mapInArrow(batch_to_bytes_iter, binary_schema) | ||
| # A row is actually a batch of data in Arrow IPC format. Fetch the batches one by one. | ||
| for row in byte_df.toLocalIterator(): | ||
| with pa.ipc.open_stream(row.arrow_ipc_bytes) as reader: | ||
| for batch in reader: | ||
| # Each batch corresponds to a chunk of data in the partition. | ||
| yield batch | ||
|
|
||
|
|
||
| class SparkArrowCStreamer: | ||
| """ | ||
| A class that implements that __arrow_c_stream__ protocol for Spark partitions. | ||
|
|
||
| This class is implemented in a way that allows consumers to consume each partition | ||
| one at a time without materializing all partitions at once on the driver side. | ||
| """ | ||
|
|
||
| def __init__(self, df: pyspark.sql.DataFrame): | ||
| self._df = df | ||
| self._schema = to_arrow_schema(df.schema) | ||
|
|
||
| def __arrow_c_stream__(self, requested_schema: Optional[object] = None) -> object: | ||
| """ | ||
| Return the Arrow C stream for the dataframe partitions. | ||
| """ | ||
| reader: pa.RecordBatchReader = pa.RecordBatchReader.from_batches( | ||
| self._schema, _get_arrow_array_partition_stream(self._df) | ||
| ) | ||
| return reader.__arrow_c_stream__(requested_schema=requested_schema) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| import unittest | ||
| import pyarrow as pa | ||
| import pandas as pd | ||
| import pyspark.pandas as ps | ||
|
|
||
| try: | ||
| import duckdb | ||
|
|
||
| DUCKDB_TESTS = True | ||
| except ImportError: | ||
| DUCKDB_TESTS = False | ||
|
|
||
|
|
||
| @unittest.skipIf(not DUCKDB_TESTS, "duckdb is not installed") | ||
| class TestSparkArrowCStreamer(unittest.TestCase): | ||
devin-petersohn marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| def test_spark_arrow_c_streamer(self): | ||
| pdf = pd.DataFrame([[1, "a"], [2, "b"], [3, "c"], [4, "d"]], columns=["id", "value"]) | ||
| psdf = ps.from_pandas(pdf) | ||
| # Use Spark Arrow C Streamer to convert PyArrow Table to DuckDB relation | ||
| stream = pa.RecordBatchReader.from_stream(psdf) | ||
| assert isinstance(stream, pa.RecordBatchReader) | ||
|
|
||
| # Verify the contents of the DuckDB relation | ||
| result = duckdb.execute("SELECT id, value from stream").fetchall() | ||
| expected = [(1, "a"), (2, "b"), (3, "c"), (4, "d")] | ||
| self.assertEqual(result, expected) | ||
ueshin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| from pyspark.sql.tests.test_interchange import * # noqa: F401 | ||
|
|
||
| try: | ||
| import xmlrunner # type: ignore | ||
|
|
||
| test_runner = xmlrunner.XMLTestRunner(output="target/test-reports", verbosity=2) | ||
| except ImportError: | ||
| test_runner = None | ||
| unittest.main(testRunner=test_runner, verbosity=2) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.