Add IOContext to carry encryption/checksum ctx

bindings/javascript/src/lib.rs

@@ -569,7 +569,7 @@ impl turso_core::DatabaseStorage for DatabaseFile {
     fn read_page(
         &self,
         page_idx: usize,
-        _encryption_ctx: Option<&turso_core::EncryptionContext>,
+        _io_ctx: &turso_core::IOContext,
         c: turso_core::Completion,
     ) -> turso_core::Result<turso_core::Completion> {
         let r = c.as_read();
@@ -586,7 +586,7 @@ impl turso_core::DatabaseStorage for DatabaseFile {
         &self,
         page_idx: usize,
         buffer: Arc<turso_core::Buffer>,
-        _encryption_ctx: Option<&turso_core::EncryptionContext>,
+        _io_ctx: &turso_core::IOContext,
         c: turso_core::Completion,
     ) -> turso_core::Result<turso_core::Completion> {
         let size = buffer.len();
@@ -599,7 +599,7 @@ impl turso_core::DatabaseStorage for DatabaseFile {
         first_page_idx: usize,
         page_size: usize,
         buffers: Vec<Arc<turso_core::Buffer>>,
-        _encryption_ctx: Option<&turso_core::EncryptionContext>,
+        _io_ctx: &turso_core::IOContext,
         c: turso_core::Completion,
     ) -> turso_core::Result<turso_core::Completion> {
         let pos = first_page_idx.saturating_sub(1) * page_size;

core/lib.rs

@@ -76,6 +76,7 @@ use std::{
 };
 #[cfg(feature = "fs")]
 use storage::database::DatabaseFile;
+pub use storage::database::IOContext;
 pub use storage::encryption::{EncryptionContext, EncryptionKey};
 use storage::page_cache::DumbLruPageCache;
 use storage::pager::{AtomicDbState, DbState};

core/storage/database.rs

@@ -4,6 +4,25 @@ use crate::{io::Completion, Buffer, CompletionError, Result};
 use std::sync::Arc;
 use tracing::{instrument, Level};
 
+pub enum EncryptionOrChecksum {
+    Encryption(EncryptionContext),
+    Checksum,
+    None,
+}
+
+pub struct IOContext {
+    encryption_or_checksum: EncryptionOrChecksum,
+}
+
+impl IOContext {
+    pub fn encryption_context(&self) -> Option<&EncryptionContext> {
+        match &self.encryption_or_checksum {
+            EncryptionOrChecksum::Encryption(ctx) => Some(ctx),
+            _ => None,
+        }
+    }
+}
+
 /// DatabaseStorage is an interface a database file that consists of pages.
 ///
 /// The purpose of this trait is to abstract the upper layers of Limbo from
@@ -12,17 +31,12 @@ use tracing::{instrument, Level};
 pub trait DatabaseStorage: Send + Sync {
     fn read_header(&self, c: Completion) -> Result<Completion>;
 
-    fn read_page(
-        &self,
-        page_idx: usize,
-        encryption_ctx: Option<&EncryptionContext>,
-        c: Completion,
-    ) -> Result<Completion>;
+    fn read_page(&self, page_idx: usize, io_ctx: &IOContext, c: Completion) -> Result<Completion>;
     fn write_page(
         &self,
         page_idx: usize,
         buffer: Arc<Buffer>,
-        encryption_ctx: Option<&EncryptionContext>,
+        io_ctx: &IOContext,
         c: Completion,
     ) -> Result<Completion>;
     fn write_pages(
@@ -30,7 +44,7 @@ pub trait DatabaseStorage: Send + Sync {
         first_page_idx: usize,
         page_size: usize,
         buffers: Vec<Arc<Buffer>>,
-        encryption_ctx: Option<&EncryptionContext>,
+        io_ctx: &IOContext,
         c: Completion,
     ) -> Result<Completion>;
     fn sync(&self, c: Completion) -> Result<Completion>;
@@ -56,12 +70,7 @@ impl DatabaseStorage for DatabaseFile {
     }
 
     #[instrument(skip_all, level = Level::DEBUG)]
-    fn read_page(
-        &self,
-        page_idx: usize,
-        encryption_ctx: Option<&EncryptionContext>,
-        c: Completion,
-    ) -> Result<Completion> {
+    fn read_page(&self, page_idx: usize, io_ctx: &IOContext, c: Completion) -> Result<Completion> {
         let r = c.as_read();
         let size = r.buf().len();
         assert!(page_idx > 0);
@@ -70,7 +79,7 @@ impl DatabaseStorage for DatabaseFile {
         }
         let pos = (page_idx - 1) * size;
 
-        if let Some(ctx) = encryption_ctx {
+        if let Some(ctx) = io_ctx.encryption_context() {
             let encryption_ctx = ctx.clone();
             let read_buffer = r.buf_arc();
             let original_c = c.clone();
@@ -111,7 +120,7 @@ impl DatabaseStorage for DatabaseFile {
         &self,
         page_idx: usize,
         buffer: Arc<Buffer>,
-        encryption_ctx: Option<&EncryptionContext>,
+        io_ctx: &IOContext,
         c: Completion,
     ) -> Result<Completion> {
         let buffer_size = buffer.len();
@@ -121,7 +130,7 @@ impl DatabaseStorage for DatabaseFile {
         assert_eq!(buffer_size & (buffer_size - 1), 0);
         let pos = (page_idx - 1) * buffer_size;
         let buffer = {
-            if let Some(ctx) = encryption_ctx {
+            if let Some(ctx) = io_ctx.encryption_context() {
                 encrypt_buffer(page_idx, buffer, ctx)
             } else {
                 buffer
@@ -135,7 +144,7 @@ impl DatabaseStorage for DatabaseFile {
         first_page_idx: usize,
         page_size: usize,
         buffers: Vec<Arc<Buffer>>,
-        encryption_key: Option<&EncryptionContext>,
+        io_ctx: &IOContext,
         c: Completion,
     ) -> Result<Completion> {
         assert!(first_page_idx > 0);
@@ -145,7 +154,7 @@ impl DatabaseStorage for DatabaseFile {
 
         let pos = (first_page_idx - 1) * page_size;
         let buffers = {
-            if let Some(ctx) = encryption_key {
+            if let Some(ctx) = io_ctx.encryption_context() {
                 buffers
                     .into_iter()
                     .enumerate()