mirror of
https://github.com/postgres/postgres.git
synced 2025-11-19 13:42:17 +03:00
Grab the low-hanging fruit from forcing sizeof(Datum) to 8.
Remove conditionally-compiled code for smaller Datum widths, and simplify comments that describe cases no longer of interest. I also fixed up a few more places that were not using DatumGetIntXX where they should, and made some cosmetic adjustments such as using sizeof(int64) not sizeof(Datum) in places where that fit better with the surrounding code. One thing I remembered while preparing this part is that SP-GiST stores pass-by-value prefix keys as Datums, so that the on-disk representation depends on sizeof(Datum). That's even more unfortunate than the existing commentary makes it out to be, because now there is a hazard that the change of sizeof(Datum) will break SP-GiST indexes on 32-bit machines. It appears that there are no existing SP-GiST opclasses that are actually affected; and if there are some that I didn't find, the number of installations that are using them on 32-bit machines is doubtless tiny. So I'm proceeding on the assumption that we can get away with this, but it's something to worry about. (gininsert.c looks like it has a similar problem, but it's okay because the "tuples" it's constructing are just transient data within the tuplesort step. That's pretty poorly documented though, so I added some comments.) Author: Tom Lane <tgl@sss.pgh.pa.us> Reviewed-by: Peter Eisentraut <peter@eisentraut.org> Discussion: https://postgr.es/m/1749799.1752797397@sss.pgh.pa.us
This commit is contained in:
@@ -512,7 +512,6 @@ qsort_tuple_unsigned_compare(SortTuple *a, SortTuple *b, Tuplesortstate *state)
|
||||
return state->base.comparetup_tiebreak(a, b, state);
|
||||
}
|
||||
|
||||
#if SIZEOF_DATUM >= 8
|
||||
/* Used if first key's comparator is ssup_datum_signed_cmp */
|
||||
static pg_attribute_always_inline int
|
||||
qsort_tuple_signed_compare(SortTuple *a, SortTuple *b, Tuplesortstate *state)
|
||||
@@ -535,7 +534,6 @@ qsort_tuple_signed_compare(SortTuple *a, SortTuple *b, Tuplesortstate *state)
|
||||
|
||||
return state->base.comparetup_tiebreak(a, b, state);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Used if first key's comparator is ssup_datum_int32_cmp */
|
||||
static pg_attribute_always_inline int
|
||||
@@ -578,7 +576,6 @@ qsort_tuple_int32_compare(SortTuple *a, SortTuple *b, Tuplesortstate *state)
|
||||
#define ST_DEFINE
|
||||
#include "lib/sort_template.h"
|
||||
|
||||
#if SIZEOF_DATUM >= 8
|
||||
#define ST_SORT qsort_tuple_signed
|
||||
#define ST_ELEMENT_TYPE SortTuple
|
||||
#define ST_COMPARE(a, b, state) qsort_tuple_signed_compare(a, b, state)
|
||||
@@ -587,7 +584,6 @@ qsort_tuple_int32_compare(SortTuple *a, SortTuple *b, Tuplesortstate *state)
|
||||
#define ST_SCOPE static
|
||||
#define ST_DEFINE
|
||||
#include "lib/sort_template.h"
|
||||
#endif
|
||||
|
||||
#define ST_SORT qsort_tuple_int32
|
||||
#define ST_ELEMENT_TYPE SortTuple
|
||||
@@ -2692,7 +2688,6 @@ tuplesort_sort_memtuples(Tuplesortstate *state)
|
||||
state);
|
||||
return;
|
||||
}
|
||||
#if SIZEOF_DATUM >= 8
|
||||
else if (state->base.sortKeys[0].comparator == ssup_datum_signed_cmp)
|
||||
{
|
||||
qsort_tuple_signed(state->memtuples,
|
||||
@@ -2700,7 +2695,6 @@ tuplesort_sort_memtuples(Tuplesortstate *state)
|
||||
state);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
else if (state->base.sortKeys[0].comparator == ssup_datum_int32_cmp)
|
||||
{
|
||||
qsort_tuple_int32(state->memtuples,
|
||||
@@ -3146,7 +3140,6 @@ ssup_datum_unsigned_cmp(Datum x, Datum y, SortSupport ssup)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if SIZEOF_DATUM >= 8
|
||||
int
|
||||
ssup_datum_signed_cmp(Datum x, Datum y, SortSupport ssup)
|
||||
{
|
||||
@@ -3160,7 +3153,6 @@ ssup_datum_signed_cmp(Datum x, Datum y, SortSupport ssup)
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
ssup_datum_int32_cmp(Datum x, Datum y, SortSupport ssup)
|
||||
|
||||
Reference in New Issue
Block a user