review: Christian's comments

neondatabase · Mar 5, 2024 · 9036ded · 9036ded
1 parent 3e1840e
commit 9036ded
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs
@@ -894,15 +894,15 @@ impl DeltaLayerInner {
     where
         Reader: BlockReader,
     {
-        let btree_request_context = RequestContextBuilder::extend(ctx)
+        let ctx = RequestContextBuilder::extend(ctx)
             .page_content_kind(PageContentKind::DeltaLayerBtreeNode)
             .build();
 
         for range in keyspace.ranges.iter() {
             let mut range_end_handled = false;
 
             let start_key = DeltaKey::from_key_lsn(&range.start, lsn_range.start);
-            let index_stream = index_reader.get_stream_from(&start_key.0, &btree_request_context);
+            let index_stream = index_reader.get_stream_from(&start_key.0, &ctx);
             let mut index_stream = std::pin::pin!(index_stream);
 
             while let Some(index_entry) = index_stream.next().await {
@@ -911,7 +911,7 @@ impl DeltaLayerInner {
                 let lsn = DeltaKey::extract_lsn_from_buf(&raw_key);
                 let blob_ref = BlobRef(value);
 
-                // Lsns are not monotonically increasing, so we don't assert on them.
+                // Lsns are not monotonically increasing across keys, so we don't assert on them.
                 assert!(key >= range.start);
 
                 let outside_lsn_range = !lsn_range.contains(&lsn);

diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs
@@ -490,8 +490,8 @@ impl ImageLayerInner {
         let tree_reader =
             DiskBtreeReader::new(self.index_start_blk, self.index_root_blk, block_reader);
 
-        let btree_request_context = RequestContextBuilder::extend(ctx)
-            .page_content_kind(PageContentKind::DeltaLayerBtreeNode)
+        let ctx = RequestContextBuilder::extend(ctx)
+            .page_content_kind(PageContentKind::ImageLayerBtreeNode)
             .build();
 
         for range in keyspace.ranges.iter() {
@@ -500,7 +500,7 @@ impl ImageLayerInner {
             let mut search_key: [u8; KEY_SIZE] = [0u8; KEY_SIZE];
             range.start.write_to_byte_slice(&mut search_key);
 
-            let index_stream = tree_reader.get_stream_from(&search_key, &btree_request_context);
+            let index_stream = tree_reader.get_stream_from(&search_key, &ctx);
             let mut index_stream = std::pin::pin!(index_stream);
 
             while let Some(index_entry) = index_stream.next().await {