Skip to content

Commit 0a6eba1

Browse files
feodorfeodor
committed
Merge branch 'master' into anyelement
2 parents affec5a + 266b698 commit 0a6eba1

File tree

470 files changed

+6276
-5593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

470 files changed

+6276
-5593
lines changed

‎contrib/btree_gin/btree_gin.c

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ gin_btree_compare_prefix(FunctionCallInfo fcinfo)
113113
cmp;
114114

115115
cmp = DatumGetInt32(DirectFunctionCall2Coll(
116-
data->typecmp,
117-
PG_GET_COLLATION(),
118-
(data->strategy == BTLessStrategyNumber ||
119-
data->strategy == BTLessEqualStrategyNumber)
120-
? data->datum : a,
121-
b));
116+
data->typecmp,
117+
PG_GET_COLLATION(),
118+
(data->strategy == BTLessStrategyNumber ||
119+
data->strategy == BTLessEqualStrategyNumber)
120+
? data->datum : a,
121+
b));
122122

123123
switch (data->strategy)
124124
{
@@ -186,14 +186,14 @@ Datum \
186186
gin_extract_value_##type(PG_FUNCTION_ARGS) \
187187
{ \
188188
return gin_btree_extract_value(fcinfo, is_varlena); \
189-
} \
189+
} \
190190
PG_FUNCTION_INFO_V1(gin_extract_query_##type); \
191191
Datum \
192192
gin_extract_query_##type(PG_FUNCTION_ARGS) \
193193
{ \
194194
return gin_btree_extract_query(fcinfo, \
195195
is_varlena, leftmostvalue, typecmp); \
196-
} \
196+
} \
197197
PG_FUNCTION_INFO_V1(gin_compare_prefix_##type); \
198198
Datum \
199199
gin_compare_prefix_##type(PG_FUNCTION_ARGS) \
@@ -209,13 +209,15 @@ leftmostvalue_int2(void)
209209
{
210210
return Int16GetDatum(SHRT_MIN);
211211
}
212+
212213
GIN_SUPPORT(int2, false, leftmostvalue_int2, btint2cmp)
213214

214215
static Datum
215216
leftmostvalue_int4(void)
216217
{
217218
return Int32GetDatum(INT_MIN);
218219
}
220+
219221
GIN_SUPPORT(int4, false, leftmostvalue_int4, btint4cmp)
220222

221223
static Datum
@@ -226,20 +228,23 @@ leftmostvalue_int8(void)
226228
*/
227229
return Int64GetDatum(SEQ_MINVALUE);
228230
}
231+
229232
GIN_SUPPORT(int8, false, leftmostvalue_int8, btint8cmp)
230233

231234
static Datum
232235
leftmostvalue_float4(void)
233236
{
234237
return Float4GetDatum(-get_float4_infinity());
235238
}
239+
236240
GIN_SUPPORT(float4, false, leftmostvalue_float4, btfloat4cmp)
237241

238242
static Datum
239243
leftmostvalue_float8(void)
240244
{
241245
return Float8GetDatum(-get_float8_infinity());
242246
}
247+
243248
GIN_SUPPORT(float8, false, leftmostvalue_float8, btfloat8cmp)
244249

245250
static Datum
@@ -250,20 +255,23 @@ leftmostvalue_money(void)
250255
*/
251256
return Int64GetDatum(SEQ_MINVALUE);
252257
}
258+
253259
GIN_SUPPORT(money, false, leftmostvalue_money, cash_cmp)
254260

255261
static Datum
256262
leftmostvalue_oid(void)
257263
{
258264
return ObjectIdGetDatum(0);
259265
}
266+
260267
GIN_SUPPORT(oid, false, leftmostvalue_oid, btoidcmp)
261268

262269
static Datum
263270
leftmostvalue_timestamp(void)
264271
{
265272
return TimestampGetDatum(DT_NOBEGIN);
266273
}
274+
267275
GIN_SUPPORT(timestamp, false, leftmostvalue_timestamp, timestamp_cmp)
268276

269277
GIN_SUPPORT(timestamptz, false, leftmostvalue_timestamp, timestamp_cmp)
@@ -273,6 +281,7 @@ leftmostvalue_time(void)
273281
{
274282
return TimeADTGetDatum(0);
275283
}
284+
276285
GIN_SUPPORT(time, false, leftmostvalue_time, time_cmp)
277286

278287
static Datum
@@ -285,13 +294,15 @@ leftmostvalue_timetz(void)
285294

286295
return TimeTzADTPGetDatum(v);
287296
}
297+
288298
GIN_SUPPORT(timetz, false, leftmostvalue_timetz, timetz_cmp)
289299

