From de33affb1f49dc32bf6de7e6dd868b6b5b37fb51 Mon Sep 17 00:00:00 2001
From: Kosntantin Knizhnik <konstantin.knizhnik@databricks.com>
Date: Fri, 18 Jul 2025 08:06:34 +0300
Subject: [PATCH] Fix merge conflicts

---
 pgxn/neon/libpagestore.c  | 3 ---
 pgxn/neon/neon.c          | 1 +
 pgxn/neon/relsize_cache.c | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pgxn/neon/libpagestore.c b/pgxn/neon/libpagestore.c
index 010e5dd966..1031f185a6 100644
--- a/pgxn/neon/libpagestore.c
+++ b/pgxn/neon/libpagestore.c
@@ -1630,9 +1630,6 @@ pg_init_libpagestore(void)
 							0,
 							NULL, NULL, NULL);
 
-	relsize_hash_init();
-	relkind_hash_init();
-
 	if (page_server != NULL)
 		neon_log(ERROR, "libpagestore already loaded");
 
diff --git a/pgxn/neon/neon.c b/pgxn/neon/neon.c
index 7f99b1bfb9..9b5f3015b2 100644
--- a/pgxn/neon/neon.c
+++ b/pgxn/neon/neon.c
@@ -489,6 +489,7 @@ _PG_init(void)
 	/* Stage 1: Define GUCs, and other early intialization */
 	pg_init_libpagestore();
 	relsize_hash_init();
+	relkind_hash_init();
 	lfc_init();
 	pg_init_walproposer();
 	init_lwlsncache();
diff --git a/pgxn/neon/relsize_cache.c b/pgxn/neon/relsize_cache.c
index 5fe1967acc..c6b4aeb394 100644
--- a/pgxn/neon/relsize_cache.c
+++ b/pgxn/neon/relsize_cache.c
@@ -80,7 +80,6 @@ RelsizeCacheShmemInit(void)
 		relsize_ctl->writes = 0;
 		dlist_init(&relsize_ctl->lru);
 	}
-	LWLockRelease(AddinShmemInitLock);
 }
 
 bool