diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2021-04-07 14:33:21 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2021-04-07 14:33:21 +0300 |
| commit | d92b1cdbab408d8f1299257125c9ae375f3ca644 (patch) | |
| tree | e75e26cae720ad2f4a0e1d8ef071ae197924c45a /contrib/btree_gist/btree_bytea.c | |
| parent | 9f984ba6d23dc6eecebf479ab1d3f2e550a4e9be (diff) | |
| download | postgresql-d92b1cdbab408d8f1299257125c9ae375f3ca644.tar.gz postgresql-d92b1cdbab408d8f1299257125c9ae375f3ca644.zip | |
Revert "Add sortsupport for gist_btree opclasses, for faster index builds."
This reverts commit 9f984ba6d23dc6eecebf479ab1d3f2e550a4e9be.
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.
Diffstat (limited to 'contrib/btree_gist/btree_bytea.c')
| -rw-r--r-- | contrib/btree_gist/btree_bytea.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c index a2abfb7d7c2..6b005f0157e 100644 --- a/contrib/btree_gist/btree_bytea.c +++ b/contrib/btree_gist/btree_bytea.c @@ -18,7 +18,6 @@ PG_FUNCTION_INFO_V1(gbt_bytea_picksplit); PG_FUNCTION_INFO_V1(gbt_bytea_consistent); PG_FUNCTION_INFO_V1(gbt_bytea_penalty); PG_FUNCTION_INFO_V1(gbt_bytea_same); -PG_FUNCTION_INFO_V1(gbt_bytea_sortsupport); /* define for comparison */ @@ -88,7 +87,7 @@ static const gbtree_vinfo tinfo = /************************************************** - * Bytea ops + * Text ops **************************************************/ @@ -169,26 +168,3 @@ gbt_bytea_penalty(PG_FUNCTION_ARGS) PG_RETURN_POINTER(gbt_var_penalty(result, o, n, PG_GET_COLLATION(), &tinfo, fcinfo->flinfo)); } - -static int -gbt_bytea_sort_build_cmp(Datum a, Datum b, SortSupport ssup) -{ - return DatumGetInt32(DirectFunctionCall2(byteacmp, - PointerGetDatum(a), - PointerGetDatum(b))); -} - -/* - * Sort support routine for fast GiST index build by sorting. - */ -Datum -gbt_bytea_sortsupport(PG_FUNCTION_ARGS) -{ - SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0); - - ssup->comparator = gbt_bytea_sort_build_cmp; - ssup->abbrev_converter = NULL; - ssup->abbrev_abort = NULL; - ssup->abbrev_full_comparator = NULL; - PG_RETURN_VOID(); -} |