Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1511521

Browse files
committed
Minor cleanup of function declarations for BRIN.
Get rid of PG_FUNCTION_INFO_V1() macros, which are quite inappropriatefor built-in functions (possibly leftovers from testing as a loadablemodule?). Also, fix gratuitous inconsistency between SQL-level andC-level names of the minmax support functions.
1 parentb52cb46 commit1511521

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎src/backend/access/brin/brin.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ typedef struct BrinOpaque
6060
BrinDesc*bo_bdesc;
6161
}BrinOpaque;
6262

63-
PG_FUNCTION_INFO_V1(brin_summarize_new_values);
64-
6563
staticBrinBuildState*initialize_brin_buildstate(RelationidxRel,
6664
BrinRevmap*revmap,BlockNumberpagesPerRange);
6765
staticvoidterminate_brin_buildstate(BrinBuildState*state);

‎src/backend/access/brin/brin_minmax.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,18 @@
3636
*/
3737
#definePROCNUM_BASE11
3838

39-
staticFmgrInfo*minmax_get_procinfo(BrinDesc*bdesc,uint16attno,
40-
uint16procnum);
41-
42-
PG_FUNCTION_INFO_V1(minmaxOpcInfo);
43-
PG_FUNCTION_INFO_V1(minmaxAddValue);
44-
PG_FUNCTION_INFO_V1(minmaxConsistent);
45-
PG_FUNCTION_INFO_V1(minmaxUnion);
46-
47-
4839
typedefstructMinmaxOpaque
4940
{
5041
FmgrInfooperators[MINMAX_NUM_PROCNUMS];
5142
boolinited[MINMAX_NUM_PROCNUMS];
5243
}MinmaxOpaque;
5344

45+
staticFmgrInfo*minmax_get_procinfo(BrinDesc*bdesc,uint16attno,
46+
uint16procnum);
47+
48+
5449
Datum
55-
minmaxOpcInfo(PG_FUNCTION_ARGS)
50+
brin_minmax_opcinfo(PG_FUNCTION_ARGS)
5651
{
5752
Oidtypoid=PG_GETARG_OID(0);
5853
BrinOpcInfo*result;
@@ -81,7 +76,7 @@ minmaxOpcInfo(PG_FUNCTION_ARGS)
8176
* return false and do not modify in this case.
8277
*/
8378
Datum
84-
minmaxAddValue(PG_FUNCTION_ARGS)
79+
brin_minmax_add_value(PG_FUNCTION_ARGS)
8580
{
8681
BrinDesc*bdesc= (BrinDesc*)PG_GETARG_POINTER(0);
8782
BrinValues*column= (BrinValues*)PG_GETARG_POINTER(1);
@@ -159,7 +154,7 @@ minmaxAddValue(PG_FUNCTION_ARGS)
159154
* values. Return true if so, false otherwise.
160155
*/
161156
Datum
162-
minmaxConsistent(PG_FUNCTION_ARGS)
157+
brin_minmax_consistent(PG_FUNCTION_ARGS)
163158
{
164159
BrinDesc*bdesc= (BrinDesc*)PG_GETARG_POINTER(0);
165160
BrinValues*column= (BrinValues*)PG_GETARG_POINTER(1);
@@ -249,7 +244,7 @@ minmaxConsistent(PG_FUNCTION_ARGS)
249244
* values contained in both. The second one is untouched.
250245
*/
251246
Datum
252-
minmaxUnion(PG_FUNCTION_ARGS)
247+
brin_minmax_union(PG_FUNCTION_ARGS)
253248
{
254249
BrinDesc*bdesc= (BrinDesc*)PG_GETARG_POINTER(0);
255250
BrinValues*col_a= (BrinValues*)PG_GETARG_POINTER(1);

‎src/include/access/brin_internal.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,12 @@ typedef struct BrinDesc
8383
/* brin.c */
8484
externBrinDesc*brin_build_desc(Relationrel);
8585
externvoidbrin_free_desc(BrinDesc*bdesc);
86+
externDatumbrin_summarize_new_values(PG_FUNCTION_ARGS);
87+
88+
/* brin_minmax.c */
89+
externDatumbrin_minmax_opcinfo(PG_FUNCTION_ARGS);
90+
externDatumbrin_minmax_add_value(PG_FUNCTION_ARGS);
91+
externDatumbrin_minmax_consistent(PG_FUNCTION_ARGS);
92+
externDatumbrin_minmax_union(PG_FUNCTION_ARGS);
8693

8794
#endif/* BRIN_INTERNAL_H */

‎src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO201411281
56+
#defineCATALOG_VERSION_NO201412021
5757

5858
#endif

‎src/include/catalog/pg_proc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4118,13 +4118,13 @@ DATA(insert OID = 2748 ( arraycontains PGNSP PGUID 12 1 0 0 0 f f f f t f i
41184118
DATA(insertOID=2749 (arraycontainedPGNSPPGUID121000fffftfi2016"2277 2277"_null__null__null__null_arraycontained_null__null__null_ ));
41194119

41204120
/* BRIN minmax */
4121-
DATA(insertOID=3383 (brin_minmax_opcinfoPGNSPPGUID121000fffftfi102281"2281"_null__null__null__null_minmaxOpcInfo_null__null__null_ ));
4121+
DATA(insertOID=3383 (brin_minmax_opcinfoPGNSPPGUID121000fffftfi102281"2281"_null__null__null__null_brin_minmax_opcinfo_null__null__null_ ));
41224122
DESCR("BRIN minmax support");
4123-
DATA(insertOID=3384 (brin_minmax_add_valuePGNSPPGUID121000fffftfi4016"2281 2281 2281 2281"_null__null__null__null_minmaxAddValue_null__null__null_ ));
4123+
DATA(insertOID=3384 (brin_minmax_add_valuePGNSPPGUID121000fffftfi4016"2281 2281 2281 2281"_null__null__null__null_brin_minmax_add_value_null__null__null_ ));
41244124
DESCR("BRIN minmax support");
4125-
DATA(insertOID=3385 (brin_minmax_consistentPGNSPPGUID121000fffftfi3016"2281 2281 2281"_null__null__null__null_minmaxConsistent_null__null__null_ ));
4125+
DATA(insertOID=3385 (brin_minmax_consistentPGNSPPGUID121000fffftfi3016"2281 2281 2281"_null__null__null__null_brin_minmax_consistent_null__null__null_ ));
41264126
DESCR("BRIN minmax support");
4127-
DATA(insertOID=3386 (brin_minmax_unionPGNSPPGUID121000fffftfi3016"2281 2281 2281"_null__null__null__null_minmaxUnion_null__null__null_ ));
4127+
DATA(insertOID=3386 (brin_minmax_unionPGNSPPGUID121000fffftfi3016"2281 2281 2281"_null__null__null__null_brin_minmax_union_null__null__null_ ));
41284128
DESCR("BRIN minmax support");
41294129

41304130
/* userlock replacements */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp