From abaa5fa56717fe3cfc61d61b5b0160fd4b83c606 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 11 Nov 2025 13:40:24 +0900 Subject: [PATCH v10 2/9] Make pg_dependencies a proper adt. Move the in/out/send/recv functions for pg_dependencies to pg_dependencies.c, which allows dependencies.c to focus on the transformation from sample data to the internal MVDependencies structure. This will make a couple of future improvements related to the input and output format of these functions more isolated. --- src/backend/statistics/dependencies.c | 91 --------------------- src/backend/utils/adt/Makefile | 1 + src/backend/utils/adt/meson.build | 1 + src/backend/utils/adt/pg_dependencies.c | 104 ++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 91 deletions(-) create mode 100644 src/backend/utils/adt/pg_dependencies.c diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c index eb2fc4366b4a..6f63b4f3ffbf 100644 --- a/src/backend/statistics/dependencies.c +++ b/src/backend/statistics/dependencies.c @@ -16,23 +16,17 @@ #include "access/htup_details.h" #include "catalog/pg_statistic_ext.h" #include "catalog/pg_statistic_ext_data.h" -#include "lib/stringinfo.h" #include "nodes/nodeFuncs.h" -#include "nodes/nodes.h" -#include "nodes/pathnodes.h" #include "optimizer/clauses.h" #include "optimizer/optimizer.h" #include "parser/parsetree.h" #include "statistics/extended_stats_internal.h" -#include "statistics/statistics.h" #include "utils/fmgroids.h" -#include "utils/fmgrprotos.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/selfuncs.h" #include "utils/syscache.h" #include "utils/typcache.h" -#include "varatt.h" /* size of the struct header fields (magic, type, ndeps) */ #define SizeOfHeader (3 * sizeof(uint32)) @@ -643,91 +637,6 @@ statext_dependencies_load(Oid mvoid, bool inh) return result; } -/* - * pg_dependencies_in - input routine for type pg_dependencies. - * - * pg_dependencies is real enough to be a table column, but it has no operations - * of its own, and disallows input too - */ -Datum -pg_dependencies_in(PG_FUNCTION_ARGS) -{ - /* - * pg_node_list stores the data in binary form and parsing text input is - * not needed, so disallow this. - */ - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot accept a value of type %s", "pg_dependencies"))); - - PG_RETURN_VOID(); /* keep compiler quiet */ -} - -/* - * pg_dependencies - output routine for type pg_dependencies. - */ -Datum -pg_dependencies_out(PG_FUNCTION_ARGS) -{ - bytea *data = PG_GETARG_BYTEA_PP(0); - MVDependencies *dependencies = statext_dependencies_deserialize(data); - int i, - j; - StringInfoData str; - - initStringInfo(&str); - appendStringInfoChar(&str, '{'); - - for (i = 0; i < dependencies->ndeps; i++) - { - MVDependency *dependency = dependencies->deps[i]; - - if (i > 0) - appendStringInfoString(&str, ", "); - - appendStringInfoChar(&str, '"'); - for (j = 0; j < dependency->nattributes; j++) - { - if (j == dependency->nattributes - 1) - appendStringInfoString(&str, " => "); - else if (j > 0) - appendStringInfoString(&str, ", "); - - appendStringInfo(&str, "%d", dependency->attributes[j]); - } - appendStringInfo(&str, "\": %f", dependency->degree); - } - - appendStringInfoChar(&str, '}'); - - PG_RETURN_CSTRING(str.data); -} - -/* - * pg_dependencies_recv - binary input routine for type pg_dependencies. - */ -Datum -pg_dependencies_recv(PG_FUNCTION_ARGS) -{ - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot accept a value of type %s", "pg_dependencies"))); - - PG_RETURN_VOID(); /* keep compiler quiet */ -} - -/* - * pg_dependencies_send - binary output routine for type pg_dependencies. - * - * Functional dependencies are serialized in a bytea value (although the type - * is named differently), so let's just send that. - */ -Datum -pg_dependencies_send(PG_FUNCTION_ARGS) -{ - return byteasend(fcinfo); -} - /* * dependency_is_compatible_clause * Determines if the clause is compatible with functional dependencies diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 70ff8e455169..ba40ada11caf 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -80,6 +80,7 @@ OBJS = \ oracle_compat.o \ orderedsetaggs.o \ partitionfuncs.o \ + pg_dependencies.o \ pg_locale.o \ pg_locale_builtin.o \ pg_locale_icu.o \ diff --git a/src/backend/utils/adt/meson.build b/src/backend/utils/adt/meson.build index b6b642c77a04..9c4c62d41da1 100644 --- a/src/backend/utils/adt/meson.build +++ b/src/backend/utils/adt/meson.build @@ -76,6 +76,7 @@ backend_sources += files( 'oracle_compat.c', 'orderedsetaggs.c', 'partitionfuncs.c', + 'pg_dependencies.c', 'pg_locale.c', 'pg_locale_builtin.c', 'pg_locale_icu.c', diff --git a/src/backend/utils/adt/pg_dependencies.c b/src/backend/utils/adt/pg_dependencies.c new file mode 100644 index 000000000000..a4f7c48683f5 --- /dev/null +++ b/src/backend/utils/adt/pg_dependencies.c @@ -0,0 +1,104 @@ +/*------------------------------------------------------------------------- + * + * pg_dependencies.c + * pg_dependencies data type support. + * + * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * IDENTIFICATION + * src/backend/utils/adt/pg_dependencies.c + * + *------------------------------------------------------------------------- + */ + +#include "postgres.h" + +#include "lib/stringinfo.h" +#include "statistics/extended_stats_internal.h" +#include "utils/fmgrprotos.h" + +/* + * pg_dependencies_in - input routine for type pg_dependencies. + * + * pg_dependencies is real enough to be a table column, but it has no operations + * of its own, and disallows input too + */ +Datum +pg_dependencies_in(PG_FUNCTION_ARGS) +{ + /* + * pg_node_list stores the data in binary form and parsing text input is + * not needed, so disallow this. + */ + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot accept a value of type %s", "pg_dependencies"))); + + PG_RETURN_VOID(); /* keep compiler quiet */ +} + +/* + * pg_dependencies - output routine for type pg_dependencies. + */ +Datum +pg_dependencies_out(PG_FUNCTION_ARGS) +{ + bytea *data = PG_GETARG_BYTEA_PP(0); + MVDependencies *dependencies = statext_dependencies_deserialize(data); + int i, + j; + StringInfoData str; + + initStringInfo(&str); + appendStringInfoChar(&str, '{'); + + for (i = 0; i < dependencies->ndeps; i++) + { + MVDependency *dependency = dependencies->deps[i]; + + if (i > 0) + appendStringInfoString(&str, ", "); + + appendStringInfoChar(&str, '"'); + for (j = 0; j < dependency->nattributes; j++) + { + if (j == dependency->nattributes - 1) + appendStringInfoString(&str, " => "); + else if (j > 0) + appendStringInfoString(&str, ", "); + + appendStringInfo(&str, "%d", dependency->attributes[j]); + } + appendStringInfo(&str, "\": %f", dependency->degree); + } + + appendStringInfoChar(&str, '}'); + + PG_RETURN_CSTRING(str.data); +} + +/* + * pg_dependencies_recv - binary input routine for type pg_dependencies. + */ +Datum +pg_dependencies_recv(PG_FUNCTION_ARGS) +{ + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot accept a value of type %s", "pg_dependencies"))); + + PG_RETURN_VOID(); /* keep compiler quiet */ +} + +/* + * pg_dependencies_send - binary output routine for type pg_dependencies. + * + * Functional dependencies are serialized in a bytea value (although the type + * is named differently), so let's just send that. + */ +Datum +pg_dependencies_send(PG_FUNCTION_ARGS) +{ + return byteasend(fcinfo); +} -- 2.51.0