Skip to content

Commit 8816af6

Browse files
committed
Minor refactoring of btree_gist code.
The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
1 parent 55b59ed commit 8816af6

17 files changed

+50
-53
lines changed

contrib/btree_gist/btree_bit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ gbt_bit_l2n(GBT_VARKEY *leaf)
9999

100100
o = gbt_bit_xfrm(r.lower);
101101
r.upper = r.lower = o;
102-
out = gbt_var_key_copy(&r, TRUE);
102+
out = gbt_var_key_copy(&r);
103103
pfree(o);
104104

105105
return out;

contrib/btree_gist/btree_cash.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,8 @@ Datum
119119
gbt_cash_compress(PG_FUNCTION_ARGS)
120120
{
121121
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
122-
GISTENTRY *retval = NULL;
123122

124-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
123+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
125124
}
126125

127126

contrib/btree_gist/btree_date.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,8 @@ Datum
130130
gbt_date_compress(PG_FUNCTION_ARGS)
131131
{
132132
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
133-
GISTENTRY *retval = NULL;
134133

135-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
134+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
136135
}
137136

138137

contrib/btree_gist/btree_float4.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ Datum
112112
gbt_float4_compress(PG_FUNCTION_ARGS)
113113
{
114114
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
115-
GISTENTRY *retval = NULL;
116115

117-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
116+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
118117
}
119118

120119

contrib/btree_gist/btree_float8.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,8 @@ Datum
119119
gbt_float8_compress(PG_FUNCTION_ARGS)
120120
{
121121
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
122-
GISTENTRY *retval = NULL;
123122

124-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
123+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
125124
}
126125

127126

contrib/btree_gist/btree_int2.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,8 @@ Datum
119119
gbt_int2_compress(PG_FUNCTION_ARGS)
120120
{
121121
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
122-
GISTENTRY *retval = NULL;
123122

124-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
123+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
125124
}
126125

127126

contrib/btree_gist/btree_int4.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ Datum
120120
gbt_int4_compress(PG_FUNCTION_ARGS)
121121
{
122122
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
123-
GISTENTRY *retval = NULL;
124123

125-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
124+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
126125
}
127126

128127

contrib/btree_gist/btree_int8.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ Datum
120120
gbt_int8_compress(PG_FUNCTION_ARGS)
121121
{
122122
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
123-
GISTENTRY *retval = NULL;
124123

125-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
124+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
126125
}
127126

128127

contrib/btree_gist/btree_macaddr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ Datum
110110
gbt_macad_compress(PG_FUNCTION_ARGS)
111111
{
112112
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
113-
GISTENTRY *retval = NULL;
114113

115-
PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
114+
PG_RETURN_POINTER(gbt_num_compress(entry, &tinfo));
116115
}
117116

118117

contrib/btree_gist/btree_numeric.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ gbt_numeric_penalty(PG_FUNCTION_ARGS)
170170
uk;
171171

172172
rk = gbt_var_key_readable(org);
173-
uni = PointerGetDatum(gbt_var_key_copy(&rk, TRUE));
173+
uni = PointerGetDatum(gbt_var_key_copy(&rk));
174174
gbt_var_bin_union(&uni, newe, PG_GET_COLLATION(), &tinfo);
175175
ok = gbt_var_key_readable(org);
176176
uk = gbt_var_key_readable((GBT_VARKEY *) DatumGetPointer(uni));

0 commit comments

Comments
 (0)