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

Commitee41960

Browse files
committed
Rename functions to avoid future conflicts
Rename range_serialize/range_deserialize tobrin_range_serialize/brin_range_deserialize, since there are alreadypublic range_serialize/range_deserialize in rangetypes.h.Author: Paul A. Jungwirth <pj@illuminatedcomputing.com>Discussion:https://www.postgresql.org/message-id/CA+renyX0ipvY6A_jUOHeB1q9mL4bEYfAZ5FBB7G7jUo5bykjrA@mail.gmail.com
1 parent376ce3e commitee41960

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ typedef struct Ranges
198198
* with basic metadata, followed by the boundary values. It has a varlena
199199
* header, so can be treated as varlena directly.
200200
*
201-
* Seerange_serialize/range_deserialize for serialization details.
201+
* Seebrin_range_serialize/brin_range_deserialize for serialization details.
202202
*/
203203
typedefstructSerializedRanges
204204
{
@@ -217,9 +217,9 @@ typedef struct SerializedRanges
217217
chardata[FLEXIBLE_ARRAY_MEMBER];
218218
}SerializedRanges;
219219

220-
staticSerializedRanges*range_serialize(Ranges*range);
220+
staticSerializedRanges*brin_range_serialize(Ranges*range);
221221

222-
staticRanges*range_deserialize(intmaxvalues,SerializedRanges*range);
222+
staticRanges*brin_range_deserialize(intmaxvalues,SerializedRanges*range);
223223

224224

225225
/*
@@ -566,14 +566,14 @@ range_deduplicate_values(Ranges *range)
566566

567567

568568
/*
569-
*range_serialize
569+
*brin_range_serialize
570570
* Serialize the in-memory representation into a compact varlena value.
571571
*
572572
* Simply copy the header and then also the individual values, as stored
573573
* in the in-memory value array.
574574
*/
575575
staticSerializedRanges*
576-
range_serialize(Ranges*range)
576+
brin_range_serialize(Ranges*range)
577577
{
578578
Sizelen;
579579
intnvalues;
@@ -712,14 +712,14 @@ range_serialize(Ranges *range)
712712
}
713713

714714
/*
715-
*range_deserialize
715+
*brin_range_deserialize
716716
* Serialize the in-memory representation into a compact varlena value.
717717
*
718718
* Simply copy the header and then also the individual values, as stored
719719
* in the in-memory value array.
720720
*/
721721
staticRanges*
722-
range_deserialize(intmaxvalues,SerializedRanges*serialized)
722+
brin_range_deserialize(intmaxvalues,SerializedRanges*serialized)
723723
{
724724
inti,
725725
nvalues;
@@ -2405,7 +2405,7 @@ brin_minmax_multi_serialize(BrinDesc *bdesc, Datum src, Datum *dst)
24052405
/* At this point everything has to be fully sorted. */
24062406
Assert(ranges->nsorted==ranges->nvalues);
24072407

2408-
s=range_serialize(ranges);
2408+
s=brin_range_serialize(ranges);
24092409
dst[0]=PointerGetDatum(s);
24102410
}
24112411

@@ -2528,7 +2528,7 @@ brin_minmax_multi_add_value(PG_FUNCTION_ARGS)
25282528
maxvalues=Max(maxvalues,MINMAX_BUFFER_MIN);
25292529
maxvalues=Min(maxvalues,MINMAX_BUFFER_MAX);
25302530

2531-
ranges=range_deserialize(maxvalues,serialized);
2531+
ranges=brin_range_deserialize(maxvalues,serialized);
25322532

25332533
ranges->attno=attno;
25342534
ranges->colloid=colloid;
@@ -2581,7 +2581,7 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS)
25812581
attno=column->bv_attno;
25822582

25832583
serialized= (SerializedRanges*)PG_DETOAST_DATUM(column->bv_values[0]);
2584-
ranges=range_deserialize(serialized->maxvalues,serialized);
2584+
ranges=brin_range_deserialize(serialized->maxvalues,serialized);
25852585

25862586
/* inspect the ranges, and for each one evaluate the scan keys */
25872587
for (rangeno=0;rangeno<ranges->nranges;rangeno++)
@@ -2776,8 +2776,8 @@ brin_minmax_multi_union(PG_FUNCTION_ARGS)
27762776
serialized_a= (SerializedRanges*)PG_DETOAST_DATUM(col_a->bv_values[0]);
27772777
serialized_b= (SerializedRanges*)PG_DETOAST_DATUM(col_b->bv_values[0]);
27782778

2779-
ranges_a=range_deserialize(serialized_a->maxvalues,serialized_a);
2780-
ranges_b=range_deserialize(serialized_b->maxvalues,serialized_b);
2779+
ranges_a=brin_range_deserialize(serialized_a->maxvalues,serialized_a);
2780+
ranges_b=brin_range_deserialize(serialized_b->maxvalues,serialized_b);
27812781

27822782
/* make sure neither of the ranges is NULL */
27832783
Assert(ranges_a&&ranges_b);
@@ -2859,7 +2859,7 @@ brin_minmax_multi_union(PG_FUNCTION_ARGS)
28592859

28602860
/* cleanup and update the serialized value */
28612861
pfree(serialized_a);
2862-
col_a->bv_values[0]=PointerGetDatum(range_serialize(ranges_a));
2862+
col_a->bv_values[0]=PointerGetDatum(brin_range_serialize(ranges_a));
28632863

28642864
PG_RETURN_VOID();
28652865
}
@@ -3041,7 +3041,7 @@ brin_minmax_multi_summary_out(PG_FUNCTION_ARGS)
30413041
fmgr_info(outfunc,&fmgrinfo);
30423042

30433043
/* deserialize the range info easy-to-process pieces */
3044-
ranges_deserialized=range_deserialize(ranges->maxvalues,ranges);
3044+
ranges_deserialized=brin_range_deserialize(ranges->maxvalues,ranges);
30453045

30463046
appendStringInfo(&str,"nranges: %d nvalues: %d maxvalues: %d",
30473047
ranges_deserialized->nranges,

0 commit comments

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