From 863c04b0a64af7df8c4f4eb3e174ce373a13bc46 Mon Sep 17 00:00:00 2001
From: Konstantin Knizhnik <knizhnik@garret.ru>
Date: Thu, 2 Dec 2021 13:01:27 +0300
Subject: [PATCH] Use latest YAKV version

---
 Cargo.lock                       | 2 +-
 pageserver/Cargo.toml            | 4 ++--
 pageserver/src/bin/pageserver.rs | 4 ++--
 pageserver/src/toast_store.rs    | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23b6b252b4..f843d234c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2572,7 +2572,7 @@ checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"
 
 [[package]]
 name = "yakv"
-version = "0.2.4"
+version = "0.2.5"
 dependencies = [
  "anyhow",
  "fs2",
diff --git a/pageserver/Cargo.toml b/pageserver/Cargo.toml
index 30d2c585e0..2c6c826ef9 100644
--- a/pageserver/Cargo.toml
+++ b/pageserver/Cargo.toml
@@ -37,8 +37,8 @@ async-trait = "0.1"
 const_format = "0.2.21"
 tracing = "0.1.27"
 signal-hook = {version = "0.3.10", features = ["extended-siginfo"] }
-yakv = { path  = "../../yakv" }
-#yakv = "0.2.4"
+#yakv = { path  = "../../yakv" }
+yakv = "0.2.6"
 lz4_flex = "0.9.0"
 
 postgres_ffi = { path = "../postgres_ffi" }
diff --git a/pageserver/src/bin/pageserver.rs b/pageserver/src/bin/pageserver.rs
index 995d7dca3d..e398928c08 100644
--- a/pageserver/src/bin/pageserver.rs
+++ b/pageserver/src/bin/pageserver.rs
@@ -323,8 +323,8 @@ fn main() -> Result<()> {
                 .help("Interval between checkpoint iterations"),
         )
         .arg(
-            Arg::with_name("checkpoint_distance")
-                .long("checkpoint_distance")
+            Arg::with_name("upload_distance")
+                .long("upload_distance")
                 .takes_value(true)
                 .help("Distance from current LSN to perform checkpoint of in-memory layers"),
         )
diff --git a/pageserver/src/toast_store.rs b/pageserver/src/toast_store.rs
index 46ad00343f..0c8cc62a6a 100644
--- a/pageserver/src/toast_store.rs
+++ b/pageserver/src/toast_store.rs
@@ -5,7 +5,7 @@ use std::ops::{Bound, RangeBounds};
 use std::path::Path;
 
 use yakv::storage::{
-    Key, ReadOnlyTransaction, Storage, StorageConfig, StorageIterator, Transaction, Value,
+    Key, ReadOnlyTransaction, Select, Storage, StorageConfig, StorageIterator, Transaction, Value,
 };
 
 const TOAST_SEGMENT_SIZE: usize = 2 * 1024;
@@ -169,7 +169,6 @@ impl ToastStore {
                 StorageConfig {
                     cache_size: CACHE_SIZE,
                     nosync: false,
-                    mursiw: true,
                 },
             )?,
         })
@@ -206,7 +205,7 @@ impl ToastStore {
             key.extend_from_slice(&[0u8; 4]);
             tx.put(&key, &value)?;
         }
-        tx.delay()?;
+        tx.delay();
         Ok(())
     }
 
@@ -225,7 +224,8 @@ impl ToastStore {
     pub fn remove(&self, key: Key) -> Result<()> {
         let mut tx = self.db.start_transaction();
         self.tx_remove(&mut tx, &key)?;
-        tx.delay()
+        tx.delay();
+        Ok(())
     }
 
     pub fn tx_remove(&self, tx: &mut Transaction, key: &Key) -> Result<()> {