From d92b1cdbab408d8f1299257125c9ae375f3ca644 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 7 Apr 2021 14:33:21 +0300 Subject: 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. --- contrib/btree_gist/btree_bit.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'contrib/btree_gist/btree_bit.c') diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c index 61b2eecfd59..2225244ded5 100644 --- a/contrib/btree_gist/btree_bit.c +++ b/contrib/btree_gist/btree_bit.c @@ -19,7 +19,6 @@ PG_FUNCTION_INFO_V1(gbt_bit_picksplit); PG_FUNCTION_INFO_V1(gbt_bit_consistent); PG_FUNCTION_INFO_V1(gbt_bit_penalty); PG_FUNCTION_INFO_V1(gbt_bit_same); -PG_FUNCTION_INFO_V1(gbt_bit_sortsupport); /* define for comparison */ @@ -210,27 +209,3 @@ gbt_bit_penalty(PG_FUNCTION_ARGS) PG_RETURN_POINTER(gbt_var_penalty(result, o, n, PG_GET_COLLATION(), &tinfo, fcinfo->flinfo)); } - -static int -gbt_bit_sort_build_cmp(Datum a, Datum b, SortSupport ssup) -{ - /* Use byteacmp(), like gbt_bitcmp() does */ - return DatumGetInt32(DirectFunctionCall2(byteacmp, - PointerGetDatum(a), - PointerGetDatum(b))); -} - -/* - * Sort support routine for fast GiST index build by sorting. - */ -Datum -gbt_bit_sortsupport(PG_FUNCTION_ARGS) -{ - SortSupport ssup = (SortSupport) PG_GETARG_POINTER(0); - - ssup->comparator = gbt_bit_sort_build_cmp; - ssup->abbrev_converter = NULL; - ssup->abbrev_abort = NULL; - ssup->abbrev_full_comparator = NULL; - PG_RETURN_VOID(); -} -- cgit v1.2.3