Skip to content

src: reduce string allocations on sqlite #57227

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
nodejs-github-bot merged 2 commits into from
Mar 1, 2025
Merged

src: reduce string allocations on sqlite #57227

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12e4eef
src: reduce string allocations on sqlite
anonrig Feb 27, 2025
8a206df
Apply suggestions from code review
anonrig Feb 27, 2025
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
Next Next commit
src: reduce string allocations on sqlite
  • Loading branch information
@anonrig
anonrig committed Feb 27, 2025
commit 12e4eef1dd9ca2137cad06ed13b4c69927ab4024
48 changes: 16 additions & 32 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,54 +593,38 @@ bool DatabaseSync::ShouldIgnoreSQLiteError() {
std::optional<std::string> ValidateDatabasePath(Environment* env,
Local<Value> path,
const std::string& field_name) {
auto has_null_bytes = [](const std::string& str) {
return str.find('\0') != std::string::npos;
constexpr auto has_null_bytes = [](std::string_view str) {
return str.find('\0') != std::string_view::npos;
};
std::string location;
if (path->IsString()) {
location = Utf8Value(env->isolate(), path.As<String>()).ToString();
if (!has_null_bytes(location)) {
return location;
auto location = Utf8Value(env->isolate(), path.As<String>());
if (!has_null_bytes(location.ToStringView())) {
return location.ToString();
}
Comment thread
anonrig marked this conversation as resolved.
Outdated
}

if (path->IsUint8Array()) {
} else if (path->IsUint8Array()) {
Local<Uint8Array> buffer = path.As<Uint8Array>();
size_t byteOffset = buffer->ByteOffset();
size_t byteLength = buffer->ByteLength();
auto data =
static_cast<const uint8_t*>(buffer->Buffer()->Data()) + byteOffset;
if (!(std::find(data, data + byteLength, 0) != data + byteLength)) {
Local<Value> out;
if (String::NewFromUtf8(env->isolate(),
reinterpret_cast<const char*>(data),
NewStringType::kNormal,
static_cast<int>(byteLength))
.ToLocal(&out)) {
return Utf8Value(env->isolate(), out.As<String>()).ToString();
}
if (std::find(data, data + byteLength, 0) == data + byteLength) {
return std::string(reinterpret_cast<const char*>(data), byteLength);
}
}

// When is URL
if (path->IsObject()) {
Local<Object> url = path.As<Object>();
} else if (path->IsObject()) { // When is URL
auto url = path.As<Object>();
Local<Value> href;
Local<Value> protocol;
if (url->Get(env->context(), env->href_string()).ToLocal(&href) &&
href->IsString() &&
url->Get(env->context(), env->protocol_string()).ToLocal(&protocol) &&
protocol->IsString()) {
location = Utf8Value(env->isolate(), href.As<String>()).ToString();
href->IsString()) {
const auto location_value = Utf8Value(env->isolate(), href.As<String>());
Comment thread
anonrig marked this conversation as resolved.
Outdated
auto location = location_value.ToStringView();
if (!has_null_bytes(location)) {
auto file_url = ada::parse(location);
CHECK(file_url);
if (file_url->type != ada::scheme::FILE) {
CHECK(ada::can_parse(location));
if (!location.starts_with("file:")) {
THROW_ERR_INVALID_URL_SCHEME(env->isolate());
return std::nullopt;
}

return location;
return location_value.ToString();
}
}
}
Expand Down