src: improve KVStore API

This adds `const char*` based APIs to KVStore to avoid multiple string conversions (char -> Utf8 -> Local -> char etc.) when possible. PR-URL: #31773 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: lundibundi

src/env.h

@@ -608,11 +608,13 @@ class KVStore{
 
 virtual v8::MaybeLocal<v8::String> Get(v8::Isolate* isolate,
  v8::Local<v8::String> key) const = 0;
+virtual v8::Maybe<std::string> Get(constchar* key) const = 0;
 virtualvoidSet(v8::Isolate* isolate,
  v8::Local<v8::String> key,
  v8::Local<v8::String> value) = 0;
 virtualint32_tQuery(v8::Isolate* isolate,
  v8::Local<v8::String> key) const = 0;
+virtualint32_tQuery(constchar* key) const = 0;
 virtualvoidDelete(v8::Isolate* isolate, v8::Local<v8::String> key) = 0;
 virtual v8::Local<v8::Array> Enumerate(v8::Isolate* isolate) const = 0;
 

src/node_env_var.cc

@@ -30,17 +30,21 @@ using v8::Value;
 classRealEnvStorefinal : public KVStore{
 public:
  MaybeLocal<String> Get(Isolate* isolate, Local<String> key) constoverride;
+ Maybe<std::string> Get(constchar* key) constoverride;
 voidSet(Isolate* isolate, Local<String> key, Local<String> value) override;
 int32_tQuery(Isolate* isolate, Local<String> key) constoverride;
+int32_tQuery(constchar* key) constoverride;
 voidDelete(Isolate* isolate, Local<String> key) override;
  Local<Array> Enumerate(Isolate* isolate) constoverride;
 };
 
 classMapKVStorefinal : public KVStore{
 public:
  MaybeLocal<String> Get(Isolate* isolate, Local<String> key) constoverride;
+ Maybe<std::string> Get(constchar* key) constoverride;
 voidSet(Isolate* isolate, Local<String> key, Local<String> value) override;
 int32_tQuery(Isolate* isolate, Local<String> key) constoverride;
+int32_tQuery(constchar* key) constoverride;
 voidDelete(Isolate* isolate, Local<String> key) override;
  Local<Array> Enumerate(Isolate* isolate) constoverride;
 
@@ -72,26 +76,36 @@ void DateTimeConfigurationChangeNotification(Isolate* isolate, const T& key){
  }
 }
 
-MaybeLocal<String> RealEnvStore::Get(Isolate* isolate,
- Local<String> property) const{
+Maybe<std::string> RealEnvStore::Get(constchar* key) const{
  Mutex::ScopedLock lock(per_process::env_var_mutex);
 
- node::Utf8Value key(isolate, property);
 size_t init_sz = 256;
  MaybeStackBuffer<char, 256> val;
-int ret = uv_os_getenv(*key, *val, &init_sz);
+int ret = uv_os_getenv(key, *val, &init_sz);
 
 if (ret == UV_ENOBUFS){
 // Buffer is not large enough, reallocate to the updated init_sz
 // and fetch env value again.
  val.AllocateSufficientStorage(init_sz);
- ret = uv_os_getenv(*key, *val, &init_sz);
+ ret = uv_os_getenv(key, *val, &init_sz);
  }
 
 if (ret >= 0){// Env key value fetch success.
- MaybeLocal<String> value_string =
-String::NewFromUtf8(isolate, *val, NewStringType::kNormal, init_sz);
-return value_string;
+returnv8::Just(std::string(*val, init_sz));
+ }
+
+return v8::Nothing<std::string>();
+}
+
+MaybeLocal<String> RealEnvStore::Get(Isolate* isolate,
+ Local<String> property) const{
+ node::Utf8Value key(isolate, property);
+ Maybe<std::string> value = Get(*key);
+
+if (value.IsJust()){
+ std::string val = value.FromJust();
+returnString::NewFromUtf8(
+ isolate, val.data(), NewStringType::kNormal, val.size());
  }
 
 return MaybeLocal<String>();
@@ -112,14 +126,12 @@ void RealEnvStore::Set(Isolate* isolate,
 DateTimeConfigurationChangeNotification(isolate, key);
 }
 
-int32_tRealEnvStore::Query(Isolate* isolate, Local<String> property) const{
+int32_tRealEnvStore::Query(constchar* key) const{
  Mutex::ScopedLock lock(per_process::env_var_mutex);
 
- node::Utf8Value key(isolate, property);
-
 char val[2];
 size_t init_sz = sizeof(val);
-int ret = uv_os_getenv(*key, val, &init_sz);
+int ret = uv_os_getenv(key, val, &init_sz);
 
 if (ret == UV_ENOENT){
 return -1;
@@ -136,6 +148,11 @@ int32_t RealEnvStore::Query(Isolate* isolate, Local<String> property) const{
 return0;
 }
 
+int32_tRealEnvStore::Query(Isolate* isolate, Local<String> property) const{
+ node::Utf8Value key(isolate, property);
+returnQuery(*key);
+}
+
 voidRealEnvStore::Delete(Isolate* isolate, Local<String> property){
  Mutex::ScopedLock lock(per_process::env_var_mutex);
 
@@ -190,13 +207,19 @@ std::shared_ptr<KVStore> KVStore::Clone(v8::Isolate* isolate) const{
 return copy;
 }
 
-MaybeLocal<String> MapKVStore::Get(Isolate* isolate, Local<String> key) const{
+Maybe<std::string> MapKVStore::Get(constchar* key) const{
  Mutex::ScopedLock lock(mutex_);
+auto it = map_.find(key);
+return it == map_.end() ? v8::Nothing<std::string>() : v8::Just(it->second);
+}
+
+MaybeLocal<String> MapKVStore::Get(Isolate* isolate, Local<String> key) const{
  Utf8Value str(isolate, key);
-auto it = map_.find(std::string(*str, str.length()));
-if (it == map_.end()) return Local<String>();
-returnString::NewFromUtf8(isolate, it->second.data(),
- NewStringType::kNormal, it->second.size());
+ Maybe<std::string> value = Get(*str);
+if (value.IsNothing()) return Local<String>();
+ std::string val = value.FromJust();
+returnString::NewFromUtf8(
+ isolate, val.data(), NewStringType::kNormal, val.size());
 }
 
 voidMapKVStore::Set(Isolate* isolate, Local<String> key, Local<String> value){
@@ -209,11 +232,14 @@ void MapKVStore::Set(Isolate* isolate, Local<String> key, Local<String> value){
  }
 }
 
-int32_tMapKVStore::Query(Isolate* isolate, Local<String> key) const{
+int32_tMapKVStore::Query(constchar* key) const{
  Mutex::ScopedLock lock(mutex_);
+return map_.find(key) == map_.end() ? -1 : 0;
+}
+
+int32_tMapKVStore::Query(Isolate* isolate, Local<String> key) const{
  Utf8Value str(isolate, key);
-auto it = map_.find(std::string(*str, str.length()));
-return it == map_.end() ? -1 : 0;
+returnQuery(*str);
 }
 
 voidMapKVStore::Delete(Isolate* isolate, Local<String> key){