From 4f39501641bb2795fadf11b9e92cc205c56018bc Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki@neon.tech>
Date: Fri, 13 Sep 2024 02:04:48 +0300
Subject: [PATCH] Fix handling relations > 1 GB

---
 pageserver/src/pg_import.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pageserver/src/pg_import.rs b/pageserver/src/pg_import.rs
index d4c69877c6..5ce5bc1f31 100644
--- a/pageserver/src/pg_import.rs
+++ b/pageserver/src/pg_import.rs
@@ -181,7 +181,12 @@ impl PgImportEnv {
         let mut first = true;
         for chunk in chunks {
             let key_start = last_key_end;
-            let key_end = rel_key_range(chunk.last().unwrap().rel_tag).end;
+            let last_file = chunk.last().unwrap();
+            let key_end = if last_file.nblocks.is_some() {
+                rel_key_range(last_file.rel_tag).end
+            } else {
+                rel_block_to_key(last_file.rel_tag, (last_file.segno + 1) * 1024 * 1024 * 1024 / 8192)
+            };
             let mut layer_writer = ImageLayerWriter::new(
                 &self.conf,
                 self.tli,