On Tue, 27 Feb 2024 at 07:25, Michael Paquier <mich...@paquier.xyz> wrote:
> About 0002, I can't help but notice pg_enc2icu_tbl and
> pg_enc2gettext_tb. There are exceptions like MULE_INTERNAL, but is it
> possible to do better?
Attached is an updated patchset to also convert pg_enc2icu_tbl and
pg_enc2gettext_tbl. I converted pg_enc2gettext_tbl in a separate
commit, because it actually requires some codechanges too.
From 4bdf8991d948a251cdade89dbacf121c64f420c7 Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <jelte.fenn...@microsoft.com>
Date: Wed, 21 Feb 2024 15:34:38 +0100
Subject: [PATCH v3 2/3] Use designated initializer syntax to improve
readability
Use C99 designated initializer syntax for array elements of various
arrays. This is less verbose, more readable and less prone to typos or
ordering mistakes.
Akin to 74a730631065 and cc150596341e.
---
src/backend/parser/parser.c | 12 +-
src/backend/utils/misc/guc_tables.c | 187 +++++++++++-----------------
src/bin/pg_dump/pg_dump_sort.c | 94 +++++++-------
src/common/encnames.c | 154 +++++++++++------------
src/common/relpath.c | 8 +-
src/common/wchar.c | 85 +++++++------
src/include/mb/pg_wchar.h | 6 +-
7 files changed, 248 insertions(+), 298 deletions(-)
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 9ec628ecbdf..3a1fa91c1b6 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -56,12 +56,12 @@ raw_parser(const char *str, RawParseMode mode)
{
/* this array is indexed by RawParseMode enum */
static const int mode_token[] = {
- 0, /* RAW_PARSE_DEFAULT */
- MODE_TYPE_NAME, /* RAW_PARSE_TYPE_NAME */
- MODE_PLPGSQL_EXPR, /* RAW_PARSE_PLPGSQL_EXPR */
- MODE_PLPGSQL_ASSIGN1, /* RAW_PARSE_PLPGSQL_ASSIGN1 */
- MODE_PLPGSQL_ASSIGN2, /* RAW_PARSE_PLPGSQL_ASSIGN2 */
- MODE_PLPGSQL_ASSIGN3 /* RAW_PARSE_PLPGSQL_ASSIGN3 */
+ [RAW_PARSE_DEFAULT] = 0,
+ [RAW_PARSE_TYPE_NAME] = MODE_TYPE_NAME,
+ [RAW_PARSE_PLPGSQL_EXPR] = MODE_PLPGSQL_EXPR,
+ [RAW_PARSE_PLPGSQL_ASSIGN1] = MODE_PLPGSQL_ASSIGN1,
+ [RAW_PARSE_PLPGSQL_ASSIGN2] = MODE_PLPGSQL_ASSIGN2,
+ [RAW_PARSE_PLPGSQL_ASSIGN3] = MODE_PLPGSQL_ASSIGN3,
};
yyextra.have_lookahead = true;
diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c
index 527a2b27340..59904fd007f 100644
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@ -627,13 +627,13 @@ bool in_hot_standby_guc;
*/
const char *const GucContext_Names[] =
{
- /* PGC_INTERNAL */ "internal",
- /* PGC_POSTMASTER */ "postmaster",
- /* PGC_SIGHUP */ "sighup",
- /* PGC_SU_BACKEND */ "superuser-backend",
- /* PGC_BACKEND */ "backend",
- /* PGC_SUSET */ "superuser",
- /* PGC_USERSET */ "user"
+ [PGC_INTERNAL] = "internal",
+ [PGC_POSTMASTER] = "postmaster",
+ [PGC_SIGHUP] = "sighup",
+ [PGC_SU_BACKEND] = "superuser-backend",
+ [PGC_BACKEND] = "backend",
+ [PGC_SUSET] = "superuser",
+ [PGC_USERSET] = "user"
};
StaticAssertDecl(lengthof(GucContext_Names) == (PGC_USERSET + 1),
@@ -646,20 +646,20 @@ StaticAssertDecl(lengthof(GucContext_Names) == (PGC_USERSET + 1),
*/
const char *const GucSource_Names[] =
{
- /* PGC_S_DEFAULT */ "default",
- /* PGC_S_DYNAMIC_DEFAULT */ "default",
- /* PGC_S_ENV_VAR */ "environment variable",
- /* PGC_S_FILE */ "configuration file",
- /* PGC_S_ARGV */ "command line",
- /* PGC_S_GLOBAL */ "global",
- /* PGC_S_DATABASE */ "database",
- /* PGC_S_USER */ "user",
- /* PGC_S_DATABASE_USER */ "database user",
- /* PGC_S_CLIENT */ "client",
- /* PGC_S_OVERRIDE */ "override",
- /* PGC_S_INTERACTIVE */ "interactive",
- /* PGC_S_TEST */ "test",
- /* PGC_S_SESSION */ "session"
+ [PGC_S_DEFAULT] = "default",
+ [PGC_S_DYNAMIC_DEFAULT] = "default",
+ [PGC_S_ENV_VAR] = "environment variable",
+ [PGC_S_FILE] = "configuration file",
+ [PGC_S_ARGV] = "command line",
+ [PGC_S_GLOBAL] = "global",
+ [PGC_S_DATABASE] = "database",
+ [PGC_S_USER] = "user",
+ [PGC_S_DATABASE_USER] = "database user",
+ [PGC_S_CLIENT] = "client",
+ [PGC_S_OVERRIDE] = "override",
+ [PGC_S_INTERACTIVE] = "interactive",
+ [PGC_S_TEST] = "test",
+ [PGC_S_SESSION] = "session"
};
StaticAssertDecl(lengthof(GucSource_Names) == (PGC_S_SESSION + 1),
@@ -670,96 +670,51 @@ StaticAssertDecl(lengthof(GucSource_Names) == (PGC_S_SESSION + 1),
*/
const char *const config_group_names[] =
{
- /* UNGROUPED */
- gettext_noop("Ungrouped"),
- /* FILE_LOCATIONS */
- gettext_noop("File Locations"),
- /* CONN_AUTH_SETTINGS */
- gettext_noop("Connections and Authentication / Connection Settings"),
- /* CONN_AUTH_TCP */
- gettext_noop("Connections and Authentication / TCP Settings"),
- /* CONN_AUTH_AUTH */
- gettext_noop("Connections and Authentication / Authentication"),
- /* CONN_AUTH_SSL */
- gettext_noop("Connections and Authentication / SSL"),
- /* RESOURCES_MEM */
- gettext_noop("Resource Usage / Memory"),
- /* RESOURCES_DISK */
- gettext_noop("Resource Usage / Disk"),
- /* RESOURCES_KERNEL */
- gettext_noop("Resource Usage / Kernel Resources"),
- /* RESOURCES_VACUUM_DELAY */
- gettext_noop("Resource Usage / Cost-Based Vacuum Delay"),
- /* RESOURCES_BGWRITER */
- gettext_noop("Resource Usage / Background Writer"),
- /* RESOURCES_ASYNCHRONOUS */
- gettext_noop("Resource Usage / Asynchronous Behavior"),
- /* WAL_SETTINGS */
- gettext_noop("Write-Ahead Log / Settings"),
- /* WAL_CHECKPOINTS */
- gettext_noop("Write-Ahead Log / Checkpoints"),
- /* WAL_ARCHIVING */
- gettext_noop("Write-Ahead Log / Archiving"),
- /* WAL_RECOVERY */
- gettext_noop("Write-Ahead Log / Recovery"),
- /* WAL_ARCHIVE_RECOVERY */
- gettext_noop("Write-Ahead Log / Archive Recovery"),
- /* WAL_RECOVERY_TARGET */
- gettext_noop("Write-Ahead Log / Recovery Target"),
- /* WAL_SUMMARIZATION */
- gettext_noop("Write-Ahead Log / Summarization"),
- /* REPLICATION_SENDING */
- gettext_noop("Replication / Sending Servers"),
- /* REPLICATION_PRIMARY */
- gettext_noop("Replication / Primary Server"),
- /* REPLICATION_STANDBY */
- gettext_noop("Replication / Standby Servers"),
- /* REPLICATION_SUBSCRIBERS */
- gettext_noop("Replication / Subscribers"),
- /* QUERY_TUNING_METHOD */
- gettext_noop("Query Tuning / Planner Method Configuration"),
- /* QUERY_TUNING_COST */
- gettext_noop("Query Tuning / Planner Cost Constants"),
- /* QUERY_TUNING_GEQO */
- gettext_noop("Query Tuning / Genetic Query Optimizer"),
- /* QUERY_TUNING_OTHER */
- gettext_noop("Query Tuning / Other Planner Options"),
- /* LOGGING_WHERE */
- gettext_noop("Reporting and Logging / Where to Log"),
- /* LOGGING_WHEN */
- gettext_noop("Reporting and Logging / When to Log"),
- /* LOGGING_WHAT */
- gettext_noop("Reporting and Logging / What to Log"),
- /* PROCESS_TITLE */
- gettext_noop("Reporting and Logging / Process Title"),
- /* STATS_MONITORING */
- gettext_noop("Statistics / Monitoring"),
- /* STATS_CUMULATIVE */
- gettext_noop("Statistics / Cumulative Query and Index Statistics"),
- /* AUTOVACUUM */
- gettext_noop("Autovacuum"),
- /* CLIENT_CONN_STATEMENT */
- gettext_noop("Client Connection Defaults / Statement Behavior"),
- /* CLIENT_CONN_LOCALE */
- gettext_noop("Client Connection Defaults / Locale and Formatting"),
- /* CLIENT_CONN_PRELOAD */
- gettext_noop("Client Connection Defaults / Shared Library Preloading"),
- /* CLIENT_CONN_OTHER */
- gettext_noop("Client Connection Defaults / Other Defaults"),
- /* LOCK_MANAGEMENT */
- gettext_noop("Lock Management"),
- /* COMPAT_OPTIONS_PREVIOUS */
- gettext_noop("Version and Platform Compatibility / Previous PostgreSQL Versions"),
- /* COMPAT_OPTIONS_CLIENT */
- gettext_noop("Version and Platform Compatibility / Other Platforms and Clients"),
- /* ERROR_HANDLING_OPTIONS */
- gettext_noop("Error Handling"),
- /* PRESET_OPTIONS */
- gettext_noop("Preset Options"),
- /* CUSTOM_OPTIONS */
- gettext_noop("Customized Options"),
- /* DEVELOPER_OPTIONS */
- gettext_noop("Developer Options"),
+ [UNGROUPED] = gettext_noop("Ungrouped"),
+ [FILE_LOCATIONS] = gettext_noop("File Locations"),
+ [CONN_AUTH_SETTINGS] = gettext_noop("Connections and Authentication / Connection Settings"),
+ [CONN_AUTH_TCP] = gettext_noop("Connections and Authentication / TCP Settings"),
+ [CONN_AUTH_AUTH] = gettext_noop("Connections and Authentication / Authentication"),
+ [CONN_AUTH_SSL] = gettext_noop("Connections and Authentication / SSL"),
+ [RESOURCES_MEM] = gettext_noop("Resource Usage / Memory"),
+ [RESOURCES_DISK] = gettext_noop("Resource Usage / Disk"),
+ [RESOURCES_KERNEL] = gettext_noop("Resource Usage / Kernel Resources"),
+ [RESOURCES_VACUUM_DELAY] = gettext_noop("Resource Usage / Cost-Based Vacuum Delay"),
+ [RESOURCES_BGWRITER] = gettext_noop("Resource Usage / Background Writer"),
+ [RESOURCES_ASYNCHRONOUS] = gettext_noop("Resource Usage / Asynchronous Behavior"),
+ [WAL_SETTINGS] = gettext_noop("Write-Ahead Log / Settings"),
+ [WAL_CHECKPOINTS] = gettext_noop("Write-Ahead Log / Checkpoints"),
+ [WAL_ARCHIVING] = gettext_noop("Write-Ahead Log / Archiving"),
+ [WAL_RECOVERY] = gettext_noop("Write-Ahead Log / Recovery"),
+ [WAL_ARCHIVE_RECOVERY] = gettext_noop("Write-Ahead Log / Archive Recovery"),
+ [WAL_RECOVERY_TARGET] = gettext_noop("Write-Ahead Log / Recovery Target"),
+ [WAL_SUMMARIZATION] = gettext_noop("Write-Ahead Log / Summarization"),
+ [REPLICATION_SENDING] = gettext_noop("Replication / Sending Servers"),
+ [REPLICATION_PRIMARY] = gettext_noop("Replication / Primary Server"),
+ [REPLICATION_STANDBY] = gettext_noop("Replication / Standby Servers"),
+ [REPLICATION_SUBSCRIBERS] = gettext_noop("Replication / Subscribers"),
+ [QUERY_TUNING_METHOD] = gettext_noop("Query Tuning / Planner Method Configuration"),
+ [QUERY_TUNING_COST] = gettext_noop("Query Tuning / Planner Cost Constants"),
+ [QUERY_TUNING_GEQO] = gettext_noop("Query Tuning / Genetic Query Optimizer"),
+ [QUERY_TUNING_OTHER] = gettext_noop("Query Tuning / Other Planner Options"),
+ [LOGGING_WHERE] = gettext_noop("Reporting and Logging / Where to Log"),
+ [LOGGING_WHEN] = gettext_noop("Reporting and Logging / When to Log"),
+ [LOGGING_WHAT] = gettext_noop("Reporting and Logging / What to Log"),
+ [PROCESS_TITLE] = gettext_noop("Reporting and Logging / Process Title"),
+ [STATS_MONITORING] = gettext_noop("Statistics / Monitoring"),
+ [STATS_CUMULATIVE] = gettext_noop("Statistics / Cumulative Query and Index Statistics"),
+ [AUTOVACUUM] = gettext_noop("Autovacuum"),
+ [CLIENT_CONN_STATEMENT] = gettext_noop("Client Connection Defaults / Statement Behavior"),
+ [CLIENT_CONN_LOCALE] = gettext_noop("Client Connection Defaults / Locale and Formatting"),
+ [CLIENT_CONN_PRELOAD] = gettext_noop("Client Connection Defaults / Shared Library Preloading"),
+ [CLIENT_CONN_OTHER] = gettext_noop("Client Connection Defaults / Other Defaults"),
+ [LOCK_MANAGEMENT] = gettext_noop("Lock Management"),
+ [COMPAT_OPTIONS_PREVIOUS] = gettext_noop("Version and Platform Compatibility / Previous PostgreSQL Versions"),
+ [COMPAT_OPTIONS_CLIENT] = gettext_noop("Version and Platform Compatibility / Other Platforms and Clients"),
+ [ERROR_HANDLING_OPTIONS] = gettext_noop("Error Handling"),
+ [PRESET_OPTIONS] = gettext_noop("Preset Options"),
+ [CUSTOM_OPTIONS] = gettext_noop("Customized Options"),
+ [DEVELOPER_OPTIONS] = gettext_noop("Developer Options"),
/* help_config wants this array to be null-terminated */
NULL
};
@@ -774,11 +729,11 @@ StaticAssertDecl(lengthof(config_group_names) == (DEVELOPER_OPTIONS + 2),
*/
const char *const config_type_names[] =
{
- /* PGC_BOOL */ "bool",
- /* PGC_INT */ "integer",
- /* PGC_REAL */ "real",
- /* PGC_STRING */ "string",
- /* PGC_ENUM */ "enum"
+ [PGC_BOOL] = "bool",
+ [PGC_INT] = "integer",
+ [PGC_REAL] = "real",
+ [PGC_STRING] = "string",
+ [PGC_ENUM] = "enum"
};
StaticAssertDecl(lengthof(config_type_names) == (PGC_ENUM + 1),
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 8ee8a42781a..4cb754caa55 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -104,53 +104,53 @@ enum dbObjectTypePriorities
/* This table is indexed by enum DumpableObjectType */
static const int dbObjectTypePriority[] =
{
- PRIO_NAMESPACE, /* DO_NAMESPACE */
- PRIO_EXTENSION, /* DO_EXTENSION */
- PRIO_TYPE, /* DO_TYPE */
- PRIO_TYPE, /* DO_SHELL_TYPE */
- PRIO_FUNC, /* DO_FUNC */
- PRIO_AGG, /* DO_AGG */
- PRIO_OPERATOR, /* DO_OPERATOR */
- PRIO_ACCESS_METHOD, /* DO_ACCESS_METHOD */
- PRIO_OPFAMILY, /* DO_OPCLASS */
- PRIO_OPFAMILY, /* DO_OPFAMILY */
- PRIO_COLLATION, /* DO_COLLATION */
- PRIO_CONVERSION, /* DO_CONVERSION */
- PRIO_TABLE, /* DO_TABLE */
- PRIO_TABLE_ATTACH, /* DO_TABLE_ATTACH */
- PRIO_ATTRDEF, /* DO_ATTRDEF */
- PRIO_INDEX, /* DO_INDEX */
- PRIO_INDEX_ATTACH, /* DO_INDEX_ATTACH */
- PRIO_STATSEXT, /* DO_STATSEXT */
- PRIO_RULE, /* DO_RULE */
- PRIO_TRIGGER, /* DO_TRIGGER */
- PRIO_CONSTRAINT, /* DO_CONSTRAINT */
- PRIO_FK_CONSTRAINT, /* DO_FK_CONSTRAINT */
- PRIO_PROCLANG, /* DO_PROCLANG */
- PRIO_CAST, /* DO_CAST */
- PRIO_TABLE_DATA, /* DO_TABLE_DATA */
- PRIO_SEQUENCE_SET, /* DO_SEQUENCE_SET */
- PRIO_DUMMY_TYPE, /* DO_DUMMY_TYPE */
- PRIO_TSPARSER, /* DO_TSPARSER */
- PRIO_TSDICT, /* DO_TSDICT */
- PRIO_TSTEMPLATE, /* DO_TSTEMPLATE */
- PRIO_TSCONFIG, /* DO_TSCONFIG */
- PRIO_FDW, /* DO_FDW */
- PRIO_FOREIGN_SERVER, /* DO_FOREIGN_SERVER */
- PRIO_DEFAULT_ACL, /* DO_DEFAULT_ACL */
- PRIO_TRANSFORM, /* DO_TRANSFORM */
- PRIO_LARGE_OBJECT, /* DO_LARGE_OBJECT */
- PRIO_LARGE_OBJECT_DATA, /* DO_LARGE_OBJECT_DATA */
- PRIO_PRE_DATA_BOUNDARY, /* DO_PRE_DATA_BOUNDARY */
- PRIO_POST_DATA_BOUNDARY, /* DO_POST_DATA_BOUNDARY */
- PRIO_EVENT_TRIGGER, /* DO_EVENT_TRIGGER */
- PRIO_REFRESH_MATVIEW, /* DO_REFRESH_MATVIEW */
- PRIO_POLICY, /* DO_POLICY */
- PRIO_PUBLICATION, /* DO_PUBLICATION */
- PRIO_PUBLICATION_REL, /* DO_PUBLICATION_REL */
- PRIO_PUBLICATION_TABLE_IN_SCHEMA, /* DO_PUBLICATION_TABLE_IN_SCHEMA */
- PRIO_SUBSCRIPTION, /* DO_SUBSCRIPTION */
- PRIO_SUBSCRIPTION_REL /* DO_SUBSCRIPTION_REL */
+ [DO_NAMESPACE] = PRIO_NAMESPACE,
+ [DO_EXTENSION] = PRIO_EXTENSION,
+ [DO_TYPE] = PRIO_TYPE,
+ [DO_SHELL_TYPE] = PRIO_TYPE,
+ [DO_FUNC] = PRIO_FUNC,
+ [DO_AGG] = PRIO_AGG,
+ [DO_OPERATOR] = PRIO_OPERATOR,
+ [DO_ACCESS_METHOD] = PRIO_ACCESS_METHOD,
+ [DO_OPCLASS] = PRIO_OPFAMILY,
+ [DO_OPFAMILY] = PRIO_OPFAMILY,
+ [DO_COLLATION] = PRIO_COLLATION,
+ [DO_CONVERSION] = PRIO_CONVERSION,
+ [DO_TABLE] = PRIO_TABLE,
+ [DO_TABLE_ATTACH] = PRIO_TABLE_ATTACH,
+ [DO_ATTRDEF] = PRIO_ATTRDEF,
+ [DO_INDEX] = PRIO_INDEX,
+ [DO_INDEX_ATTACH] = PRIO_INDEX_ATTACH,
+ [DO_STATSEXT] = PRIO_STATSEXT,
+ [DO_RULE] = PRIO_RULE,
+ [DO_TRIGGER] = PRIO_TRIGGER,
+ [DO_CONSTRAINT] = PRIO_CONSTRAINT,
+ [DO_FK_CONSTRAINT] = PRIO_FK_CONSTRAINT,
+ [DO_PROCLANG] = PRIO_PROCLANG,
+ [DO_CAST] = PRIO_CAST,
+ [DO_TABLE_DATA] = PRIO_TABLE_DATA,
+ [DO_SEQUENCE_SET] = PRIO_SEQUENCE_SET,
+ [DO_DUMMY_TYPE] = PRIO_DUMMY_TYPE,
+ [DO_TSPARSER] = PRIO_TSPARSER,
+ [DO_TSDICT] = PRIO_TSDICT,
+ [DO_TSTEMPLATE] = PRIO_TSTEMPLATE,
+ [DO_TSCONFIG] = PRIO_TSCONFIG,
+ [DO_FDW] = PRIO_FDW,
+ [DO_FOREIGN_SERVER] = PRIO_FOREIGN_SERVER,
+ [DO_DEFAULT_ACL] = PRIO_DEFAULT_ACL,
+ [DO_TRANSFORM] = PRIO_TRANSFORM,
+ [DO_LARGE_OBJECT] = PRIO_LARGE_OBJECT,
+ [DO_LARGE_OBJECT_DATA] = PRIO_LARGE_OBJECT_DATA,
+ [DO_PRE_DATA_BOUNDARY] = PRIO_PRE_DATA_BOUNDARY,
+ [DO_POST_DATA_BOUNDARY] = PRIO_POST_DATA_BOUNDARY,
+ [DO_EVENT_TRIGGER] = PRIO_EVENT_TRIGGER,
+ [DO_REFRESH_MATVIEW] = PRIO_REFRESH_MATVIEW,
+ [DO_POLICY] = PRIO_POLICY,
+ [DO_PUBLICATION] = PRIO_PUBLICATION,
+ [DO_PUBLICATION_REL] = PRIO_PUBLICATION_REL,
+ [DO_PUBLICATION_TABLE_IN_SCHEMA] = PRIO_PUBLICATION_TABLE_IN_SCHEMA,
+ [DO_SUBSCRIPTION] = PRIO_SUBSCRIPTION,
+ [DO_SUBSCRIPTION_REL] = PRIO_SUBSCRIPTION_REL,
};
StaticAssertDecl(lengthof(dbObjectTypePriority) == (DO_SUBSCRIPTION_REL + 1),
diff --git a/src/common/encnames.c b/src/common/encnames.c
index 710b747f6bd..bd012fe3a06 100644
--- a/src/common/encnames.c
+++ b/src/common/encnames.c
@@ -308,48 +308,48 @@ static const pg_encname pg_encname_tbl[] =
const pg_enc2name pg_enc2name_tbl[] =
{
- DEF_ENC2NAME(SQL_ASCII, 0),
- DEF_ENC2NAME(EUC_JP, 20932),
- DEF_ENC2NAME(EUC_CN, 20936),
- DEF_ENC2NAME(EUC_KR, 51949),
- DEF_ENC2NAME(EUC_TW, 0),
- DEF_ENC2NAME(EUC_JIS_2004, 20932),
- DEF_ENC2NAME(UTF8, 65001),
- DEF_ENC2NAME(MULE_INTERNAL, 0),
- DEF_ENC2NAME(LATIN1, 28591),
- DEF_ENC2NAME(LATIN2, 28592),
- DEF_ENC2NAME(LATIN3, 28593),
- DEF_ENC2NAME(LATIN4, 28594),
- DEF_ENC2NAME(LATIN5, 28599),
- DEF_ENC2NAME(LATIN6, 0),
- DEF_ENC2NAME(LATIN7, 0),
- DEF_ENC2NAME(LATIN8, 0),
- DEF_ENC2NAME(LATIN9, 28605),
- DEF_ENC2NAME(LATIN10, 0),
- DEF_ENC2NAME(WIN1256, 1256),
- DEF_ENC2NAME(WIN1258, 1258),
- DEF_ENC2NAME(WIN866, 866),
- DEF_ENC2NAME(WIN874, 874),
- DEF_ENC2NAME(KOI8R, 20866),
- DEF_ENC2NAME(WIN1251, 1251),
- DEF_ENC2NAME(WIN1252, 1252),
- DEF_ENC2NAME(ISO_8859_5, 28595),
- DEF_ENC2NAME(ISO_8859_6, 28596),
- DEF_ENC2NAME(ISO_8859_7, 28597),
- DEF_ENC2NAME(ISO_8859_8, 28598),
- DEF_ENC2NAME(WIN1250, 1250),
- DEF_ENC2NAME(WIN1253, 1253),
- DEF_ENC2NAME(WIN1254, 1254),
- DEF_ENC2NAME(WIN1255, 1255),
- DEF_ENC2NAME(WIN1257, 1257),
- DEF_ENC2NAME(KOI8U, 21866),
- DEF_ENC2NAME(SJIS, 932),
- DEF_ENC2NAME(BIG5, 950),
- DEF_ENC2NAME(GBK, 936),
- DEF_ENC2NAME(UHC, 949),
- DEF_ENC2NAME(GB18030, 54936),
- DEF_ENC2NAME(JOHAB, 0),
- DEF_ENC2NAME(SHIFT_JIS_2004, 932)
+ [PG_SQL_ASCII] = DEF_ENC2NAME(SQL_ASCII, 0),
+ [PG_EUC_JP] = DEF_ENC2NAME(EUC_JP, 20932),
+ [PG_EUC_CN] = DEF_ENC2NAME(EUC_CN, 20936),
+ [PG_EUC_KR] = DEF_ENC2NAME(EUC_KR, 51949),
+ [PG_EUC_TW] = DEF_ENC2NAME(EUC_TW, 0),
+ [PG_EUC_JIS_2004] = DEF_ENC2NAME(EUC_JIS_2004, 20932),
+ [PG_UTF8] = DEF_ENC2NAME(UTF8, 65001),
+ [PG_MULE_INTERNAL] = DEF_ENC2NAME(MULE_INTERNAL, 0),
+ [PG_LATIN1] = DEF_ENC2NAME(LATIN1, 28591),
+ [PG_LATIN2] = DEF_ENC2NAME(LATIN2, 28592),
+ [PG_LATIN3] = DEF_ENC2NAME(LATIN3, 28593),
+ [PG_LATIN4] = DEF_ENC2NAME(LATIN4, 28594),
+ [PG_LATIN5] = DEF_ENC2NAME(LATIN5, 28599),
+ [PG_LATIN6] = DEF_ENC2NAME(LATIN6, 0),
+ [PG_LATIN7] = DEF_ENC2NAME(LATIN7, 0),
+ [PG_LATIN8] = DEF_ENC2NAME(LATIN8, 0),
+ [PG_LATIN9] = DEF_ENC2NAME(LATIN9, 28605),
+ [PG_LATIN10] = DEF_ENC2NAME(LATIN10, 0),
+ [PG_WIN1256] = DEF_ENC2NAME(WIN1256, 1256),
+ [PG_WIN1258] = DEF_ENC2NAME(WIN1258, 1258),
+ [PG_WIN866] = DEF_ENC2NAME(WIN866, 866),
+ [PG_WIN874] = DEF_ENC2NAME(WIN874, 874),
+ [PG_KOI8R] = DEF_ENC2NAME(KOI8R, 20866),
+ [PG_WIN1251] = DEF_ENC2NAME(WIN1251, 1251),
+ [PG_WIN1252] = DEF_ENC2NAME(WIN1252, 1252),
+ [PG_ISO_8859_5] = DEF_ENC2NAME(ISO_8859_5, 28595),
+ [PG_ISO_8859_6] = DEF_ENC2NAME(ISO_8859_6, 28596),
+ [PG_ISO_8859_7] = DEF_ENC2NAME(ISO_8859_7, 28597),
+ [PG_ISO_8859_8] = DEF_ENC2NAME(ISO_8859_8, 28598),
+ [PG_WIN1250] = DEF_ENC2NAME(WIN1250, 1250),
+ [PG_WIN1253] = DEF_ENC2NAME(WIN1253, 1253),
+ [PG_WIN1254] = DEF_ENC2NAME(WIN1254, 1254),
+ [PG_WIN1255] = DEF_ENC2NAME(WIN1255, 1255),
+ [PG_WIN1257] = DEF_ENC2NAME(WIN1257, 1257),
+ [PG_KOI8U] = DEF_ENC2NAME(KOI8U, 21866),
+ [PG_SJIS] = DEF_ENC2NAME(SJIS, 932),
+ [PG_BIG5] = DEF_ENC2NAME(BIG5, 950),
+ [PG_GBK] = DEF_ENC2NAME(GBK, 936),
+ [PG_UHC] = DEF_ENC2NAME(UHC, 949),
+ [PG_GB18030] = DEF_ENC2NAME(GB18030, 54936),
+ [PG_JOHAB] = DEF_ENC2NAME(JOHAB, 0),
+ [PG_SHIFT_JIS_2004] = DEF_ENC2NAME(SHIFT_JIS_2004, 932),
};
/* ----------
@@ -414,41 +414,41 @@ const pg_enc2gettext pg_enc2gettext_tbl[] =
*/
static const char *const pg_enc2icu_tbl[] =
{
- NULL, /* PG_SQL_ASCII */
- "EUC-JP", /* PG_EUC_JP */
- "EUC-CN", /* PG_EUC_CN */
- "EUC-KR", /* PG_EUC_KR */
- "EUC-TW", /* PG_EUC_TW */
- NULL, /* PG_EUC_JIS_2004 */
- "UTF-8", /* PG_UTF8 */
- NULL, /* PG_MULE_INTERNAL */
- "ISO-8859-1", /* PG_LATIN1 */
- "ISO-8859-2", /* PG_LATIN2 */
- "ISO-8859-3", /* PG_LATIN3 */
- "ISO-8859-4", /* PG_LATIN4 */
- "ISO-8859-9", /* PG_LATIN5 */
- "ISO-8859-10", /* PG_LATIN6 */
- "ISO-8859-13", /* PG_LATIN7 */
- "ISO-8859-14", /* PG_LATIN8 */
- "ISO-8859-15", /* PG_LATIN9 */
- NULL, /* PG_LATIN10 */
- "CP1256", /* PG_WIN1256 */
- "CP1258", /* PG_WIN1258 */
- "CP866", /* PG_WIN866 */
- NULL, /* PG_WIN874 */
- "KOI8-R", /* PG_KOI8R */
- "CP1251", /* PG_WIN1251 */
- "CP1252", /* PG_WIN1252 */
- "ISO-8859-5", /* PG_ISO_8859_5 */
- "ISO-8859-6", /* PG_ISO_8859_6 */
- "ISO-8859-7", /* PG_ISO_8859_7 */
- "ISO-8859-8", /* PG_ISO_8859_8 */
- "CP1250", /* PG_WIN1250 */
- "CP1253", /* PG_WIN1253 */
- "CP1254", /* PG_WIN1254 */
- "CP1255", /* PG_WIN1255 */
- "CP1257", /* PG_WIN1257 */
- "KOI8-U", /* PG_KOI8U */
+ [PG_SQL_ASCII] = NULL,
+ [PG_EUC_JP] = "EUC-JP",
+ [PG_EUC_CN] = "EUC-CN",
+ [PG_EUC_KR] = "EUC-KR",
+ [PG_EUC_TW] = "EUC-TW",
+ [PG_EUC_JIS_2004] = NULL,
+ [PG_UTF8] = "UTF-8",
+ [PG_MULE_INTERNAL] = NULL,
+ [PG_LATIN1] = "ISO-8859-1",
+ [PG_LATIN2] = "ISO-8859-2",
+ [PG_LATIN3] = "ISO-8859-3",
+ [PG_LATIN4] = "ISO-8859-4",
+ [PG_LATIN5] = "ISO-8859-9",
+ [PG_LATIN6] = "ISO-8859-10",
+ [PG_LATIN7] = "ISO-8859-13",
+ [PG_LATIN8] = "ISO-8859-14",
+ [PG_LATIN9] = "ISO-8859-15",
+ [PG_LATIN10] = NULL,
+ [PG_WIN1256] = "CP1256",
+ [PG_WIN1258] = "CP1258",
+ [PG_WIN866] = "CP866",
+ [PG_WIN874] = NULL,
+ [PG_KOI8R] = "KOI8-R",
+ [PG_WIN1251] = "CP1251",
+ [PG_WIN1252] = "CP1252",
+ [PG_ISO_8859_5] = "ISO-8859-5",
+ [PG_ISO_8859_6] = "ISO-8859-6",
+ [PG_ISO_8859_7] = "ISO-8859-7",
+ [PG_ISO_8859_8] = "ISO-8859-8",
+ [PG_WIN1250] = "CP1250",
+ [PG_WIN1253] = "CP1253",
+ [PG_WIN1254] = "CP1254",
+ [PG_WIN1255] = "CP1255",
+ [PG_WIN1257] = "CP1257",
+ [PG_KOI8U] = "KOI8-U",
};
StaticAssertDecl(lengthof(pg_enc2icu_tbl) == PG_ENCODING_BE_LAST + 1,
diff --git a/src/common/relpath.c b/src/common/relpath.c
index b16fe19dea6..d9214f915c9 100644
--- a/src/common/relpath.c
+++ b/src/common/relpath.c
@@ -31,10 +31,10 @@
* pg_relation_size().
*/
const char *const forkNames[] = {
- "main", /* MAIN_FORKNUM */
- "fsm", /* FSM_FORKNUM */
- "vm", /* VISIBILITYMAP_FORKNUM */
- "init" /* INIT_FORKNUM */
+ [MAIN_FORKNUM] = "main",
+ [FSM_FORKNUM] = "fsm",
+ [VISIBILITYMAP_FORKNUM] = "vm",
+ [INIT_FORKNUM] = "init",
};
StaticAssertDecl(lengthof(forkNames) == (MAX_FORKNUM + 1),
diff --git a/src/common/wchar.c b/src/common/wchar.c
index 7c5ce5ca081..7e7a7507d5c 100644
--- a/src/common/wchar.c
+++ b/src/common/wchar.c
@@ -2071,52 +2071,51 @@ pg_utf8_islegal(const unsigned char *source, int length)
/*
*-------------------------------------------------------------------
* encoding info table
- * XXX must be sorted by the same order as enum pg_enc (in mb/pg_wchar.h)
*-------------------------------------------------------------------
*/
const pg_wchar_tbl pg_wchar_table[] = {
- {pg_ascii2wchar_with_len, pg_wchar2single_with_len, pg_ascii_mblen, pg_ascii_dsplen, pg_ascii_verifychar, pg_ascii_verifystr, 1}, /* PG_SQL_ASCII */
- {pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifychar, pg_eucjp_verifystr, 3}, /* PG_EUC_JP */
- {pg_euccn2wchar_with_len, pg_wchar2euc_with_len, pg_euccn_mblen, pg_euccn_dsplen, pg_euccn_verifychar, pg_euccn_verifystr, 2}, /* PG_EUC_CN */
- {pg_euckr2wchar_with_len, pg_wchar2euc_with_len, pg_euckr_mblen, pg_euckr_dsplen, pg_euckr_verifychar, pg_euckr_verifystr, 3}, /* PG_EUC_KR */
- {pg_euctw2wchar_with_len, pg_wchar2euc_with_len, pg_euctw_mblen, pg_euctw_dsplen, pg_euctw_verifychar, pg_euctw_verifystr, 4}, /* PG_EUC_TW */
- {pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifychar, pg_eucjp_verifystr, 3}, /* PG_EUC_JIS_2004 */
- {pg_utf2wchar_with_len, pg_wchar2utf_with_len, pg_utf_mblen, pg_utf_dsplen, pg_utf8_verifychar, pg_utf8_verifystr, 4}, /* PG_UTF8 */
- {pg_mule2wchar_with_len, pg_wchar2mule_with_len, pg_mule_mblen, pg_mule_dsplen, pg_mule_verifychar, pg_mule_verifystr, 4}, /* PG_MULE_INTERNAL */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN1 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN2 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN3 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN4 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN5 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN6 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN7 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN8 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN9 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_LATIN10 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1256 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1258 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN866 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN874 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_KOI8R */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1251 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1252 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* ISO-8859-5 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* ISO-8859-6 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* ISO-8859-7 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* ISO-8859-8 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1250 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1253 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1254 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1255 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_WIN1257 */
- {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1}, /* PG_KOI8U */
- {0, 0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifychar, pg_sjis_verifystr, 2}, /* PG_SJIS */
- {0, 0, pg_big5_mblen, pg_big5_dsplen, pg_big5_verifychar, pg_big5_verifystr, 2}, /* PG_BIG5 */
- {0, 0, pg_gbk_mblen, pg_gbk_dsplen, pg_gbk_verifychar, pg_gbk_verifystr, 2}, /* PG_GBK */
- {0, 0, pg_uhc_mblen, pg_uhc_dsplen, pg_uhc_verifychar, pg_uhc_verifystr, 2}, /* PG_UHC */
- {0, 0, pg_gb18030_mblen, pg_gb18030_dsplen, pg_gb18030_verifychar, pg_gb18030_verifystr, 4}, /* PG_GB18030 */
- {0, 0, pg_johab_mblen, pg_johab_dsplen, pg_johab_verifychar, pg_johab_verifystr, 3}, /* PG_JOHAB */
- {0, 0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifychar, pg_sjis_verifystr, 2} /* PG_SHIFT_JIS_2004 */
+ [PG_SQL_ASCII] = {pg_ascii2wchar_with_len, pg_wchar2single_with_len, pg_ascii_mblen, pg_ascii_dsplen, pg_ascii_verifychar, pg_ascii_verifystr, 1},
+ [PG_EUC_JP] = {pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifychar, pg_eucjp_verifystr, 3},
+ [PG_EUC_CN] = {pg_euccn2wchar_with_len, pg_wchar2euc_with_len, pg_euccn_mblen, pg_euccn_dsplen, pg_euccn_verifychar, pg_euccn_verifystr, 2},
+ [PG_EUC_KR] = {pg_euckr2wchar_with_len, pg_wchar2euc_with_len, pg_euckr_mblen, pg_euckr_dsplen, pg_euckr_verifychar, pg_euckr_verifystr, 3},
+ [PG_EUC_TW] = {pg_euctw2wchar_with_len, pg_wchar2euc_with_len, pg_euctw_mblen, pg_euctw_dsplen, pg_euctw_verifychar, pg_euctw_verifystr, 4},
+ [PG_EUC_JIS_2004] = {pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifychar, pg_eucjp_verifystr, 3},
+ [PG_UTF8] = {pg_utf2wchar_with_len, pg_wchar2utf_with_len, pg_utf_mblen, pg_utf_dsplen, pg_utf8_verifychar, pg_utf8_verifystr, 4},
+ [PG_MULE_INTERNAL] = {pg_mule2wchar_with_len, pg_wchar2mule_with_len, pg_mule_mblen, pg_mule_dsplen, pg_mule_verifychar, pg_mule_verifystr, 4},
+ [PG_LATIN1] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN2] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN3] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN4] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN5] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN6] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN7] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN8] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN9] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_LATIN10] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1256] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1258] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN866] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN874] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_KOI8R] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1251] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1252] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_ISO_8859_5] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_ISO_8859_6] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_ISO_8859_7] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_ISO_8859_8] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1250] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1253] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1254] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1255] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_WIN1257] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_KOI8U] = {pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifychar, pg_latin1_verifystr, 1},
+ [PG_SJIS] = {0, 0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifychar, pg_sjis_verifystr, 2},
+ [PG_BIG5] = {0, 0, pg_big5_mblen, pg_big5_dsplen, pg_big5_verifychar, pg_big5_verifystr, 2},
+ [PG_GBK] = {0, 0, pg_gbk_mblen, pg_gbk_dsplen, pg_gbk_verifychar, pg_gbk_verifystr, 2},
+ [PG_UHC] = {0, 0, pg_uhc_mblen, pg_uhc_dsplen, pg_uhc_verifychar, pg_uhc_verifystr, 2},
+ [PG_GB18030] = {0, 0, pg_gb18030_mblen, pg_gb18030_dsplen, pg_gb18030_verifychar, pg_gb18030_verifystr, 4},
+ [PG_JOHAB] = {0, 0, pg_johab_mblen, pg_johab_dsplen, pg_johab_verifychar, pg_johab_verifystr, 3},
+ [PG_SHIFT_JIS_2004] = {0, 0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifychar, pg_sjis_verifystr, 2},
};
/*
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index 1d521bea24a..9248daab3af 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -224,11 +224,7 @@ typedef unsigned int pg_wchar;
/*
* PostgreSQL encoding identifiers
*
- * WARNING: the order of this enum must be same as order of entries
- * in the pg_enc2name_tbl[] array (in src/common/encnames.c), and
- * in the pg_wchar_table[] array (in src/common/wchar.c)!
- *
- * If you add some encoding don't forget to check
+ * WARNING: If you add some encoding don't forget to check
* PG_ENCODING_BE_LAST macro.
*
* PG_SQL_ASCII is default encoding and must be = 0.
base-commit: 92d2ab7554f92b841ea71bcc72eaa8ab11aae662
--
2.34.1
From 1cf70a773ec87798021698289f52c02614bf31c2 Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <jelte.fenn...@microsoft.com>
Date: Tue, 27 Feb 2024 12:26:10 +0100
Subject: [PATCH v3 3/3] Simplify pg_enc2gettext_tbl
Use designated initialization of pg_enc2gettext_tbl to simplify the
implementation of raw_pg_bind_textdomain_codeset. Now iteration over the
array is not needed anymore. Instead the desired element can simply be
fetched by its index.
---
src/backend/utils/mb/mbutils.c | 24 ++++------
src/common/encnames.c | 85 +++++++++++++++++-----------------
src/include/mb/pg_wchar.h | 8 +---
3 files changed, 53 insertions(+), 64 deletions(-)
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index c13f947a827..8948995e9ff 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -1188,24 +1188,20 @@ static bool
raw_pg_bind_textdomain_codeset(const char *domainname, int encoding)
{
bool elog_ok = (CurrentMemoryContext != NULL);
- int i;
- for (i = 0; pg_enc2gettext_tbl[i].name != NULL; i++)
+ if (pg_enc2gettext_tbl[encoding] == NULL)
{
- if (pg_enc2gettext_tbl[i].encoding == encoding)
- {
- if (bind_textdomain_codeset(domainname,
- pg_enc2gettext_tbl[i].name) != NULL)
- return true;
+ return false;
+ }
- if (elog_ok)
- elog(LOG, "bind_textdomain_codeset failed");
- else
- write_stderr("bind_textdomain_codeset failed");
+ if (bind_textdomain_codeset(domainname,
+ pg_enc2gettext_tbl[encoding]) != NULL)
+ return true;
- break;
- }
- }
+ if (elog_ok)
+ elog(LOG, "bind_textdomain_codeset failed");
+ else
+ write_stderr("bind_textdomain_codeset failed");
return false;
}
diff --git a/src/common/encnames.c b/src/common/encnames.c
index bd012fe3a06..ba344da915c 100644
--- a/src/common/encnames.c
+++ b/src/common/encnames.c
@@ -358,50 +358,49 @@ const pg_enc2name pg_enc2name_tbl[] =
* This covers all encodings except MULE_INTERNAL, which is alien to gettext.
* ----------
*/
-const pg_enc2gettext pg_enc2gettext_tbl[] =
+const char *pg_enc2gettext_tbl[] =
{
- {PG_SQL_ASCII, "US-ASCII"},
- {PG_UTF8, "UTF-8"},
- {PG_LATIN1, "LATIN1"},
- {PG_LATIN2, "LATIN2"},
- {PG_LATIN3, "LATIN3"},
- {PG_LATIN4, "LATIN4"},
- {PG_ISO_8859_5, "ISO-8859-5"},
- {PG_ISO_8859_6, "ISO_8859-6"},
- {PG_ISO_8859_7, "ISO-8859-7"},
- {PG_ISO_8859_8, "ISO-8859-8"},
- {PG_LATIN5, "LATIN5"},
- {PG_LATIN6, "LATIN6"},
- {PG_LATIN7, "LATIN7"},
- {PG_LATIN8, "LATIN8"},
- {PG_LATIN9, "LATIN-9"},
- {PG_LATIN10, "LATIN10"},
- {PG_KOI8R, "KOI8-R"},
- {PG_KOI8U, "KOI8-U"},
- {PG_WIN1250, "CP1250"},
- {PG_WIN1251, "CP1251"},
- {PG_WIN1252, "CP1252"},
- {PG_WIN1253, "CP1253"},
- {PG_WIN1254, "CP1254"},
- {PG_WIN1255, "CP1255"},
- {PG_WIN1256, "CP1256"},
- {PG_WIN1257, "CP1257"},
- {PG_WIN1258, "CP1258"},
- {PG_WIN866, "CP866"},
- {PG_WIN874, "CP874"},
- {PG_EUC_CN, "EUC-CN"},
- {PG_EUC_JP, "EUC-JP"},
- {PG_EUC_KR, "EUC-KR"},
- {PG_EUC_TW, "EUC-TW"},
- {PG_EUC_JIS_2004, "EUC-JP"},
- {PG_SJIS, "SHIFT-JIS"},
- {PG_BIG5, "BIG5"},
- {PG_GBK, "GBK"},
- {PG_UHC, "UHC"},
- {PG_GB18030, "GB18030"},
- {PG_JOHAB, "JOHAB"},
- {PG_SHIFT_JIS_2004, "SHIFT_JISX0213"},
- {0, NULL}
+ [PG_SQL_ASCII] = "US-ASCII",
+ [PG_UTF8] = "UTF-8",
+ [PG_LATIN1] = "LATIN1",
+ [PG_LATIN2] = "LATIN2",
+ [PG_LATIN3] = "LATIN3",
+ [PG_LATIN4] = "LATIN4",
+ [PG_ISO_8859_5] = "ISO-8859-5",
+ [PG_ISO_8859_6] = "ISO_8859-6",
+ [PG_ISO_8859_7] = "ISO-8859-7",
+ [PG_ISO_8859_8] = "ISO-8859-8",
+ [PG_LATIN5] = "LATIN5",
+ [PG_LATIN6] = "LATIN6",
+ [PG_LATIN7] = "LATIN7",
+ [PG_LATIN8] = "LATIN8",
+ [PG_LATIN9] = "LATIN-9",
+ [PG_LATIN10] = "LATIN10",
+ [PG_KOI8R] = "KOI8-R",
+ [PG_KOI8U] = "KOI8-U",
+ [PG_WIN1250] = "CP1250",
+ [PG_WIN1251] = "CP1251",
+ [PG_WIN1252] = "CP1252",
+ [PG_WIN1253] = "CP1253",
+ [PG_WIN1254] = "CP1254",
+ [PG_WIN1255] = "CP1255",
+ [PG_WIN1256] = "CP1256",
+ [PG_WIN1257] = "CP1257",
+ [PG_WIN1258] = "CP1258",
+ [PG_WIN866] = "CP866",
+ [PG_WIN874] = "CP874",
+ [PG_EUC_CN] = "EUC-CN",
+ [PG_EUC_JP] = "EUC-JP",
+ [PG_EUC_KR] = "EUC-KR",
+ [PG_EUC_TW] = "EUC-TW",
+ [PG_EUC_JIS_2004] = "EUC-JP",
+ [PG_SJIS] = "SHIFT-JIS",
+ [PG_BIG5] = "BIG5",
+ [PG_GBK] = "GBK",
+ [PG_UHC] = "UHC",
+ [PG_GB18030] = "GB18030",
+ [PG_JOHAB] = "JOHAB",
+ [PG_SHIFT_JIS_2004] = "SHIFT_JISX0213",
};
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index 9248daab3af..0a7ab811da1 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -363,13 +363,7 @@ extern PGDLLIMPORT const pg_enc2name pg_enc2name_tbl[];
/*
* Encoding names for gettext
*/
-typedef struct pg_enc2gettext
-{
- pg_enc encoding;
- const char *name;
-} pg_enc2gettext;
-
-extern PGDLLIMPORT const pg_enc2gettext pg_enc2gettext_tbl[];
+extern PGDLLIMPORT const char *pg_enc2gettext_tbl[];
/*
* pg_wchar stuff
--
2.34.1