290300
static Datum
291301
leftmostvalue_date(void)
292302
{
293303
return DateADTGetDatum(DATEVAL_NOBEGIN);
294304
}
305+
295306
GIN_SUPPORT(date, false, leftmostvalue_date, date_cmp)
296307

297308
static Datum
@@ -304,6 +315,7 @@ leftmostvalue_interval(void)
304315
v->month = 0;
305316
return IntervalPGetDatum(v);
306317
}
318+
307319
GIN_SUPPORT(interval, false, leftmostvalue_interval, interval_cmp)
308320

309321
static Datum
@@ -313,13 +325,15 @@ leftmostvalue_macaddr(void)
313325

314326
return MacaddrPGetDatum(v);
315327
}
328+
316329
GIN_SUPPORT(macaddr, false, leftmostvalue_macaddr, macaddr_cmp)
317330

318331
static Datum
319332
leftmostvalue_inet(void)
320333
{
321334
return DirectFunctionCall1(inet_in, CStringGetDatum("0.0.0.0/0"));
322335
}
336+
323337
GIN_SUPPORT(inet, true, leftmostvalue_inet, network_cmp)
324338

325339
GIN_SUPPORT(cidr, true, leftmostvalue_inet, network_cmp)
@@ -329,13 +343,15 @@ leftmostvalue_text(void)
329343
{
330344
return PointerGetDatum(cstring_to_text_with_len("", 0));
331345
}
346+
332347
GIN_SUPPORT(text, true, leftmostvalue_text, bttextcmp)
333348

334349
static Datum
335350
leftmostvalue_char(void)
336351
{
337352
return CharGetDatum(SCHAR_MIN);
338353
}
354+
339355
GIN_SUPPORT(char, false, leftmostvalue_char, btcharcmp)
340356

341357
GIN_SUPPORT(bytea, true, leftmostvalue_text, byteacmp)
@@ -348,6 +364,7 @@ leftmostvalue_bit(void)
348364
ObjectIdGetDatum(0),
349365
Int32GetDatum(-1));
350366
}
367+
351368
GIN_SUPPORT(bit, true, leftmostvalue_bit, bitcmp)
352369

353370
static Datum
@@ -358,6 +375,7 @@ leftmostvalue_varbit(void)
358375
ObjectIdGetDatum(0),
359376
Int32GetDatum(-1));
360377
}
378+
361379
GIN_SUPPORT(varbit, true, leftmostvalue_varbit, bitcmp)
362380

