rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-31 12:00:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: migrate to Layer::for_resident

Browse Source
This commit is contained in:
Joonas Koivunen
2023-08-24 20:53:18 +03:00
parent 0950f8c752
commit 83e28083b0
1 changed files with 17 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
pageserver/src/tenant/remote_timeline_client.rs
View File

@@ -1365,7 +1365,7 @@ mod tests {
context::RequestContext,
tenant::{
harness::{TenantHarness, TIMELINE_ID},
storage_layer::{Layer, PersistentLayerDesc},
storage_layer::Layer,
Tenant, Timeline,
},
DEFAULT_PG_VERSION,
@@ -1541,46 +1541,26 @@ mod tests {
std::fs::write(timeline_path.join(filename.file_name()), content).unwrap();
}
let layer_file_1 = Layer::for_written(
let layer_file_1 = Layer::for_resident(
harness.conf,
&timeline,
PersistentLayerDesc::from_filename(
timeline.tenant_id,
timeline.timeline_id,
layer_file_name_1.clone(),
content_1.len() as u64,
),
)
.unwrap();
layer_file_name_1.clone(),
LayerFileMetadata::new(content_1.len() as u64),
);
// FIXME: need that api for local files
assert!(layer_file_1.needs_download_blocking().unwrap().is_none());
let layer_file_2 = Layer::for_written(
let layer_file_2 = Layer::for_resident(
harness.conf,
&timeline,
PersistentLayerDesc::from_filename(
timeline.tenant_id,
timeline.timeline_id,
layer_file_name_2.clone(),
content_2.len() as u64,
),
)
.unwrap();
assert!(layer_file_2.needs_download_blocking().unwrap().is_none());
layer_file_name_2.clone(),
LayerFileMetadata::new(content_2.len() as u64),
);
let layer_file_3 = Layer::for_written(
let layer_file_3 = Layer::for_resident(
harness.conf,
&timeline,
PersistentLayerDesc::from_filename(
timeline.tenant_id,
timeline.timeline_id,
layer_file_name_3.clone(),
content_3.len() as u64,
),
)
.unwrap();
assert!(layer_file_3.needs_download_blocking().unwrap().is_none());
layer_file_name_3.clone(),
LayerFileMetadata::new(content_3.len() as u64),
);
client
.schedule_layer_file_upload(
@@ -1721,20 +1701,12 @@ mod tests {
)
.unwrap();
let layer_file_1 = Layer::for_written(
let layer_file_1 = Layer::for_resident(
harness.conf,
&timeline,
PersistentLayerDesc::from_filename(
timeline.tenant_id,
timeline.timeline_id,
layer_file_name_1.clone(),
content_1.len() as u64,
),
)
.unwrap();
// FIXME: need that api for local files that actually exist
assert!(layer_file_1.needs_download_blocking().unwrap().is_none());
layer_file_name_1.clone(),
LayerFileMetadata::new(content_1.len() as u64),
);
#[derive(Debug, PartialEq)]
struct BytesStartedFinished {