diff --git a/pageserver/src/layered_repository.rs b/pageserver/src/layered_repository.rs index 6d962b0cc7..ea00c7beb4 100644 --- a/pageserver/src/layered_repository.rs +++ b/pageserver/src/layered_repository.rs @@ -1268,12 +1268,8 @@ impl LayeredTimeline { // FIXME: It's pointless to check the cache for things that are not 8kB pages. // We should look at the key to determine if it's a cacheable object - let (lsn, read_guard) = cache.lookup_materialized_page( - self.tenantid, - self.timelineid, - key, - lsn, - )?; + let (lsn, read_guard) = + cache.lookup_materialized_page(self.tenantid, self.timelineid, key, lsn)?; let img = Bytes::from(read_guard.to_vec()); Some((lsn, img)) } diff --git a/pageserver/src/page_cache.rs b/pageserver/src/page_cache.rs index bedabf2749..90ab5622bd 100644 --- a/pageserver/src/page_cache.rs +++ b/pageserver/src/page_cache.rs @@ -52,8 +52,8 @@ use zenith_utils::{ zid::{ZTenantId, ZTimelineId}, }; -use crate::layered_repository::writeback_ephemeral_file; use crate::config::PageServerConf; +use crate::layered_repository::writeback_ephemeral_file; use crate::repository::Key; static PAGE_CACHE: OnceCell = OnceCell::new(); diff --git a/test_runner/performance/test_seqscans.py b/test_runner/performance/test_seqscans.py index 35c723d0c1..f4d28e3f93 100644 --- a/test_runner/performance/test_seqscans.py +++ b/test_runner/performance/test_seqscans.py @@ -9,15 +9,17 @@ from fixtures.compare_fixtures import PgCompare import pytest -@pytest.mark.parametrize('rows,iters,workers', [ - # The test table is large enough (3-4 MB) that it doesn't fit in the compute node - # cache, so the seqscans go to the page server. But small enough that it fits - # into memory in the page server. - pytest.param(100000, 100, 0), - # Also test with a larger table, with and without parallelism - pytest.param(10000000, 1, 0, marks=pytest.mark.slow), - pytest.param(10000000, 1, 4, marks=pytest.mark.slow) -]) +@pytest.mark.parametrize( + 'rows,iters,workers', + [ + # The test table is large enough (3-4 MB) that it doesn't fit in the compute node + # cache, so the seqscans go to the page server. But small enough that it fits + # into memory in the page server. + pytest.param(100000, 100, 0), + # Also test with a larger table, with and without parallelism + pytest.param(10000000, 1, 0, marks=pytest.mark.slow), + pytest.param(10000000, 1, 4, marks=pytest.mark.slow) + ]) def test_seqscans(zenith_with_baseline: PgCompare, rows: int, iters: int, workers: int): env = zenith_with_baseline