database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Revert "Add sortsupport for gist_btree opclasses, for faster index builds."

Browse Source 
This reverts commit 9f984ba6d2.

It was making the buildfarm unhappy, apparently setting client_min_messages
in a regression test produces different output if log_statement='all'.
Another issue is that I now suspect the bit sortsupport function was in
fact not correct to call byteacmp(). Revert to investigate both of those
issues.
This commit is contained in:
Heikki Linnakangas
2021-04-07 14:33:21 +03:00
parent 9f984ba6d2
commit d92b1cdbab
77 changed files with 3 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
contrib/btree_gist/btree_inet.c
View File

@ -24,7 +24,6 @@ PG_FUNCTION_INFO_V1(gbt_inet_picksplit);
PG_FUNCTION_INFO_V1(gbt_inet_consistent);
PG_FUNCTION_INFO_V1(gbt_inet_penalty);
PG_FUNCTION_INFO_V1(gbt_inet_same);
PG_FUNCTION_INFO_V1(gbt_inet_sortsupport);
static bool
@ -187,79 +186,3 @@ gbt_inet_same(PG_FUNCTION_ARGS)
*result = gbt_num_same((void *) b1, (void *) b2, &tinfo, fcinfo->flinfo);
PG_RETURN_POINTER(result);
}
static int
gbt_inet_sort_build_cmp(Datum a, Datum b, SortSupport ssup)
{
inetKEY *ia = (inetKEY *) DatumGetPointer(a);
inetKEY *ib = (inetKEY *) DatumGetPointer(b);
/* for leaf items we expect lower == upper */
Assert(ia->lower == ia->upper);
Assert(ib->lower == ib->upper);
if (ia->lower == ib->lower)
return 0;
return (ia->lower > ib->lower) ? 1 : -1;
}
static Datum
gbt_inet_abbrev_convert(Datum original, SortSupport ssup)
{
inetKEY *b1 = (inetKEY *) DatumGetPointer(original);
double z = b1->lower;
#if SIZEOF_DATUM == 8
return Float8GetDatum(z);
#else
return Float4GetDatum((float4) z);
#endif
}
static int
gbt_inet_cmp_abbrev(Datum z1, Datum z2, SortSupport ssup)
{
#if SIZEOF_DATUM == 8
float8 a = DatumGetFloat8(z1);
float8 b = DatumGetFloat8(z2);
#else
float4 a = DatumGetFloat4(z1);
float4 b = DatumGetFloat4(z2);
#endif
if (a > b)
return 1;
else if (a < b)
return -1;
else
return 0;
}
static bool
gbt_inet_abbrev_abort(int memtupcount, SortSupport ssup)
{
return false;
}
/*
* Sort support routine for fast GiST index build by sorting.
*/
Datum
gbt_inet_sortsupport(PG_FUNCTION_ARGS)
{
SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0);
if (ssup->abbreviate)
{
ssup->comparator = gbt_inet_cmp_abbrev;
ssup->abbrev_converter = gbt_inet_abbrev_convert;
ssup->abbrev_abort = gbt_inet_abbrev_abort;
ssup->abbrev_full_comparator = gbt_inet_sort_build_cmp;
}
else
{
ssup->comparator = gbt_inet_sort_build_cmp;
}
PG_RETURN_VOID();
}