sq revert

pageserver/src/basebackup.rs

@@ -400,42 +400,6 @@ where
     }
 
     //
-<<<<<<< HEAD
-=======
-    // Generate SLRU segment files from repository.
-    //
-    async fn add_slru_segment(&mut self, slru: SlruKind, segno: u32) -> anyhow::Result<()> {
-        let nblocks = self
-            .timeline
-            .get_slru_segment_size(slru, segno, self.lsn, self.ctx)
-            .await?;
-
-        let mut slru_buf: Vec<u8> = Vec::with_capacity(nblocks as usize * BLCKSZ as usize);
-        for blknum in 0..nblocks {
-            let img = self
-                .timeline
-                .get_slru_page_at_lsn(slru, segno, blknum, self.lsn, self.ctx)
-                .await?;
-
-            if slru == SlruKind::Clog {
-                ensure!(img.len() == BLCKSZ as usize || img.len() == BLCKSZ as usize + 8);
-            } else {
-                ensure!(img.len() == BLCKSZ as usize);
-            }
-
-            slru_buf.extend_from_slice(&img[..BLCKSZ as usize]);
-        }
-
-        let segname = format!("{}/{:>04X}", slru.to_str(), segno);
-        let header = new_tar_header(&segname, slru_buf.len() as u64)?;
-        self.ar.append(&header, slru_buf.as_slice()).await?;
-
-        trace!("Added to basebackup slru {} relsize {}", segname, nblocks);
-        Ok(())
-    }
-
-    //
->>>>>>> parent of fb518aea0 (Add batch ingestion mechanism to avoid high contention (#5886))
     // Include database/tablespace directories.
     //
     // Each directory contains a PG_VERSION file, and the default database

pageserver/src/page_service.rs

@@ -61,7 +61,6 @@ use crate::context::{DownloadBehavior, RequestContext};
 use crate::import_datadir::import_wal_from_tar;
 use crate::metrics;
 use crate::metrics::LIVE_CONNECTIONS_COUNT;
-use crate::pgdatadir_mapping::Version;
 use crate::span::debug_assert_current_span_has_tenant_and_timeline_id;
 use crate::span::debug_assert_current_span_has_tenant_and_timeline_id_no_shard_id;
 use crate::task_mgr;

pageserver/src/pgdatadir_mapping.rs

@@ -333,7 +333,7 @@ impl Timeline {
         ctx: &RequestContext,
     ) -> Result<Bytes, PageReconstructError> {
         let n_blocks = self
-            .get_slru_segment_size(kind, segno, Version::Lsn(lsn), ctx)
+            .get_slru_segment_size(kind, segno, lsn, ctx)
             .await?;
         let mut segment = BytesMut::with_capacity(n_blocks as usize * BLCKSZ as usize);
         for blkno in 0..n_blocks {
@@ -567,14 +567,14 @@ impl Timeline {
 
         for kind in SlruKind::iter() {
             let mut segments: Vec<u32> = self
-                .list_slru_segments(kind, version, ctx)
+                .list_slru_segments(kind, lsn, ctx)
                 .await?
                 .into_iter()
                 .collect();
             segments.sort_unstable();
 
             for seg in segments {
-                let block_count = self.get_slru_segment_size(kind, seg, version, ctx).await?;
+                let block_count = self.get_slru_segment_size(kind, seg, lsn, ctx).await?;
 
                 accum.add_range(
                     slru_block_to_key(kind, seg, 0)..slru_block_to_key(kind, seg, block_count),

pageserver/src/tenant/storage_layer/inmemory_layer.rs

@@ -539,7 +539,7 @@ impl InMemoryLayer {
         inner.resource_units.publish_size(size)
     }
 
-    pub(crate) async fn put_tombstones(&self, _key_ranges: &[(Range<Key>, Lsn)]) -> Result<()> {
+    pub(crate) async fn put_tombstones(&self, _ranges: Range<Key>, _lsn: Lsn) -> Result<()> {
         // TODO: Currently, we just leak the storage for any deleted keys
 
         Ok(())

pageserver/src/tenant/timeline.rs

@@ -4747,12 +4747,10 @@ impl<'a> TimelineWriter<'a> {
         Ok(())
     }
 
-    pub(crate) async fn delete_batch(&mut self, batch: &[(Range<Key>, Lsn)]) -> anyhow::Result<()> {
-        if let Some((_, lsn)) = batch.first() {
-            let action = self.get_open_layer_action(*lsn, 0).await;
-            let layer = self.handle_open_layer_action(*lsn, action).await?;
-            layer.put_tombstones(batch).await?;
-        }
+    pub(crate) async fn delete(&mut self, range: Range<Key>, lsn: Lsn) -> anyhow::Result<()> {
+        let action = self.get_open_layer_action(lsn, 0).await;
+        let layer = self.handle_open_layer_action(lsn, action).await?;
+        layer.put_tombstones(range, lsn).await?;
 
         Ok(())
     }

pageserver/src/walingest.rs

@@ -33,7 +33,7 @@ use utils::failpoint_support;
 
 use crate::context::RequestContext;
 use crate::metrics::WAL_INGEST;
-use crate::pgdatadir_mapping::{DatadirModification, Version};
+use crate::pgdatadir_mapping::DatadirModification;
 use crate::tenant::PageReconstructError;
 use crate::tenant::Timeline;
 use crate::walrecord::*;