363381
/*
@@ -402,4 +420,5 @@ leftmostvalue_numeric(void)
402420
{
403421
return PointerGetDatum(NULL);
404422
}
423+
405424
GIN_SUPPORT(numeric, true, leftmostvalue_numeric, gin_numeric_cmp)

‎contrib/btree_gist/btree_utils_num.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
GISTENTRY *
1414
gbt_num_compress(GISTENTRY *entry, const gbtree_ninfo *tinfo)
1515
{
16-
GISTENTRY *retval;
16+
GISTENTRY *retval;
1717

1818
if (entry->leafkey)
1919
{

‎contrib/btree_gist/btree_utils_var.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ gbt_var_key_readable(const GBT_VARKEY *k)
7171
* Create a leaf-entry to store in the index, from a single Datum.
7272
*/
7373
static GBT_VARKEY *
74-
gbt_var_key_from_datum(const struct varlena *u)
74+
gbt_var_key_from_datum(const struct varlena * u)
7575
{
7676
int32 lowersize = VARSIZE(u);
7777
GBT_VARKEY *r;

‎contrib/fuzzystrmatch/dmetaphone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ dmetaphone_alt(PG_FUNCTION_ARGS)
195195
* in a case like this.
196196
*/
197197

198-
#define META_FREE(x) ((void)true) /* pfree((x)) */
198+
#define META_FREE(x) ((void)true) /* pfree((x)) */
199199
#else /* not defined DMETAPHONE_MAIN */
200200

201201
/* use the standard malloc library when not running in PostgreSQL */

‎contrib/hstore/hstore_gist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ typedef struct
7272
static pg_crc32
7373
crc32_sz(char *buf, int size)
7474
{
75-
pg_crc32 crc;
75+
pg_crc32 crc;
7676

7777
INIT_TRADITIONAL_CRC32(crc);
7878
COMP_TRADITIONAL_CRC32(crc, buf, size);

‎contrib/hstore_plperl/hstore_plperl.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ PG_MODULE_MAGIC;
99

1010

1111
PG_FUNCTION_INFO_V1(hstore_to_plperl);
12-
Datum hstore_to_plperl(PG_FUNCTION_ARGS);
1312

1413
Datum
1514
hstore_to_plperl(PG_FUNCTION_ARGS)
@@ -26,10 +25,10 @@ hstore_to_plperl(PG_FUNCTION_ARGS)
2625
for (i = 0; i < count; i++)
2726
{
2827
const char *key;
29-
SV *value;
28+
SV *value;
3029

3130
key = pnstrdup(HS_KEY(entries, base, i), HS_KEYLEN(entries, i));
32-
value = HS_VALISNULL(entries, i) ? newSV(0) : cstr2sv(pnstrdup(HS_VAL(entries, base,i), HS_VALLEN(entries, i)));
31+
value = HS_VALISNULL(entries, i) ? newSV(0) : cstr2sv(pnstrdup(HS_VAL(entries, base, i), HS_VALLEN(entries, i)));
3332

3433
(void) hv_store(hv, key, strlen(key), value, 0);
3534
}
@@ -39,7 +38,6 @@ hstore_to_plperl(PG_FUNCTION_ARGS)
3938

4039

4140
PG_FUNCTION_INFO_V1(plperl_to_hstore);
42-
Datum plperl_to_hstore(PG_FUNCTION_ARGS);
4341

4442
Datum
4543
plperl_to_hstore(PG_FUNCTION_ARGS)
@@ -61,8 +59,8 @@ plperl_to_hstore(PG_FUNCTION_ARGS)
6159
i = 0;
6260
while ((he = hv_iternext(hv)))
6361
{
64-
char *key = sv2cstr(HeSVKEY_force(he));
65-
SV *value = HeVAL(he);
62+
char *key = sv2cstr(HeSVKEY_force(he));
63+
SV *value = HeVAL(he);
6664

6765
pairs[i].key = pstrdup(key);
6866
pairs[i].keylen = hstoreCheckKeyLen(strlen(pairs[i].key));

‎contrib/hstore_plpython/hstore_plpython.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ PG_MODULE_MAGIC;
88

99

1010
PG_FUNCTION_INFO_V1(hstore_to_plpython);
11-
Datum hstore_to_plpython(PG_FUNCTION_ARGS);
1211

1312
Datum
1413
hstore_to_plpython(PG_FUNCTION_ARGS)
@@ -31,9 +30,9 @@ hstore_to_plpython(PG_FUNCTION_ARGS)
3130
PyDict_SetItem(dict, key, Py_None);
3231
else
3332
{
34-
PyObject *value;
33+
PyObject *value;
3534

36-
value = PyString_FromStringAndSize(HS_VAL(entries, base,i), HS_VALLEN(entries, i));
35+
value = PyString_FromStringAndSize(HS_VAL(entries, base, i), HS_VALLEN(entries, i));
3736
PyDict_SetItem(dict, key, value);
3837
Py_XDECREF(value);
3938
}
@@ -45,7 +44,6 @@ hstore_to_plpython(PG_FUNCTION_ARGS)
4544

4645

4746
PG_FUNCTION_INFO_V1(plpython_to_hstore);
48-
Datum plpython_to_hstore(PG_FUNCTION_ARGS);
4947

5048
Datum
5149
plpython_to_hstore(PG_FUNCTION_ARGS)
@@ -75,9 +73,9 @@ plpython_to_hstore(PG_FUNCTION_ARGS)
7573

7674
for (i = 0; i < pcount; i++)
7775
{
78-
PyObject *tuple;
79-
PyObject *key;
80-
PyObject *value;
76+
PyObject *tuple;
77+
PyObject *key;
78+
PyObject *value;
8179

8280
tuple = PyList_GetItem(items, i);
8381
key = PyTuple_GetItem(tuple, 0);

‎contrib/ltree/crc32.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
unsigned int
2727
ltree_crc32_sz(char *buf, int size)
2828
{
29-
pg_crc32 crc;
29+
pg_crc32 crc;
3030
char *p = buf;
3131

3232
INIT_TRADITIONAL_CRC32(crc);
3333
while (size > 0)
3434
{
35-
char c = (char) TOLOWER(*p);
35+
char c = (char) TOLOWER(*p);
36+
3637
COMP_TRADITIONAL_CRC32(crc, &c, 1);
3738
size--;
3839
p++;

‎contrib/ltree_plpython/ltree_plpython.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ PG_MODULE_MAGIC;
77

88

99
PG_FUNCTION_INFO_V1(ltree_to_plpython);
10-
Datum ltree_to_plpython(PG_FUNCTION_ARGS);
1110

1211
Datum
1312
ltree_to_plpython(PG_FUNCTION_ARGS)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy