aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-07 10:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'from_uri was not passing mvcc and indexes flag to database creation for memory path' from Pedro Muniz

Browse Source 
Closes #1932
This commit is contained in:
Pekka Enberg
2025-07-02 19:55:27 +03:00
parent 36b550cca4 191f732088
commit e8af5f1022
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/app.rs
View File

@@ -28,7 +28,7 @@ use tracing_appender::non_blocking::WorkerGuard;
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
use turso_core::{Connection, Database, LimboError, OpenFlags, Statement, StepResult, Value};
#[derive(Parser)]
#[derive(Parser, Debug)]
#[command(name = "Turso")]
#[command(author, version, about, long_about = None)]
pub struct Opts {

8
core/lib.rs
View File

@@ -200,6 +200,7 @@ impl Database {
let shared_page_cache = Arc::new(RwLock::new(DumbLruPageCache::default()));
let schema = Arc::new(RwLock::new(Schema::new(enable_indexes)));
dbg!(enable_indexes);
let db = Database {
mv_store,
path: path.to_string(),
@@ -372,7 +373,7 @@ impl Database {
}
},
};
let db = Self::open_file_with_flags(io.clone(), path, flags, indexes, mvcc)?;
let db = Self::open_file_with_flags(io.clone(), path, flags, mvcc, indexes)?;
Ok((io, db))
}
None => {
@@ -380,7 +381,7 @@ impl Database {
MEMORY_PATH => Arc::new(MemoryIO::new()),
_ => Arc::new(PlatformIO::new()?),
};
let db = Self::open_file_with_flags(io.clone(), path, flags, indexes, mvcc)?;
let db = Self::open_file_with_flags(io.clone(), path, flags, mvcc, indexes)?;
Ok((io, db))
}
}
@@ -600,7 +601,8 @@ impl Connection {
let flags = opts.get_flags()?;
if opts.path == MEMORY_PATH || matches!(opts.mode, OpenMode::Memory) {
let io = Arc::new(MemoryIO::new());
let db = Database::open_file_with_flags(io.clone(), MEMORY_PATH, flags, false, false)?;
let db =
Database::open_file_with_flags(io.clone(), MEMORY_PATH, flags, mvcc, use_indexes)?;
let conn = db.connect()?;
return Ok((io, conn));
}