-
Notifications
You must be signed in to change notification settings - Fork 4k
GH-33801: [Python] Expose C++ ExtensionTypes/ExtensionArrays in pyarrow #33802
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
Merged
jorisvandenbossche
merged 13 commits into
apache:master
from
sjperkins:extension-type-fixes
Feb 16, 2023
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
c7592a9
Fix exposing C++ ExtensionArrays in pyarrow
sjperkins 6be252d
fix linting errors
sjperkins d82ecfc
Return __arrow_ext_class__ and __arrow_ext_scalar_class__ methods to …
sjperkins f21c427
Move extension type test to test_extension_type.py, and rename to tes…
sjperkins 98bbb4a
assert array.type == uuid_type
sjperkins 16c5e5a
Lint
sjperkins e666487
lint
sjperkins 5e9db77
Add IPC serialisation testing
sjperkins dd87d5e
Return dunder methods to original location in file
sjperkins cc72ec1
Register the extension type
sjperkins a17e926
Register UuidType at the C++ layer
sjperkins 43eb94e
Strengthen IPC test case
sjperkins dbe302a
Register UuidExtensionType statically
sjperkins 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| # 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. | ||
|
|
||
| # distutils: language=c++ | ||
| # cython: language_level = 3 | ||
|
|
||
| import pyarrow as pa | ||
| from pyarrow.lib cimport * | ||
|
|
||
| cdef extern from * namespace "arrow::py" nogil: | ||
| """ | ||
| #include "arrow/status.h" | ||
| #include "arrow/extension_type.h" | ||
| #include "arrow/ipc/json_simple.h" | ||
|
|
||
| namespace arrow { | ||
| namespace py { | ||
|
|
||
| class UuidArray : public ExtensionArray { | ||
| public: | ||
| using ExtensionArray::ExtensionArray; | ||
| }; | ||
|
|
||
| class UuidType : public ExtensionType { | ||
| public: | ||
| UuidType() : ExtensionType(fixed_size_binary(16)) {} | ||
| std::string extension_name() const override { return "uuid"; } | ||
|
|
||
| bool ExtensionEquals(const ExtensionType& other) const override { | ||
| return other.extension_name() == this->extension_name(); | ||
| } | ||
|
|
||
| std::shared_ptr<Array> MakeArray(std::shared_ptr<ArrayData> data) const override { | ||
| return std::make_shared<ExtensionArray>(data); | ||
| } | ||
|
|
||
| Result<std::shared_ptr<DataType>> Deserialize( | ||
| std::shared_ptr<DataType> storage_type, | ||
| const std::string& serialized) const override { | ||
| return std::make_shared<UuidType>(); | ||
| } | ||
|
|
||
| std::string Serialize() const override { return ""; } | ||
| }; | ||
|
|
||
|
|
||
| std::shared_ptr<DataType> MakeUuidType() { | ||
| return std::make_shared<UuidType>(); | ||
| } | ||
|
|
||
| std::shared_ptr<Array> MakeUuidArray() { | ||
| auto uuid_type = MakeUuidType(); | ||
| auto json = "[\\"abcdefghijklmno0\\", \\"0onmlkjihgfedcba\\"]"; | ||
| auto result = ipc::internal::json::ArrayFromJSON(fixed_size_binary(16), json); | ||
| return ExtensionType::WrapArray(uuid_type, result.ValueOrDie()); | ||
| } | ||
|
|
||
| std::once_flag uuid_registered; | ||
|
|
||
| static bool RegisterUuidType() { | ||
| std::call_once(uuid_registered, RegisterExtensionType, | ||
| std::make_shared<UuidType>()); | ||
| return true; | ||
| } | ||
|
|
||
| static auto uuid_type_registered = RegisterUuidType(); | ||
|
|
||
| } // namespace py | ||
| } // namespace arrow | ||
| """ | ||
|
|
||
| cdef shared_ptr[CDataType] CMakeUuidType" arrow::py::MakeUuidType"() | ||
| cdef shared_ptr[CArray] CMakeUuidArray" arrow::py::MakeUuidArray"() | ||
|
|
||
|
|
||
| def _make_uuid_type(): | ||
| return pyarrow_wrap_data_type(CMakeUuidType()) | ||
|
|
||
|
|
||
| def _make_uuid_array(): | ||
| return pyarrow_wrap_array(CMakeUuidArray()) |
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
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.