aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-18 06:24:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

rm log, switch all to tracing

Browse Source
This commit is contained in:
Doug Anderson444
2025-02-11 09:03:36 -04:00
parent 3734870c6b
commit 0aa5de6d9f
15 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Cargo.toml
View File

@@ -46,7 +46,6 @@ cfg_block = "0.1.1"
fallible-iterator = "0.3.0"
hex = "0.4.3"
libc = "0.2.155"
log = "0.4.20"
sqlite3-parser = { path = "../vendored/sqlite3-parser" }
thiserror = "1.0.61"
getrandom = { version = "0.2.15" }
@@ -70,7 +69,7 @@ limbo_series = { path = "../extensions/series", optional = true, features = ["st
miette = "7.4.0"
strum = "0.26"
parking_lot = "0.12.3"
tracing = "0.1.41"
tracing = { version = "0.1.41", default-features = false }
crossbeam-skiplist = "0.1.3"
ryu = "1.0.19"

2
core/io/generic.rs
View File

@@ -1,8 +1,8 @@
use crate::{Completion, File, LimboError, OpenFlags, Result, IO};
use log::{debug, trace};
use std::cell::RefCell;
use std::io::{Read, Seek, Write};
use std::rc::Rc;
use tracing::{debug, trace};
pub struct GenericIO {}

2
core/io/io_uring.rs
View File

@@ -1,6 +1,5 @@
use super::{common, Completion, File, OpenFlags, IO};
use crate::{LimboError, Result};
use log::{debug, trace};
use rustix::fs::{self, FlockOperation, OFlags};
use rustix::io_uring::iovec;
use std::cell::RefCell;
@@ -10,6 +9,7 @@ use std::os::fd::AsFd;
use std::os::unix::io::AsRawFd;
use std::rc::Rc;
use thiserror::Error;
use tracing::{debug, trace};
const MAX_IOVECS: u32 = 128;
const SQPOLL_IDLE: u32 = 1000;

2
core/io/memory.rs
View File

@@ -1,13 +1,13 @@
use super::{Buffer, Completion, File, OpenFlags, IO};
use crate::Result;
use log::debug;
use std::{
cell::{Cell, RefCell, UnsafeCell},
collections::BTreeMap,
rc::Rc,
sync::Arc,
};
use tracing::debug;
pub struct MemoryIO {
pages: UnsafeCell<BTreeMap<usize, MemPage>>,

2
core/io/unix.rs
View File

@@ -3,7 +3,6 @@ use crate::io::common;
use crate::Result;
use super::{Completion, File, OpenFlags, IO};
use log::{debug, trace};
use polling::{Event, Events, Poller};
use rustix::{
fd::{AsFd, AsRawFd},
@@ -14,6 +13,7 @@ use std::cell::RefCell;
use std::collections::HashMap;
use std::io::{ErrorKind, Read, Seek, Write};
use std::rc::Rc;
use tracing::{debug, trace};
pub struct UnixIO {
poller: Rc<RefCell<Poller>>,

2
core/io/windows.rs
View File

@@ -1,8 +1,8 @@
use crate::{Completion, File, LimboError, OpenFlags, Result, IO};
use log::{debug, trace};
use std::cell::RefCell;
use std::io::{Read, Seek, Write};
use std::rc::Rc;
use tracing::{debug, trace};
pub struct WindowsIO {}

5
core/lib.rs
View File

@@ -28,7 +28,6 @@ use libloading::{Library, Symbol};
#[cfg(not(target_family = "wasm"))]
use limbo_ext::{ExtensionApi, ExtensionEntryPoint};
use limbo_ext::{ResultCode, VTabModuleImpl, Value as ExtValue};
use log::trace;
use parking_lot::RwLock;
use schema::{Column, Schema};
use sqlite3_parser::{ast, ast::Cmd, lexer::sql::Parser};
@@ -272,7 +271,7 @@ pub struct Connection {
impl Connection {
pub fn prepare(self: &Rc<Connection>, sql: impl AsRef<str>) -> Result<Statement> {
let sql = sql.as_ref();
trace!("Preparing: {}", sql);
tracing::trace!("Preparing: {}", sql);
let db = &self.db;
let mut parser = Parser::new(sql.as_bytes());
let syms = &db.syms.borrow();
@@ -301,7 +300,7 @@ impl Connection {
pub fn query(self: &Rc<Connection>, sql: impl AsRef<str>) -> Result<Option<Statement>> {
let sql = sql.as_ref();
trace!("Querying: {}", sql);
tracing::trace!("Querying: {}", sql);
let mut parser = Parser::new(sql.as_bytes());
let cmd = parser.next()?;
match cmd {

8
core/parameters.rs
View File

@@ -79,7 +79,7 @@ impl Parameters {
"" => {
let index = self.next_index();
self.list.push(Parameter::Anonymous(index));
log::trace!("anonymous parameter at {index}");
tracing::trace!("anonymous parameter at {index}");
index
}
name if name.starts_with(['$', ':', '@', '#']) => {
@@ -91,13 +91,13 @@ impl Parameters {
Some(t) => {
let index = t.index();
self.list.push(t.clone());
log::trace!("named parameter at {index} as {name}");
tracing::trace!("named parameter at {index} as {name}");
index
}
None => {
let index = self.next_index();
self.list.push(Parameter::Named(name.to_owned(), index));
log::trace!("named parameter at {index} as {name}");
tracing::trace!("named parameter at {index} as {name}");
index
}
}
@@ -109,7 +109,7 @@ impl Parameters {
self.index = index.checked_add(1).unwrap();
}
self.list.push(Parameter::Indexed(index));
log::trace!("indexed parameter at {index}");
tracing::trace!("indexed parameter at {index}");
index
}
}

2
core/schema.rs
View File

@@ -2,7 +2,6 @@ use crate::VirtualTable;
use crate::{util::normalize_ident, Result};
use core::fmt;
use fallible_iterator::FallibleIterator;
use log::trace;
use sqlite3_parser::ast::{Expr, Literal, TableOptions};
use sqlite3_parser::{
ast::{Cmd, CreateTableBody, QualifiedName, ResultColumn, Stmt},
@@ -10,6 +9,7 @@ use sqlite3_parser::{
};
use std::collections::HashMap;
use std::rc::Rc;
use tracing::trace;
pub struct Schema {
pub tables: HashMap<String, Rc<BTreeTable>>,

22
core/storage/btree.rs
View File

@@ -1,4 +1,4 @@
use log::debug;
use tracing::debug;
use crate::storage::pager::Pager;
use crate::storage::sqlite3_ondisk::{
@@ -2411,14 +2411,14 @@ mod tests {
};
depth = Some(depth.unwrap_or(current_depth + 1));
if depth != Some(current_depth + 1) {
log::error!("depth is different for child of page {}", page_idx);
tracing::error!("depth is different for child of page {}", page_idx);
valid = false;
}
match cell {
BTreeCell::TableInteriorCell(TableInteriorCell { _rowid, .. })
| BTreeCell::TableLeafCell(TableLeafCell { _rowid, .. }) => {
if previous_key.is_some() && previous_key.unwrap() >= _rowid {
log::error!(
tracing::error!(
"keys are in bad order: prev={:?}, current={}",
previous_key,
_rowid
@@ -2435,7 +2435,7 @@ mod tests {
valid &= right_valid;
depth = Some(depth.unwrap_or(right_depth + 1));
if depth != Some(right_depth + 1) {
log::error!("depth is different for child of page {}", page_idx);
tracing::error!("depth is different for child of page {}", page_idx);
valid = false;
}
}
@@ -2577,9 +2577,9 @@ mod tests {
for (key, size) in sequence.iter() {
let key = OwnedValue::Integer(*key);
let value = Record::new(vec![OwnedValue::Blob(Rc::new(vec![0; *size]))]);
log::info!("insert key:{}", key);
tracing::info!("insert key:{}", key);
cursor.insert(&key, &value, false).unwrap();
log::info!(
tracing::info!(
"=========== btree ===========\n{}\n\n",
format_btree(pager.clone(), root_page, 0)
);
@@ -2613,19 +2613,19 @@ mod tests {
size: impl Fn(&mut ChaCha8Rng) -> usize,
) {
let (mut rng, seed) = rng_from_time();
log::info!("super seed: {}", seed);
tracing::info!("super seed: {}", seed);
for _ in 0..attempts {
let (pager, root_page) = empty_btree();
let mut cursor = BTreeCursor::new(pager.clone(), root_page);
let mut keys = Vec::new();
let seed = rng.next_u64();
log::info!("seed: {}", seed);
tracing::info!("seed: {}", seed);
let mut rng = ChaCha8Rng::seed_from_u64(seed);
for insert_id in 0..inserts {
let size = size(&mut rng);
let key = (rng.next_u64() % (1 << 30)) as i64;
keys.push(key);
log::info!(
tracing::info!(
"INSERT INTO t VALUES ({}, randomblob({})); -- {}",
key,
size,
@@ -2635,7 +2635,7 @@ mod tests {
let value = Record::new(vec![OwnedValue::Blob(Rc::new(vec![0; size]))]);
cursor.insert(&key, &value, false).unwrap();
}
log::info!(
tracing::info!(
"=========== btree ===========\n{}\n\n",
format_btree(pager.clone(), root_page, 0)
);
@@ -2659,7 +2659,7 @@ mod tests {
#[test]
pub fn btree_insert_fuzz_run_equal_size() {
for size in 1..8 {
log::info!("======= size:{} =======", size);
tracing::info!("======= size:{} =======", size);
btree_insert_fuzz_run(2, 1024, |_| size);
}
}

2
core/storage/page_cache.rs
View File

@@ -1,6 +1,6 @@
use std::{cell::RefCell, collections::HashMap, ptr::NonNull};
use log::debug;
use tracing::debug;
use super::pager::PageRef;

4
core/storage/pager.rs
View File

@@ -4,13 +4,13 @@ use crate::storage::database::DatabaseStorage;
use crate::storage::sqlite3_ondisk::{self, DatabaseHeader, PageContent};
use crate::storage::wal::{CheckpointResult, Wal};
use crate::{Buffer, LimboError, Result};
use log::trace;
use parking_lot::RwLock;
use std::cell::{RefCell, UnsafeCell};
use std::collections::HashSet;
use std::rc::Rc;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use tracing::trace;
use super::page_cache::{DumbLruPageCache, PageCacheKey};
use super::wal::{CheckpointMode, CheckpointStatus};
@@ -113,7 +113,7 @@ impl Page {
}
pub fn clear_loaded(&self) {
log::debug!("clear loaded {}", self.get().id);
tracing::debug!("clear loaded {}", self.get().id);
self.get().flags.fetch_and(!PAGE_LOADED, Ordering::SeqCst);
}
}

18
core/storage/sqlite3_ondisk.rs
View File

@@ -48,12 +48,12 @@ use crate::storage::database::DatabaseStorage;
use crate::storage::pager::Pager;
use crate::types::{OwnedValue, Record, Text, TextSubtype};
use crate::{File, Result};
use log::trace;
use parking_lot::RwLock;
use std::cell::RefCell;
use std::pin::Pin;
use std::rc::Rc;
use std::sync::Arc;
use tracing::trace;
use super::pager::PageRef;
@@ -322,7 +322,7 @@ pub fn begin_write_database_header(header: &DatabaseHeader, pager: &Pager) -> Re
let write_complete = Box::new(move |bytes_written: i32| {
let buf_len = buffer_to_copy_in_cb.borrow().len();
if bytes_written < buf_len as i32 {
log::error!("wrote({bytes_written}) less than expected({buf_len})");
tracing::error!("wrote({bytes_written}) less than expected({buf_len})");
}
// finish_read_database_header(buf, header).unwrap();
});
@@ -450,19 +450,19 @@ impl PageContent {
}
pub fn write_u8(&self, pos: usize, value: u8) {
log::debug!("write_u8(pos={}, value={})", pos, value);
tracing::debug!("write_u8(pos={}, value={})", pos, value);
let buf = self.as_ptr();
buf[self.offset + pos] = value;
}
pub fn write_u16(&self, pos: usize, value: u16) {
log::debug!("write_u16(pos={}, value={})", pos, value);
tracing::debug!("write_u16(pos={}, value={})", pos, value);
let buf = self.as_ptr();
buf[self.offset + pos..self.offset + pos + 2].copy_from_slice(&value.to_be_bytes());
}
pub fn write_u32(&self, pos: usize, value: u32) {
log::debug!("write_u32(pos={}, value={})", pos, value);
tracing::debug!("write_u32(pos={}, value={})", pos, value);
let buf = self.as_ptr();
buf[self.offset + pos..self.offset + pos + 4].copy_from_slice(&value.to_be_bytes());
}
@@ -542,7 +542,7 @@ impl PageContent {
payload_overflow_threshold_min: usize,
usable_size: usize,
) -> Result<BTreeCell> {
log::debug!("cell_get(idx={})", idx);
tracing::debug!("cell_get(idx={})", idx);
let buf = self.as_ptr();
let ncells = self.cell_count();
@@ -729,7 +729,7 @@ pub fn begin_write_btree_page(
page_finish.clear_dirty();
if bytes_written < buf_len as i32 {
log::error!("wrote({bytes_written}) less than expected({buf_len})");
tracing::error!("wrote({bytes_written}) less than expected({buf_len})");
}
})
};
@@ -1256,7 +1256,7 @@ pub fn begin_write_wal_frame(
page_finish.clear_dirty();
if bytes_written < buf_len as i32 {
log::error!("wrote({bytes_written}) less than expected({buf_len})");
tracing::error!("wrote({bytes_written}) less than expected({buf_len})");
}
})
};
@@ -1287,7 +1287,7 @@ pub fn begin_write_wal_header(io: &Rc<dyn File>, header: &WalHeader) -> Result<(
let write_complete = {
Box::new(move |bytes_written: i32| {
if bytes_written < WAL_HEADER_SIZE as i32 {
log::error!(
tracing::error!(
"wal header wrote({bytes_written}) less than expected({WAL_HEADER_SIZE})"
);
}

4
core/storage/wal.rs
View File

@@ -1,5 +1,5 @@
use log::{debug, trace};
use std::collections::HashMap;
use tracing::{debug, trace};
use parking_lot::RwLock;
use std::fmt::Formatter;
@@ -720,7 +720,7 @@ impl WalFileShared {
Ok(header) => header,
Err(err) => panic!("Couldn't read header page: {:?}", err),
};
log::info!("recover not implemented yet");
tracing::info!("recover not implemented yet");
// TODO: Return a completion instead.
io.run_once()?;
wal_header

10
core/vdbe/mod.rs
View File

@@ -1131,7 +1131,7 @@ impl Program {
)));
}
}
log::trace!("Halt auto_commit {}", self.auto_commit);
tracing::trace!("Halt auto_commit {}", self.auto_commit);
let connection = self
.connection
.upgrade()
@@ -1177,14 +1177,14 @@ impl Program {
if updated && matches!(current_state, TransactionState::None) {
if let LimboResult::Busy = pager.begin_read_tx()? {
log::trace!("begin_read_tx busy");
tracing::trace!("begin_read_tx busy");
return Ok(StepResult::Busy);
}
}
if updated && matches!(new_transaction_state, TransactionState::Write) {
if let LimboResult::Busy = pager.begin_write_tx()? {
log::trace!("begin_write_tx busy");
tracing::trace!("begin_write_tx busy");
return Ok(StepResult::Busy);
}
}
@@ -2789,10 +2789,10 @@ fn make_owned_record(registers: &[OwnedValue], start_reg: &usize, count: &usize)
}
fn trace_insn(program: &Program, addr: InsnReference, insn: &Insn) {
if !log::log_enabled!(log::Level::Trace) {
if !tracing::enabled!(tracing::Level::TRACE) {
return;
}
log::trace!(
tracing::trace!(
"{}",
explain::insn_to_str(
program,