Fix merge conflicts

This commit is contained in:
Kosntantin Knizhnik
2025-07-18 08:06:34 +03:00
committed by Konstantin Knizhnik
parent eabac14080
commit de33affb1f
3 changed files with 1 additions and 4 deletions

View File

@@ -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");

View File

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

View File

@@ -80,7 +80,6 @@ RelsizeCacheShmemInit(void)
relsize_ctl->writes = 0;
dlist_init(&relsize_ctl->lru);
}
LWLockRelease(AddinShmemInitLock);
}
bool