sqlite: refactor object sets

Author: araujogui

src/env_properties.h

@@ -132,6 +132,7 @@
   V(crypto_rsa_pss_string, "rsa-pss")                                          \
   V(cwd_string, "cwd")                                                         \
   V(data_string, "data")                                                       \
+  V(database_string, "database")                                               \
   V(default_is_true_string, "defaultIsTrue")                                   \
   V(defensive_string, "defensive")                                             \
   V(deserialize_info_string, "deserializeInfo")                                \
@@ -338,6 +339,7 @@
   V(source_map_url_string, "sourceMapURL")                                     \
   V(source_url_string, "sourceURL")                                            \
   V(specifier_string, "specifier")                                             \
+  V(sql_string, "sql")                                                         \
   V(stack_string, "stack")                                                     \
   V(start_string, "start")                                                     \
   V(state_string, "state")                                                     \

src/node_sqlite.cc

@@ -1005,9 +1005,8 @@ bool DatabaseSync::Open() {
         env()->isolate(), this, load_extension_ret, SQLITE_OK, false);
   }
 
-  diagnostics_channel::Channel* ch =
-      diagnostics_channel::Channel::Get(env(), "sqlite.db.query");
-  if (ch != nullptr && ch->HasSubscribers()) {
+  trace_channel_ = diagnostics_channel::Channel::Get(env(), "sqlite.db.query");
+  if (trace_channel_ != nullptr && trace_channel_->HasSubscribers()) {
     sqlite3_trace_v2(connection_, SQLITE_TRACE_PROFILE, TraceCallback, this);
   }
 
@@ -1016,6 +1015,10 @@ bool DatabaseSync::Open() {
 
 void DatabaseSync::EnableTracing() {
   if (!IsOpen()) return;
+  if (trace_channel_ == nullptr) {
+    trace_channel_ =
+        diagnostics_channel::Channel::Get(env(), "sqlite.db.query");
+  }
   sqlite3_trace_v2(connection_, SQLITE_TRACE_PROFILE, TraceCallback, this);
 }
 
@@ -2449,15 +2452,13 @@ int DatabaseSync::TraceCallback(unsigned int type,
   DatabaseSync* db = static_cast<DatabaseSync*>(user_data);
   Environment* env = db->env();
 
-  diagnostics_channel::Channel* ch =
-      diagnostics_channel::Channel::Get(env, "sqlite.db.query");
+  diagnostics_channel::Channel* ch = db->trace_channel_;
   if (ch == nullptr || !ch->HasSubscribers()) {
     return 0;
   }
 
   Isolate* isolate = env->isolate();
   HandleScope handle_scope(isolate);
-  Local<Context> context = env->context();
 
   char* expanded = sqlite3_expanded_sql(static_cast<sqlite3_stmt*>(p));
   Local<Value> sql_string;
@@ -2480,24 +2481,19 @@ int DatabaseSync::TraceCallback(unsigned int type,
   // sufficient since 2^53 ns (~104 days) exceeds any realistic query duration.
   sqlite3_int64 duration_ns = *static_cast<sqlite3_int64*>(x);
 
-  Local<Object> payload = Object::New(isolate);
-  if (payload
-          ->Set(context,
-                FIXED_ONE_BYTE_STRING(isolate, "sql"),
-                sql_string)
-          .IsNothing() ||
-      payload
-          ->Set(context,
-                FIXED_ONE_BYTE_STRING(isolate, "database"),
-                db->object())
-          .IsNothing() ||
-      payload
-          ->Set(context,
-                FIXED_ONE_BYTE_STRING(isolate, "duration"),
-                Number::New(isolate, static_cast<double>(duration_ns)))
-          .IsNothing()) {
-    return 0;
-  }
+  Local<Name> keys[3] = {
+      env->sql_string().As<Name>(),
+      env->database_string().As<Name>(),
+      env->duration_string().As<Name>(),
+  };
+
+  Local<Value> values[3] = {
+      sql_string,
+      db->object(),
+      Number::New(isolate, static_cast<double>(duration_ns)),
+  };
+
+  Local<Object> payload = Object::New(isolate, Null(isolate), keys, values, 3);
 
   ch->Publish(env, payload);
 

src/node_sqlite.h

@@ -18,6 +18,10 @@
 
 namespace node {
 
+namespace diagnostics_channel {
+class Channel;
+}  // namespace diagnostics_channel
+
 class ExternalReferenceRegistry;
 
 namespace sqlite {
@@ -272,6 +276,7 @@ class DatabaseSync : public BaseObject {
   std::set<BackupJob*> backups_;
   std::set<sqlite3_session*> sessions_;
   std::unordered_set<StatementSync*> statements_;
+  diagnostics_channel::Channel* trace_channel_ = nullptr;
 
   friend class DatabaseSyncLimits;
   friend class Session;