diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs index aa98f09748..ff6b86a1e7 100644 --- a/pageserver/src/http/routes.rs +++ b/pageserver/src/http/routes.rs @@ -810,7 +810,9 @@ async fn timeline_compact_handler(request: Request) -> Result DeltaKeyIter { last.1 = pos - first_pos; } } - all_keys.push((delta_key, pos)); + all_keys.push((delta_key, pos)); } true }, diff --git a/pageserver/src/tenant/inmemory_layer.rs b/pageserver/src/tenant/inmemory_layer.rs index 6774351358..d645fc4710 100644 --- a/pageserver/src/tenant/inmemory_layer.rs +++ b/pageserver/src/tenant/inmemory_layer.rs @@ -358,8 +358,14 @@ impl InMemoryLayer { // Write all page versions for (lsn, pos) in vec_map.as_slice() { cursor.read_blob_into_buf(*pos, &mut buf)?; - let value = Value::des(&buf)?; - delta_layer_writer.put_value_bytes(key, *lsn, &buf, value.will_init(), value.is_image())?; + let value = Value::des(&buf)?; + delta_layer_writer.put_value_bytes( + key, + *lsn, + &buf, + value.will_init(), + value.is_image(), + )?; } } diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index 149432ca97..bb1c0d1c8b 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -1533,35 +1533,35 @@ impl Timeline { let mut layers = self.layers.write().unwrap(); let latest_delta_layer = layers.get_latest_delta_layer(); drop(layers); - let mut writer: Option = None; + let mut writer: Option = None; let mut new_layers = Vec::new(); - let mut last_key: Option = None; + let mut last_key: Option = None; if let Some(last_delta_layer) = latest_delta_layer { for (key, lsn, _) in last_delta_layer.key_iter(true) { - match &writer { - Some(curr_writer) => { - if curr_writer.size() > target_file_size { - new_layers.push(writer.take().unwrap().finish(key)?); - writer = None; - } - }, - _ => { - // Create writer if not initiaized yet - writer = Some(DeltaLayerWriter::new( - self.conf, - self.timeline_id, - self.tenant_id, - key, - last_delta_layer.get_lsn_range().clone(), - )?); - } + match &writer { + Some(curr_writer) => { + if curr_writer.size() > target_file_size { + new_layers.push(writer.take().unwrap().finish(key)?); + writer = None; + } + } + _ => { + // Create writer if not initiaized yet + writer = Some(DeltaLayerWriter::new( + self.conf, + self.timeline_id, + self.tenant_id, + key, + last_delta_layer.get_lsn_range().clone(), + )?); + } } let value = self.get(key, lsn)?; writer .as_mut() .unwrap() .put_value(key, lsn, Value::Image(value))?; - last_key = Some(key); + last_key = Some(key); } } if let Some(writer) = writer {