diff --git a/crates/geomerge-demo/src/main.rs b/crates/geomerge-demo/src/main.rs index 4421b6b..885d06f 100644 --- a/crates/geomerge-demo/src/main.rs +++ b/crates/geomerge-demo/src/main.rs @@ -129,7 +129,7 @@ fn row_count(storage: &GeomergeStorage, table: &str) -> Result + + Workflow + + + ### Backends The CLI takes a `--backend` flag. diff --git a/crates/plan-runner/src/lib.rs b/crates/plan-runner/src/lib.rs index 1cbf8b0..7cdcf28 100644 --- a/crates/plan-runner/src/lib.rs +++ b/crates/plan-runner/src/lib.rs @@ -35,12 +35,12 @@ use std::collections::HashMap; use serde::Deserialize; -use query_ops::atom::{scan_atom, AtomPattern, Term}; +use query_ops::atom::{AtomPattern, Term, scan_atom}; use query_ops::join::{natural_join, semijoin}; use query_ops::relation::Relation; use storage::table::Table; use storage::value::Value; -use storage::{scan_as_table, Storage, StorageError}; +use storage::{Storage, StorageError, scan_as_table}; /// A single fixture: schema, ground facts, and a query plan to execute. #[derive(Debug, Clone, Deserialize)] diff --git a/crates/plan-runner/src/main.rs b/crates/plan-runner/src/main.rs index 82733bb..c76b440 100644 --- a/crates/plan-runner/src/main.rs +++ b/crates/plan-runner/src/main.rs @@ -19,7 +19,8 @@ use std::collections::HashMap; use std::io::{self, Read}; use std::process::ExitCode; -use plan_runner::{build_tables, build_tables_via_storage, execute, parse_plan, JsonValue, Plan}; +use plan_runner::{JsonValue, Plan, build_tables, build_tables_via_storage, execute, parse_plan}; +use storage::MemoryStorage; use storage::adapters::fjall::FjallStorage; use storage::adapters::geomerge::{ColumnKind, GeomergeStorage}; use storage::adapters::lmdb::LmdbStorage; @@ -27,7 +28,6 @@ use storage::adapters::redb::RedbStorage; use storage::adapters::sqlite::SqliteStorage; use storage::table::Table; use storage::value::Value; -use storage::MemoryStorage; use tempfile::TempDir; #[derive(Debug, Clone, Copy)] diff --git a/crates/plan-runner/tests/storage_roundtrip.rs b/crates/plan-runner/tests/storage_roundtrip.rs index 0226fba..ba2b37a 100644 --- a/crates/plan-runner/tests/storage_roundtrip.rs +++ b/crates/plan-runner/tests/storage_roundtrip.rs @@ -8,8 +8,8 @@ //! with a different `S`. use plan_runner::{build_tables, build_tables_via_storage, execute, parse_plan, run_json}; -use storage::value::Value; use storage::MemoryStorage; +use storage::value::Value; const FIXTURE: &str = include_str!("../fixtures/three_atom_chain.json"); diff --git a/crates/query-ops/tests/hand_plan.rs b/crates/query-ops/tests/hand_plan.rs index 3e7a2e2..051ea71 100644 --- a/crates/query-ops/tests/hand_plan.rs +++ b/crates/query-ops/tests/hand_plan.rs @@ -13,7 +13,7 @@ //! bestsellers via a semijoin against `bestseller`, then attaches each book's //! price via a natural join against `price`. -use query_ops::atom::{scan_atom, AtomPattern, Term}; +use query_ops::atom::{AtomPattern, Term, scan_atom}; use query_ops::join::{natural_join, semijoin}; use storage::table::Table; use storage::value::Value; diff --git a/crates/query-ops/tests/storage_bridge.rs b/crates/query-ops/tests/storage_bridge.rs index 8493e3c..6c164c7 100644 --- a/crates/query-ops/tests/storage_bridge.rs +++ b/crates/query-ops/tests/storage_bridge.rs @@ -4,10 +4,10 @@ //! Demonstrates that `query-ops` operators can consume from a storage backend //! through the [`scan_as_table`] bridge, with no changes to `query-ops` itself. -use query_ops::atom::{scan_atom, AtomPattern, Term}; +use query_ops::atom::{AtomPattern, Term, scan_atom}; use storage::table::Table; use storage::value::Value; -use storage::{scan_as_table, MemoryStorage, Storage, StorageError}; +use storage::{MemoryStorage, Storage, StorageError, scan_as_table}; fn i(x: i64) -> Value { Value::Int(x) diff --git a/crates/storage/benches/adapter_compare.rs b/crates/storage/benches/adapter_compare.rs index 56dbd4f..43be6d6 100644 --- a/crates/storage/benches/adapter_compare.rs +++ b/crates/storage/benches/adapter_compare.rs @@ -18,7 +18,7 @@ #![allow(clippy::unwrap_used, clippy::expect_used)] -use criterion::{black_box, criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion}; +use criterion::{BatchSize, BenchmarkId, Criterion, black_box, criterion_group, criterion_main}; use storage::value::Value; use storage::{MemoryStorage, Storage}; diff --git a/crates/storage/benches/geomerge.rs b/crates/storage/benches/geomerge.rs index 5d0ea23..682bf69 100644 --- a/crates/storage/benches/geomerge.rs +++ b/crates/storage/benches/geomerge.rs @@ -19,7 +19,7 @@ #![allow(clippy::unwrap_used, clippy::expect_used)] -use criterion::{black_box, criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion}; +use criterion::{BatchSize, BenchmarkId, Criterion, black_box, criterion_group, criterion_main}; use geomerge::ir::FlatTheory; use storage::adapters::geomerge::GeomergeStorage; use storage::id::RowId; diff --git a/crates/storage/src/adapters/fjall.rs b/crates/storage/src/adapters/fjall.rs index f4397c4..aaf38e5 100644 --- a/crates/storage/src/adapters/fjall.rs +++ b/crates/storage/src/adapters/fjall.rs @@ -16,7 +16,7 @@ use fjall::{Keyspace, PartitionCreateOptions, PartitionHandle}; use crate::codec::{decode_meta, decode_row, encode_meta, encode_row}; use crate::id::RowId; use crate::value::Value; -use crate::{backend, CommittedTx, RowStream, Storage, StorageError, Transaction}; +use crate::{CommittedTx, RowStream, Storage, StorageError, Transaction, backend}; const META_PARTITION: &str = "__meta"; @@ -176,7 +176,7 @@ impl Transaction for FjallTx<'_> { #[cfg(test)] mod tests { - use super::{backend, FjallStorage}; + use super::{FjallStorage, backend}; use crate::value::Value; use crate::{Storage, StorageError}; diff --git a/crates/storage/src/adapters/geomerge.rs b/crates/storage/src/adapters/geomerge.rs index 139dff4..6109feb 100644 --- a/crates/storage/src/adapters/geomerge.rs +++ b/crates/storage/src/adapters/geomerge.rs @@ -43,7 +43,7 @@ use geomerge::txn::ops::{RowRef, TempRowId, TxnCellValue}; use crate::id::RowId; use crate::value::Value; -use crate::{backend, CommittedTx, RowStream, Storage, StorageError, Transaction}; +use crate::{CommittedTx, RowStream, Storage, StorageError, Transaction, backend}; const GM_ROW_ID_LEN: usize = 32 + 4; const PENDING_ROW_ID_LEN: usize = 4; diff --git a/crates/storage/src/adapters/lmdb.rs b/crates/storage/src/adapters/lmdb.rs index 64f6f38..dd44267 100644 --- a/crates/storage/src/adapters/lmdb.rs +++ b/crates/storage/src/adapters/lmdb.rs @@ -16,7 +16,7 @@ use heed::{Database, Env, EnvOpenOptions, RwTxn}; use crate::codec::{decode_meta, decode_row, encode_meta, encode_row, row_key}; use crate::id::RowId; use crate::value::Value; -use crate::{backend, CommittedTx, RowStream, Storage, StorageError, Transaction}; +use crate::{CommittedTx, RowStream, Storage, StorageError, Transaction, backend}; const META_DB: &str = "__meta"; const DEFAULT_MAX_DBS: u32 = 128; @@ -245,7 +245,7 @@ impl Transaction for LmdbTx<'_> { #[cfg(test)] mod tests { - use super::{backend, LmdbStorage}; + use super::{LmdbStorage, backend}; use crate::value::Value; use crate::{Storage, StorageError}; diff --git a/crates/storage/src/adapters/redb.rs b/crates/storage/src/adapters/redb.rs index d8c87ef..d968ef4 100644 --- a/crates/storage/src/adapters/redb.rs +++ b/crates/storage/src/adapters/redb.rs @@ -15,7 +15,7 @@ use redb::{Database, ReadableTable, TableDefinition, WriteTransaction}; use crate::codec::{decode_meta, decode_row, encode_meta, encode_row}; use crate::id::RowId; use crate::value::Value; -use crate::{backend, CommittedTx, RowStream, Storage, StorageError, Transaction}; +use crate::{CommittedTx, RowStream, Storage, StorageError, Transaction, backend}; const META_TABLE: &str = "__meta"; @@ -199,7 +199,7 @@ impl Transaction for RedbTx { #[cfg(test)] mod tests { - use super::{backend, RedbStorage}; + use super::{RedbStorage, backend}; use crate::value::Value; use crate::{Storage, StorageError}; diff --git a/crates/storage/src/adapters/sqlite.rs b/crates/storage/src/adapters/sqlite.rs index b5a7403..5646048 100644 --- a/crates/storage/src/adapters/sqlite.rs +++ b/crates/storage/src/adapters/sqlite.rs @@ -14,12 +14,12 @@ use std::collections::HashMap; -use rusqlite::{params, Connection, OptionalExtension}; +use rusqlite::{Connection, OptionalExtension, params}; use crate::codec::{decode_row, encode_row}; use crate::id::RowId; use crate::value::Value; -use crate::{backend, CommittedTx, RowStream, Storage, StorageError, Transaction}; +use crate::{CommittedTx, RowStream, Storage, StorageError, Transaction, backend}; const SCHEMA_SQL: &str = " CREATE TABLE IF NOT EXISTS __meta (