Merge remote-tracking branch 'upstream/master' into storage-backend

cberner · Oct 22, 2023 · e5aa450 · e5aa450
2 parents 322ec2c + 267b473
commit e5aa450
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # redb - Changelog
 
+## 1.3.0 - 2023-10-22
+* Implement `RedbKey` for `Option<T>`
+* Implement `RedbValue` for `Vec<T>`
+* Implement `Debug` for tables
+* Add `ReadableTable::first()` and `last()` which retrieve the first and last key-value pairs, respectively`
+* Reduce lock contention for mixed read-write workloads
+* Documentation improvements
+
 ## 1.2.0 - 2023-09-24
 * Add `Builder::create_file()` which does the same thing as `create()` but
   takes a `File` instead of a path

diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://www.redb.org"
 repository = "https://github.com/cberner/redb"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
-version = "1.2.0"
+version = "1.3.0"
 edition = "2021"
 rust-version = "1.66"
 authors = ["Christopher Berner <[email protected]>"]

diff --git a/src/tree_store/page_store/page_manager.rs b/src/tree_store/page_store/page_manager.rs
@@ -657,21 +657,6 @@ impl TransactionalMemory {
         page_number: PageNumber,
         hint: PageHint,
     ) -> Result<PageImpl> {
-        // We must not retrieve an immutable reference to a page which already has a mutable ref to it
-        #[cfg(debug_assertions)]
-        {
-            debug_assert!(
-                !self.open_dirty_pages.lock().unwrap().contains(&page_number),
-                "{page_number:?}",
-            );
-            *(self
-                .read_page_ref_counts
-                .lock()
-                .unwrap()
-                .entry(page_number)
-                .or_default()) += 1;
-        }
-
         let range = page_number.address_range(
             self.page_size as u64,
             self.region_size,
@@ -683,6 +668,20 @@ impl TransactionalMemory {
             .storage
             .read(range.start, len, hint, CachePriority::default_btree)?;
 
+        // We must not retrieve an immutable reference to a page which already has a mutable ref to it
+        #[cfg(debug_assertions)]
+        {
+            let dirty_pages = self.open_dirty_pages.lock().unwrap();
+            debug_assert!(!dirty_pages.contains(&page_number), "{page_number:?}");
+            *(self
+                .read_page_ref_counts
+                .lock()
+                .unwrap()
+                .entry(page_number)
+                .or_default()) += 1;
+            drop(dirty_pages);
+        }
+
         Ok(PageImpl {
             mem,
             page_number,