Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src_cpp/py_query_result.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,26 @@ py::dict buildCSRResult(lbug::main::ArrowQueryResult::CSRArrowArrays arrays) {

} // namespace

// PyDate_FromDate, PyDateTime_FromDateAndTime and
// PyDateTimeAPI->DateTime_FromDateAndTime each return a *new* reference.
// py::cast<py::object>(PyObject*) treats the pointer as borrowed and adds its
// own reference, leaking the original. Steal the new reference instead, and
// propagate the Python error if construction failed (returns nullptr). NOLINTNEXTLINE
static py::object stealNewReference(PyObject* object) {
if (object == nullptr) {
throw py::error_already_set();
}
return py::reinterpret_steal<py::object>(object);
}

static py::object converTimestampToPyObject(timestamp_t& timestamp) {
int32_t year = 0, month = 0, day = 0, hour = 0, min = 0, sec = 0, micros = 0;
date_t date;
dtime_t time;
Timestamp::convert(timestamp, date, time);
Date::convert(date, year, month, day);
Time::convert(time, hour, min, sec, micros);
return py::cast<py::object>(
PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, micros));
return stealNewReference(PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, micros));
}

py::object PyQueryResult::convertValueToPyObject(const Value& value) {
Expand Down Expand Up @@ -200,7 +211,7 @@ py::object PyQueryResult::convertValueToPyObject(const Value& value) {
auto dateVal = value.getValue<date_t>();
int32_t year = 0, month = 0, day = 0;
Date::convert(dateVal, year, month, day);
return py::cast<py::object>(PyDate_FromDate(year, month, day));
return stealNewReference(PyDate_FromDate(year, month, day));
}
case LogicalTypeID::TIMESTAMP: {
auto timestampVal = value.getValue<timestamp_t>();
Expand All @@ -215,7 +226,7 @@ py::object PyQueryResult::convertValueToPyObject(const Value& value) {
Date::convert(date, year, month, day);
Time::convert(time, hour, min, sec, micros);

return py::cast<py::object>(PyDateTimeTZ_FromDateAndTime(year, month, day, hour, min, sec,
return stealNewReference(PyDateTimeTZ_FromDateAndTime(year, month, day, hour, min, sec,
micros, PyDateTime_TimeZone_UTC));
}
case LogicalTypeID::TIMESTAMP_NS: {
Expand Down
Loading