GH-48241: [Python] Scalar inferencing doesn't infer UUID #48727
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -296,16 +296,69 @@ bool PyFloat_IsNaN(PyObject* obj) { | |
|
|
||
| namespace { | ||
|
|
||
| // Thread-safe one-time Python module import + attribute lookup. For Pandas and UUID. | ||
| // Uses std::call_once when the GIL is disabled, or a simple boolean flag when | ||
| // the GIL is enabled to avoid deadlocks. See ARROW-10519 for more details and | ||
| // https://github.com/apache/arrow/commit/f69061935e92e36e25bb891177ca8bc4f463b272 | ||
| struct ModuleOnceRunner { | ||
| std::string module_name; | ||
| #ifdef Py_GIL_DISABLED | ||
| std::once_flag initialized; | ||
| #else | ||
| bool initialized = false; | ||
| #endif | ||
|
|
||
| explicit ModuleOnceRunner(const std::string& module_name) : module_name(module_name) {} | ||
|
|
||
| template <typename Func> | ||
| void RunOnce(Func&& func) { | ||
| auto do_init = [&]() { | ||
| OwnedRef module; | ||
| if (ImportModule(module_name, &module).ok()) { | ||
| #ifndef Py_GIL_DISABLED | ||
| // Since ImportModule can release the GIL, another thread could have | ||
| // already initialized the static data. | ||
| if (initialized) { | ||
| return; | ||
| } | ||
| #endif | ||
| func(module); | ||
| } | ||
| }; | ||
| #ifdef Py_GIL_DISABLED | ||
| std::call_once(initialized, do_init); | ||
| #else | ||
| if (!initialized) { | ||
| do_init(); | ||
| initialized = true; | ||
| } | ||
| #endif | ||
|
Member
There was a problem hiding this comment. We're duplicating code here between different module imports. It would be really nice to write something like this: struct UuidModuleData {
PyObject* UUID_class = nullptr;
};
UuidModuleData* InitUuidStaticData() {
static ModuleOnceRunner runner("uuid");
return runner.Run([&](OwnedRef module) -> UuidModuleData {
UuidModuleData data;
OwnedRef ref;
if (ImportFromModule(module.obj(), "UUID", &ref).ok()) {
data.UUID_class = ref.obj();
}
return data;
});
}struct ModuleOnceRunner {
std::string module_name;
#ifdef Py_GIL_DISABLED
std::once_flag initialized;
#else
bool initialized = false;
#endif
template <typename Func>
auto Run(Func&& func) -> decltype(func(OwnedRef()) {
using RetType = decltype(func(OwnedRef());
RetType ret{};
auto wrapper_func = [&]() {
OwnerRef module;
if (ImportModule("uuid", &module).ok()) {
ret = func(std::move(module));
}
};
#ifdef Py_GIL_DISABLED
std::call_once(initialized, wrapper_func);
#else
if (!initialized) {
initialized = true;
wrapper_func();
}
#endif
return ret;
};
};
I think @rok can help. |
||
| } | ||
| }; | ||
|
|
||
| static PyObject* uuid_UUID = nullptr; | ||
| static ModuleOnceRunner uuid_runner("uuid"); | ||
|
|
||
| } // namespace | ||
|
|
||
| bool IsPyUuid(PyObject* obj) { | ||
| uuid_runner.RunOnce([](OwnedRef& module) { | ||
| OwnedRef ref; | ||
| if (ImportFromModule(module.obj(), "UUID", &ref).ok()) { | ||
| uuid_UUID = ref.obj(); | ||
| } | ||
| }); | ||
| if (!uuid_UUID) return false; | ||
| int result = PyObject_IsInstance(obj, uuid_UUID); | ||
| if (result < 0) { | ||
| PyErr_Clear(); | ||
| return false; | ||
| } | ||
| return result != 0; | ||
| } | ||
|
|
||
| namespace { | ||
|
|
||
| // Once initialized, these variables hold borrowed references to Pandas static data. | ||
| // We should not use OwnedRef here because Python destructors would be | ||
| // called on a finalized interpreter. | ||
|
|
@@ -315,72 +368,43 @@ static PyObject* pandas_Timedelta = nullptr; | |
| static PyObject* pandas_Timestamp = nullptr; | ||
| static PyTypeObject* pandas_NaTType = nullptr; | ||
| static PyObject* pandas_DateOffset = nullptr; | ||
| static ModuleOnceRunner pandas_runner("pandas"); | ||
|
|
||
| } // namespace | ||
|
|
||
| void InitPandasStaticData() { | ||
| pandas_runner.RunOnce([](OwnedRef& module) { | ||
| OwnedRef ref; | ||
|
|
||
| // set NaT sentinel and its type | ||
| if (ImportFromModule(module.obj(), "NaT", &ref).ok()) { | ||
| pandas_NaT = ref.obj(); | ||
| // PyObject_Type returns a new reference but we trust that pandas.NaT will | ||
| // outlive our use of this PyObject* | ||
| pandas_NaTType = Py_TYPE(ref.obj()); | ||
| } | ||
|
|
||
| // retain a reference to Timedelta | ||
| if (ImportFromModule(module.obj(), "Timedelta", &ref).ok()) { | ||
| pandas_Timedelta = ref.obj(); | ||
| } | ||
|
|
||
| // retain a reference to Timestamp | ||
| if (ImportFromModule(module.obj(), "Timestamp", &ref).ok()) { | ||
| pandas_Timestamp = ref.obj(); | ||
| } | ||
|
|
||
| // if pandas.NA exists, retain a reference to it | ||
| if (ImportFromModule(module.obj(), "NA", &ref).ok()) { | ||
| pandas_NA = ref.obj(); | ||
| } | ||
|
|
||
| // Import DateOffset type | ||
| if (ImportFromModule(module.obj(), "DateOffset", &ref).ok()) { | ||
| pandas_DateOffset = ref.obj(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| bool PandasObjectIsNull(PyObject* obj) { | ||
| if (!MayHaveNaN(obj)) { | ||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.