>From ce2beeba56b96af4f9289be53646f83e807637dc Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Thu, 6 Aug 2015 16:49:04 +0900 Subject: [PATCH 1/6] New system catalog pg_mvcoefficient. --- src/backend/catalog/Makefile | 3 +- src/backend/utils/cache/syscache.c | 12 +++++ src/include/catalog/indexing.h | 3 ++ src/include/catalog/pg_mvcoefficient.h | 74 ++++++++++++++++++++++++++++++ src/include/utils/syscache.h | 1 + src/test/regress/expected/sanity_check.out | 1 + 6 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 src/include/catalog/pg_mvcoefficient.h diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 25130ec..4ce1653 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -33,7 +33,8 @@ POSTGRES_BKI_SRCS = $(addprefix $(top_srcdir)/src/include/catalog/,\ pg_opfamily.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \ pg_language.h pg_largeobject_metadata.h pg_largeobject.h pg_aggregate.h \ pg_statistic.h pg_rewrite.h pg_trigger.h pg_event_trigger.h pg_description.h \ - pg_cast.h pg_enum.h pg_namespace.h pg_conversion.h pg_depend.h \ + pg_cast.h pg_enum.h pg_mvcoefficient.h pg_namespace.h pg_conversion.h \ + pg_depend.h \ pg_database.h pg_db_role_setting.h pg_tablespace.h pg_pltemplate.h \ pg_authid.h pg_auth_members.h pg_shdepend.h pg_shdescription.h \ pg_ts_config.h pg_ts_config_map.h pg_ts_dict.h \ diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index efce7b9..a895405 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -43,6 +43,7 @@ #include "catalog/pg_foreign_server.h" #include "catalog/pg_foreign_table.h" #include "catalog/pg_language.h" +#include "catalog/pg_mvcoefficient.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" @@ -501,6 +502,17 @@ static const struct cachedesc cacheinfo[] = { }, 4 }, + {MvCoefficientRelationId, /* MVCOEFFICIENT */ + MvCoefficientIndexId, + 1, + { + Anum_pg_mvcoefficient_mvcreloid, + 0, + 0, + 0 + }, + 4 + }, {NamespaceRelationId, /* NAMESPACENAME */ NamespaceNameIndexId, 1, diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index c38958d..fb28747 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -173,6 +173,9 @@ DECLARE_UNIQUE_INDEX(pg_largeobject_loid_pn_index, 2683, on pg_largeobject using DECLARE_UNIQUE_INDEX(pg_largeobject_metadata_oid_index, 2996, on pg_largeobject_metadata using btree(oid oid_ops)); #define LargeObjectMetadataOidIndexId 2996 +DECLARE_UNIQUE_INDEX(pg_mvcoefficient_index, 3578, on pg_mvcoefficient using btree(mvcreloid oid_ops)); +#define MvCoefficientIndexId 3578 + DECLARE_UNIQUE_INDEX(pg_namespace_nspname_index, 2684, on pg_namespace using btree(nspname name_ops)); #define NamespaceNameIndexId 2684 DECLARE_UNIQUE_INDEX(pg_namespace_oid_index, 2685, on pg_namespace using btree(oid oid_ops)); diff --git a/src/include/catalog/pg_mvcoefficient.h b/src/include/catalog/pg_mvcoefficient.h new file mode 100644 index 0000000..5936070 --- /dev/null +++ b/src/include/catalog/pg_mvcoefficient.h @@ -0,0 +1,74 @@ +/*------------------------------------------------------------------------- + * + * pg_mvcoefficient.h + * definition of the system multivariate coefficient relation + * (pg_mvcoefficient) along with the relation's initial contents. + * + * Copyright (c) 2015, PostgreSQL Global Development Group + * + * src/include/catalog/pg_mvcoefficient.h + * + * NOTES + * the genbki.pl script reads this file and generates .bki + * information from the DATA() statements. + * + * XXX do NOT break up DATA() statements into multiple lines! + * the scripts are not as smart as you might think... + * + *------------------------------------------------------------------------- + */ +#ifndef PG_MVCOEFFICIENT_H +#define PG_MVCOEFFICIENT_H + +#include "catalog/genbki.h" +#include "nodes/pg_list.h" + +/* ---------------- + * pg_mvcoefficient definition. cpp turns this into + * typedef struct FormData_pg_mvcoefficient + * ---------------- + */ +#define MvCoefficientRelationId 3577 + +/* This values is arbitrary number, but 6 seems already too much. */ +#define MVCOEF_MAX_COLS 6 + +CATALOG(pg_mvcoefficient,3577) BKI_WITHOUT_OIDS +{ + Oid mvcreloid; /* OID of target relation */ + int16 mvcnattrs; /* number of mv columns */ + float8 mvccoefficient; /* multivariate distinctness coefficient */ + + /* + * variable-length fields start here, but we allow direct access to + * mvcattrs. + */ + int2vector mvcattrs; /* Column numbers */ +} FormData_pg_mvcoefficient; + +/* ---------------- + * Form_pg_mvcoefficient corresponds to a pointer to a tuple with the + * format of pg_mvcoefficient relation. + * ---------------- + */ +typedef FormData_pg_mvcoefficient *Form_pg_mvcoefficient; + +/* ---------------- + * compiler constants for pg_mvcoefficient + * ---------------- +< */ +#define Natts_pg_mvcoefficient 4 +#define Anum_pg_mvcoefficient_mvcreloid 1 +#define Anum_pg_mvcoefficient_mvcnattrs 2 +#define Anum_pg_mvcoefficient_mvccoefficient 3 +#define Anum_pg_mvcoefficient_mvcattrs 4 + +/* ---------------- + * pg_mvcoefficient has no initial contents + * ---------------- + */ + +/* + * prototypes for functions in pg_enum.c + */ +#endif /* PG_MVCOEFFICIENT_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index 18404e2..1f48d61 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -66,6 +66,7 @@ enum SysCacheIdentifier INDEXRELID, LANGNAME, LANGOID, + MVCOEFFICIENT, NAMESPACENAME, NAMESPACEOID, OPERNAMENSP, diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out index eb0bc88..7c77796 100644 --- a/src/test/regress/expected/sanity_check.out +++ b/src/test/regress/expected/sanity_check.out @@ -113,6 +113,7 @@ pg_inherits|t pg_language|t pg_largeobject|t pg_largeobject_metadata|t +pg_mvcoefficient|t pg_namespace|t pg_opclass|t pg_operator|t -- 1.8.3.1