rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-14 17:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix indentation

Browse Source
This commit is contained in:
Konstantin Knizhnik
2022-10-05 15:30:24 +03:00
parent 898937d500
commit 487ec20085
4 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pageserver/src/http/routes.rs
View File

@@ -810,7 +810,9 @@ async fn timeline_compact_handler(request: Request<Body>) -> Result<Response<Bod
.get_timeline(timeline_id)
.with_context(|| format!("No timeline {timeline_id} in repository for tenant {tenant_id}"))
.map_err(ApiError::NotFound)?;
timeline.reconstruct().map_err(ApiError::InternalServerError)?;
timeline
.reconstruct()
.map_err(ApiError::InternalServerError)?;
json_response(StatusCode::OK, ())
}

2
pageserver/src/tenant/delta_layer.rs
View File

@@ -917,7 +917,7 @@ impl<'a> DeltaKeyIter {
last.1 = pos - first_pos;
}
}
all_keys.push((delta_key, pos));
all_keys.push((delta_key, pos));
}
true
},

10
pageserver/src/tenant/inmemory_layer.rs
View File

@@ -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(),
)?;
}
}

40
pageserver/src/tenant/timeline.rs
View File

@@ -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<DeltaLayerWriter> = None;
let mut writer: Option<DeltaLayerWriter> = None;
let mut new_layers = Vec::new();
let mut last_key: Option<Key> = None;
let mut last_key: Option<Key> = 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 {