diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-12-02 14:07:54 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-12-02 14:07:54 -0500 |
| commit | 1511521a36f99a242f51c3bd0811cfcd53c5e63a (patch) | |
| tree | 4f2a7f477798940717f8bb29b1631fae451b56df /src/backend | |
| parent | b52cb4690e0752efea440173c4923d76d2126679 (diff) | |
| download | postgresql-1511521a36f99a242f51c3bd0811cfcd53c5e63a.tar.gz postgresql-1511521a36f99a242f51c3bd0811cfcd53c5e63a.zip | |
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.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/brin/brin.c | 2 | ||||
| -rw-r--r-- | src/backend/access/brin/brin_minmax.c | 21 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index cb645e3d459..15d1f9d2b6a 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 3a2bee2649e..009f199a6b7 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); |