external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes pg 14 compile errors

pull/7240/head
gindibay 2023-10-27 10:28:09 +03:00
parent 2a6c40d643
commit 8811d910a5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/distributed/commands/database.c
View File

@ -465,7 +465,6 @@ static DatabaseCollationInfo
GetDatabaseCollation(Oid db_oid) GetDatabaseCollation(Oid db_oid)
{ {
DatabaseCollationInfo info; DatabaseCollationInfo info;
Datum collationDatum, ctypeDatum, icuLocaleDatum, collverDatum;
bool isNull; bool isNull;
Snapshot snapshot = RegisterSnapshot(GetLatestSnapshot()); Snapshot snapshot = RegisterSnapshot(GetLatestSnapshot());
@ -477,7 +476,7 @@ GetDatabaseCollation(Oid db_oid)
} }
TupleDesc tupdesc = RelationGetDescr(rel); TupleDesc tupdesc = RelationGetDescr(rel);
collationDatum = heap_getattr(tup, Anum_pg_database_datcollate, tupdesc, &isNull); Datum collationDatum = heap_getattr(tup, Anum_pg_database_datcollate, tupdesc, &isNull);
if (isNull) if (isNull)
{ {
info.collation = NULL; info.collation = NULL;
@ -487,7 +486,7 @@ GetDatabaseCollation(Oid db_oid)
info.collation = TextDatumGetCString(collationDatum); info.collation = TextDatumGetCString(collationDatum);
} }
ctypeDatum = heap_getattr(tup, Anum_pg_database_datctype, tupdesc, &isNull); Datum ctypeDatum = heap_getattr(tup, Anum_pg_database_datctype, tupdesc, &isNull);
if (isNull) if (isNull)
{ {
info.ctype = NULL; info.ctype = NULL;
@ -499,7 +498,7 @@ GetDatabaseCollation(Oid db_oid)
#if PG_VERSION_NUM >= PG_VERSION_15 #if PG_VERSION_NUM >= PG_VERSION_15
icuLocaleDatum = heap_getattr(tup, Anum_pg_database_daticulocale, tupdesc, &isNull); Datum icuLocaleDatum = heap_getattr(tup, Anum_pg_database_daticulocale, tupdesc, &isNull);
if (isNull) if (isNull)
{ {
info.icu_locale = NULL; info.icu_locale = NULL;
@ -509,7 +508,7 @@ GetDatabaseCollation(Oid db_oid)
info.icu_locale = TextDatumGetCString(icuLocaleDatum); info.icu_locale = TextDatumGetCString(icuLocaleDatum);
} }
collverDatum = heap_getattr(tup, Anum_pg_database_datcollversion, tupdesc, &isNull); Datum collverDatum = heap_getattr(tup, Anum_pg_database_datcollversion, tupdesc, &isNull);
if (isNull) if (isNull)
{ {
info.collversion = NULL; info.collversion = NULL;
@ -539,13 +538,15 @@ FreeDatabaseCollationInfo(DatabaseCollationInfo collInfo)
{ {
pfree(collInfo.ctype); pfree(collInfo.ctype);
} }
#if PG_VERSION_NUM >= PG_VERSION_15
if (collInfo.icu_locale != NULL) if (collInfo.icu_locale != NULL)
{ {
pfree(collInfo.icu_locale); pfree(collInfo.icu_locale);
} }
#endif
} }
#if PG_VERSION_NUM >= PG_VERSION_15
static char * static char *
get_locale_provider_string(char datlocprovider) get_locale_provider_string(char datlocprovider)
{ {
@ -570,6 +571,7 @@ get_locale_provider_string(char datlocprovider)
return ""; return "";
} }
} }
#endif
/* /*