aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2022-01-10 09:37:43 +0100
committerPeter Eisentraut <peter@eisentraut.org>2022-01-10 09:37:43 +0100
commitee419607381dd9a8031f2bc226c742a3289b7f33 (patch)
tree6713f1be595adc6bf54345f59df284a0674bc6e2
parent376ce3e404b75d267089c4bc6dc7c18d0b38728b (diff)
downloadpostgresql-ee419607381dd9a8031f2bc226c742a3289b7f33.tar.gz
postgresql-ee419607381dd9a8031f2bc226c742a3289b7f33.zip
Rename functions to avoid future conflicts
Rename range_serialize/range_deserialize to brin_range_serialize/brin_range_deserialize, since there are already public 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
-rw-r--r--src/backend/access/brin/brin_minmax_multi.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c
index 34a9057c336..82333752f1f 100644
--- a/src/backend/access/brin/brin_minmax_multi.c
+++ b/src/backend/access/brin/brin_minmax_multi.c
@@ -198,7 +198,7 @@ typedef struct Ranges
* with basic metadata, followed by the boundary values. It has a varlena
* header, so can be treated as varlena directly.
*
- * See range_serialize/range_deserialize for serialization details.
+ * See brin_range_serialize/brin_range_deserialize for serialization details.
*/
typedef struct SerializedRanges
{
@@ -217,9 +217,9 @@ typedef struct SerializedRanges
char data[FLEXIBLE_ARRAY_MEMBER];
} SerializedRanges;
-static SerializedRanges *range_serialize(Ranges *range);
+static SerializedRanges *brin_range_serialize(Ranges *range);
-static Ranges *range_deserialize(int maxvalues, SerializedRanges *range);
+static Ranges *brin_range_deserialize(int maxvalues, SerializedRanges *range);
/*
@@ -566,14 +566,14 @@ range_deduplicate_values(Ranges *range)
/*
- * range_serialize
+ * brin_range_serialize
* Serialize the in-memory representation into a compact varlena value.
*
* Simply copy the header and then also the individual values, as stored
* in the in-memory value array.
*/
static SerializedRanges *
-range_serialize(Ranges *range)
+brin_range_serialize(Ranges *range)
{
Size len;
int nvalues;
@@ -712,14 +712,14 @@ range_serialize(Ranges *range)
}
/*
- * range_deserialize
+ * brin_range_deserialize
* Serialize the in-memory representation into a compact varlena value.
*
* Simply copy the header and then also the individual values, as stored
* in the in-memory value array.
*/
static Ranges *
-range_deserialize(int maxvalues, SerializedRanges *serialized)
+brin_range_deserialize(int maxvalues, SerializedRanges *serialized)
{
int i,
nvalues;
@@ -2405,7 +2405,7 @@ brin_minmax_multi_serialize(BrinDesc *bdesc, Datum src, Datum *dst)
/* At this point everything has to be fully sorted. */
Assert(ranges->nsorted == ranges->nvalues);
- s = range_serialize(ranges);
+ s = brin_range_serialize(ranges);
dst[0] = PointerGetDatum(s);
}
@@ -2528,7 +2528,7 @@ brin_minmax_multi_add_value(PG_FUNCTION_ARGS)
maxvalues = Max(maxvalues, MINMAX_BUFFER_MIN);
maxvalues = Min(maxvalues, MINMAX_BUFFER_MAX);
- ranges = range_deserialize(maxvalues, serialized);
+ ranges = brin_range_deserialize(maxvalues, serialized);
ranges->attno = attno;
ranges->colloid = colloid;
@@ -2581,7 +2581,7 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS)
attno = column->bv_attno;
serialized = (SerializedRanges *) PG_DETOAST_DATUM(column->bv_values[0]);
- ranges = range_deserialize(serialized->maxvalues, serialized);
+ ranges = brin_range_deserialize(serialized->maxvalues, serialized);
/* inspect the ranges, and for each one evaluate the scan keys */
for (rangeno = 0; rangeno < ranges->nranges; rangeno++)
@@ -2776,8 +2776,8 @@ brin_minmax_multi_union(PG_FUNCTION_ARGS)
serialized_a = (SerializedRanges *) PG_DETOAST_DATUM(col_a->bv_values[0]);
serialized_b = (SerializedRanges *) PG_DETOAST_DATUM(col_b->bv_values[0]);
- ranges_a = range_deserialize(serialized_a->maxvalues, serialized_a);
- ranges_b = range_deserialize(serialized_b->maxvalues, serialized_b);
+ ranges_a = brin_range_deserialize(serialized_a->maxvalues, serialized_a);
+ ranges_b = brin_range_deserialize(serialized_b->maxvalues, serialized_b);
/* make sure neither of the ranges is NULL */
Assert(ranges_a && ranges_b);
@@ -2859,7 +2859,7 @@ brin_minmax_multi_union(PG_FUNCTION_ARGS)
/* cleanup and update the serialized value */
pfree(serialized_a);
- col_a->bv_values[0] = PointerGetDatum(range_serialize(ranges_a));
+ col_a->bv_values[0] = PointerGetDatum(brin_range_serialize(ranges_a));
PG_RETURN_VOID();
}
@@ -3041,7 +3041,7 @@ brin_minmax_multi_summary_out(PG_FUNCTION_ARGS)
fmgr_info(outfunc, &fmgrinfo);
/* deserialize the range info easy-to-process pieces */
- ranges_deserialized = range_deserialize(ranges->maxvalues, ranges);
+ ranges_deserialized = brin_range_deserialize(ranges->maxvalues, ranges);
appendStringInfo(&str, "nranges: %d nvalues: %d maxvalues: %d",
ranges_deserialized->nranges,