Skip to content

Revert "Cache rowsAffected/insertId/rows PropNameIDs per-runtime" #449

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.

Sign up for GitHub

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
ospfranco merged 1 commit into from
Sep 5, 2026
Merged

Revert "Cache rowsAffected/insertId/rows PropNameIDs per-runtime" #449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 9 additions & 44 deletions cpp/OPUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,13 @@
#include "OPMacros.hpp"
#include <fstream>
#include <sys/stat.h>
#include <unordered_map>
#include <utility>

namespace opsqlite {

namespace jsi = facebook::jsi;
namespace react = facebook::react;

namespace {

// "rowsAffected"/"insertId"/"rows" are set on every execute() result
// regardless of query, so their PropNameIDs are worth caching the same way
// column_prop_ids are reused across rows -- except these are reused across
// *calls* too. PropNameID is a handle scoped to the jsi::Runtime that
// created it, and runtime "generations" can briefly overlap during a
// bridgeless reload (see OPTypes.hpp), so the cache is keyed by Runtime*
// rather than a single global. thread_local because JSI runtime access is
// always confined to one thread at a time; no lock needed.
struct ResultPropNames {
jsi::PropNameID rowsAffected;
jsi::PropNameID insertId;
jsi::PropNameID rows;
};

ResultPropNames &result_prop_names(jsi::Runtime &rt) {
static thread_local std::unordered_map<jsi::Runtime *, ResultPropNames> cache;
auto it = cache.find(&rt);
if (it != cache.end()) {
return it->second;
}
auto [inserted, _] = cache.emplace(
&rt, ResultPropNames{jsi::PropNameID::forAscii(rt, "rowsAffected"),
jsi::PropNameID::forAscii(rt, "insertId"),
jsi::PropNameID::forAscii(rt, "rows")});
return inserted->second;
}

} // namespace

jsi::Value to_jsi(jsi::Runtime &rt, const JSVariant &value) {
if (std::holds_alternative<bool>(value)) {
return std::get<bool>(value);
Expand Down Expand Up @@ -210,19 +178,18 @@ std::vector<JSVariant> to_variant_vec(jsi::Runtime &rt, jsi::Value const &xs) {
}

jsi::Value create_js_rows(jsi::Runtime &rt, const BridgeResult &status) {
auto &prop_names = result_prop_names(rt);
jsi::Object res = jsi::Object(rt);

res.setProperty(rt, prop_names.rowsAffected, status.affectedRows);
res.setProperty(rt, "rowsAffected", status.affectedRows);
if (status.affectedRows > 0 && status.insertId != 0) {
res.setProperty(rt, prop_names.insertId, jsi::Value(status.insertId));
res.setProperty(rt, "insertId", jsi::Value(status.insertId));
}

size_t row_count = status.rows.size();
size_t column_count = status.column_names.size();

if (row_count == 0) {
res.setProperty(rt, prop_names.rows, jsi::Array(rt, 0));
res.setProperty(rt, "rows", jsi::Array(rt, 0));
return res;
}

Expand All @@ -241,7 +208,7 @@ jsi::Value create_js_rows(jsi::Runtime &rt, const BridgeResult &status) {
}
rows.setValueAtIndex(rt, i, std::move(row));
}
res.setProperty(rt, prop_names.rows, std::move(rows));
res.setProperty(rt, "rows", std::move(rows));

return res;
}
Expand All @@ -250,12 +217,11 @@ jsi::Value
create_result(jsi::Runtime &rt, const BridgeResult &status,
std::vector<DumbHostObject> *results,
std::shared_ptr<std::vector<SmartHostObject>> metadata) {
auto &prop_names = result_prop_names(rt);
jsi::Object res = jsi::Object(rt);

res.setProperty(rt, prop_names.rowsAffected, status.affectedRows);
res.setProperty(rt, "rowsAffected", status.affectedRows);
if (status.affectedRows > 0 && status.insertId != 0) {
res.setProperty(rt, prop_names.insertId, jsi::Value(status.insertId));
res.setProperty(rt, "insertId", jsi::Value(status.insertId));
}

size_t rowCount = results->size();
Expand All @@ -267,7 +233,7 @@ create_result(jsi::Runtime &rt, const BridgeResult &status,
jsi::Object::createFromHostObject(
rt, std::make_shared<DumbHostObject>(obj)));
}
res.setProperty(rt, prop_names.rows, std::move(array));
res.setProperty(rt, "rows", std::move(array));

size_t column_count = metadata->size();
auto column_array = jsi::Array(rt, column_count);
Expand All @@ -286,7 +252,6 @@ create_result(jsi::Runtime &rt, const BridgeResult &status,
jsi::Value
create_raw_result(jsi::Runtime &rt, const BridgeResult &status,
const std::vector<std::vector<JSVariant>> *results) {
auto &prop_names = result_prop_names(rt);
size_t row_count = results->size();
jsi::Object res(rt);
jsi::Array raw_rows = jsi::Array(rt, row_count);
Expand All @@ -306,8 +271,8 @@ create_raw_result(jsi::Runtime &rt, const BridgeResult &status,
rt, i, jsi::String::createFromUtf8(rt, status.column_names.at(i)));
}

res.setProperty(rt, prop_names.rowsAffected, status.affectedRows);
res.setProperty(rt, prop_names.insertId, status.insertId);
res.setProperty(rt, "rowsAffected", status.affectedRows);
res.setProperty(rt, "insertId", status.insertId);
res.setProperty(rt, "rawRows", std::move(raw_rows));
res.setProperty(rt, "columnNames", std::move(column_names));

Expand Down
Loading