tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Python modules reloadable

Browse Source 
Reviewers: mferencevic, buda

Reviewed By: mferencevic, buda

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2763
This commit is contained in:
Lovro Lugovic 2020-04-22 18:00:04 +02:00
parent f35225f26b
commit 317f7f118c
1 changed files with 14 additions and 12 deletions

26
src/query/procedure/module.cpp
View File

@ -369,10 +369,20 @@ bool PythonModule::Close() {
CHECK(py_module_)
<< "Attempting to close a module that has not been loaded...";
LOG(INFO) << "Closing module " << file_path_ << " ...";
// Deleting procedures will probably release PyObject closures, so we need to
// take the GIL.
// The procedures are closures which hold references to the Python callbacks.
// Releasing these references might result in deallocations so we need to take
// the GIL.
auto gil = py::EnsureGIL();
procedures_.clear();
// Delete the module from the `sys.modules` directory so that the module will
// be properly imported if imported again.
py::Object sys(PyImport_ImportModule("sys"));
if (PyDict_DelItemString(sys.GetAttr("modules").Ptr(),
file_path_.stem().c_str()) != 0) {
LOG(WARNING) << "Failed to remove the module from sys.modules";
py_module_ = py::Object(nullptr);
return false;
}
py_module_ = py::Object(nullptr);
LOG(INFO) << "Closed module " << file_path_;
return true;
@ -381,16 +391,8 @@ bool PythonModule::Close() {
bool PythonModule::Reload() {
CHECK(py_module_)
<< "Attempting to reload a module that has not been loaded...";
auto gil = py::EnsureGIL();
procedures_.clear();
py_module_ =
WithModuleRegistration(&procedures_, [&](auto *module_def, auto *memory) {
return ReloadPyModule(py_module_.Ptr(), module_def);
});
if (py_module_) return true;
auto exc_info = py::FetchError().value();
LOG(ERROR) << "Unable to reload module; " << exc_info;
return false;
if (!Close()) return false;
return Load(file_path_);
}
const std::map<std::string, mgp_proc, std::less<>> *PythonModule::Procedures()