From 1511521a36f99a242f51c3bd0811cfcd53c5e63a Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 2 Dec 2014 14:07:54 -0500 Subject: [PATCH] Minor cleanup of function declarations for BRIN. Get rid of PG_FUNCTION_INFO_V1() macros, which are quite inappropriate for built-in functions (possibly leftovers from testing as a loadable module?). Also, fix gratuitous inconsistency between SQL-level and C-level names of the minmax support functions. --- src/backend/access/brin/brin.c | 2 -- src/backend/access/brin/brin_minmax.c | 21 ++++++++------------- src/include/access/brin_internal.h | 7 +++++++ src/include/catalog/catversion.h | 2 +- src/include/catalog/pg_proc.h | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index cb645e3d45..15d1f9d2b6 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -60,8 +60,6 @@ typedef struct BrinOpaque BrinDesc *bo_bdesc; } BrinOpaque; -PG_FUNCTION_INFO_V1(brin_summarize_new_values); - static BrinBuildState *initialize_brin_buildstate(Relation idxRel, BrinRevmap *revmap, BlockNumber pagesPerRange); static void terminate_brin_buildstate(BrinBuildState *state); diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c index 3a2bee2649..009f199a6b 100644 --- a/src/backend/access/brin/brin_minmax.c +++ b/src/backend/access/brin/brin_minmax.c @@ -36,23 +36,18 @@ */ #define PROCNUM_BASE 11 -static FmgrInfo *minmax_get_procinfo(BrinDesc *bdesc, uint16 attno, - uint16 procnum); - -PG_FUNCTION_INFO_V1(minmaxOpcInfo); -PG_FUNCTION_INFO_V1(minmaxAddValue); -PG_FUNCTION_INFO_V1(minmaxConsistent); -PG_FUNCTION_INFO_V1(minmaxUnion); - - typedef struct MinmaxOpaque { FmgrInfo operators[MINMAX_NUM_PROCNUMS]; bool inited[MINMAX_NUM_PROCNUMS]; } MinmaxOpaque; +static FmgrInfo *minmax_get_procinfo(BrinDesc *bdesc, uint16 attno, + uint16 procnum); + + Datum -minmaxOpcInfo(PG_FUNCTION_ARGS) +brin_minmax_opcinfo(PG_FUNCTION_ARGS) { Oid typoid = PG_GETARG_OID(0); BrinOpcInfo *result; @@ -81,7 +76,7 @@ minmaxOpcInfo(PG_FUNCTION_ARGS) * return false and do not modify in this case. */ Datum -minmaxAddValue(PG_FUNCTION_ARGS) +brin_minmax_add_value(PG_FUNCTION_ARGS) { BrinDesc *bdesc = (BrinDesc *) PG_GETARG_POINTER(0); BrinValues *column = (BrinValues *) PG_GETARG_POINTER(1); @@ -159,7 +154,7 @@ minmaxAddValue(PG_FUNCTION_ARGS) * values. Return true if so, false otherwise. */ Datum -minmaxConsistent(PG_FUNCTION_ARGS) +brin_minmax_consistent(PG_FUNCTION_ARGS) { BrinDesc *bdesc = (BrinDesc *) PG_GETARG_POINTER(0); BrinValues *column = (BrinValues *) PG_GETARG_POINTER(1); @@ -249,7 +244,7 @@ minmaxConsistent(PG_FUNCTION_ARGS) * values contained in both. The second one is untouched. */ Datum -minmaxUnion(PG_FUNCTION_ARGS) +brin_minmax_union(PG_FUNCTION_ARGS) { BrinDesc *bdesc = (BrinDesc *) PG_GETARG_POINTER(0); BrinValues *col_a = (BrinValues *) PG_GETARG_POINTER(1); diff --git a/src/include/access/brin_internal.h b/src/include/access/brin_internal.h index 34491ef5f3..c95978a074 100644 --- a/src/include/access/brin_internal.h +++ b/src/include/access/brin_internal.h @@ -83,5 +83,12 @@ typedef struct BrinDesc /* brin.c */ extern BrinDesc *brin_build_desc(Relation rel); extern void brin_free_desc(BrinDesc *bdesc); +extern Datum brin_summarize_new_values(PG_FUNCTION_ARGS); + +/* brin_minmax.c */ +extern Datum brin_minmax_opcinfo(PG_FUNCTION_ARGS); +extern Datum brin_minmax_add_value(PG_FUNCTION_ARGS); +extern Datum brin_minmax_consistent(PG_FUNCTION_ARGS); +extern Datum brin_minmax_union(PG_FUNCTION_ARGS); #endif /* BRIN_INTERNAL_H */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 8093260763..0b7c18237c 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201411281 +#define CATALOG_VERSION_NO 201412021 #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 56399ac556..ce482557ee 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -4118,13 +4118,13 @@ DATA(insert OID = 2748 ( arraycontains PGNSP PGUID 12 1 0 0 0 f f f f t f i DATA(insert OID = 2749 ( arraycontained PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "2277 2277" _null_ _null_ _null_ _null_ arraycontained _null_ _null_ _null_ )); /* BRIN minmax */ -DATA(insert OID = 3383 ( brin_minmax_opcinfo PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 2281 "2281" _null_ _null_ _null_ _null_ minmaxOpcInfo _null_ _null_ _null_ )); +DATA(insert OID = 3383 ( brin_minmax_opcinfo PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 2281 "2281" _null_ _null_ _null_ _null_ brin_minmax_opcinfo _null_ _null_ _null_ )); DESCR("BRIN minmax support"); -DATA(insert OID = 3384 ( brin_minmax_add_value PGNSP PGUID 12 1 0 0 0 f f f f t f i 4 0 16 "2281 2281 2281 2281" _null_ _null_ _null_ _null_ minmaxAddValue _null_ _null_ _null_ )); +DATA(insert OID = 3384 ( brin_minmax_add_value PGNSP PGUID 12 1 0 0 0 f f f f t f i 4 0 16 "2281 2281 2281 2281" _null_ _null_ _null_ _null_ brin_minmax_add_value _null_ _null_ _null_ )); DESCR("BRIN minmax support"); -DATA(insert OID = 3385 ( brin_minmax_consistent PGNSP PGUID 12 1 0 0 0 f f f f t f i 3 0 16 "2281 2281 2281" _null_ _null_ _null_ _null_ minmaxConsistent _null_ _null_ _null_ )); +DATA(insert OID = 3385 ( brin_minmax_consistent PGNSP PGUID 12 1 0 0 0 f f f f t f i 3 0 16 "2281 2281 2281" _null_ _null_ _null_ _null_ brin_minmax_consistent _null_ _null_ _null_ )); DESCR("BRIN minmax support"); -DATA(insert OID = 3386 ( brin_minmax_union PGNSP PGUID 12 1 0 0 0 f f f f t f i 3 0 16 "2281 2281 2281" _null_ _null_ _null_ _null_ minmaxUnion _null_ _null_ _null_ )); +DATA(insert OID = 3386 ( brin_minmax_union PGNSP PGUID 12 1 0 0 0 f f f f t f i 3 0 16 "2281 2281 2281" _null_ _null_ _null_ _null_ brin_minmax_union _null_ _null_ _null_ )); DESCR("BRIN minmax support"); /* userlock replacements */