Skip to content

Commit ef6f377

Browse files
committed
Revert "PERF"
This reverts commit 0d03ed2.
1 parent aa81712 commit ef6f377

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

src/lib.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use std::sync::Arc;
1515
use std::time::Duration;
1616
use tokio::{runtime::Runtime, sync::Mutex};
1717
use tracing_subscriber::{filter::LevelFilter, EnvFilter};
18-
use tracing::trace;
1918

2019
#[napi]
2120
pub struct SqliteError {
@@ -576,7 +575,6 @@ impl Statement {
576575

577576
#[napi]
578577
pub fn iterate(&self, env: Env, params: Option<napi::JsUnknown>) -> Result<napi::JsObject> {
579-
trace!("Statement::iterate");
580578
let rt = runtime()?;
581579
let safe_ints = self.safe_ints.load(Ordering::SeqCst);
582580
let raw = self.raw.load(Ordering::SeqCst);
@@ -603,9 +601,8 @@ impl Statement {
603601
let mut column_names = vec![];
604602
for i in 0..result.column_count() {
605603
let column_name = result.column_name(i).unwrap();
606-
let column_name = env.create_string(column_name).unwrap();
607-
let column_name = column_name.coerce_to_object().unwrap();
608-
let column_name = env.create_reference(column_name).unwrap();
604+
let column_name = env.create_string(column_name)?;
605+
let column_name = env.create_reference(column_name)?;
609606
column_names.push(column_name);
610607
}
611608
let iter = RowsIterator::new(
@@ -641,9 +638,8 @@ impl Statement {
641638
let mut column_names = vec![];
642639
for i in 0..rows.column_count() {
643640
let column_name = rows.column_name(i).unwrap();
644-
let column_name = env.create_string(column_name).unwrap();
645-
let column_name = column_name.coerce_to_object().unwrap();
646-
let column_name = env.create_reference(column_name).unwrap();
641+
let column_name = env.create_string(column_name)?;
642+
let column_name = env.create_reference(column_name)?;
647643
column_names.push(column_name);
648644
}
649645
Ok::<_, napi::Error>((rows, column_names))
@@ -736,9 +732,8 @@ impl Statement {
736732
let mut column_names = vec![];
737733
for i in 0..rows.column_count() {
738734
let column_name = rows.column_name(i).unwrap();
739-
let column_name = env.create_string(column_name).unwrap();
740-
let column_name = column_name.coerce_to_object().unwrap();
741-
let column_name = env.create_reference(column_name).unwrap();
735+
let column_name = env.create_string(column_name)?;
736+
let column_name = env.create_reference(column_name)?;
742737
column_names.push(column_name);
743738
}
744739
let column_names = Arc::new(column_names);
@@ -818,7 +813,6 @@ impl RowsIterator {
818813

819814
#[napi]
820815
pub fn next(&self, env: Env) -> Result<Record> {
821-
trace!("RowsIterator::next");
822816
let rt = runtime()?;
823817
let rows = self.rows.clone();
824818
rt.block_on(async move {
@@ -941,7 +935,7 @@ fn map_row_object(
941935
Ok(v) => v,
942936
Err(e) => return Err(napi::Error::from_reason(e.to_string())),
943937
};
944-
let column_name: napi::JsObject = env.get_reference_value(&column_names[idx])?;
938+
let column_name: JsString = env.get_reference_value(&column_names[idx])?;
945939
let js_value = convert_value_to_js(env, &value, safe_ints)?;
946940
result.set_property(column_name, js_value)?;
947941
}

0 commit comments

Comments
 (0)