diff options
| author | John Naylor <john.naylor@postgresql.org> | 2025-02-18 11:04:55 +0700 |
|---|---|---|
| committer | John Naylor <john.naylor@postgresql.org> | 2025-02-18 11:04:55 +0700 |
| commit | 53d3daa491be458e543dd5bf24d40595e588e4e7 (patch) | |
| tree | 2dd02a2a3cefa844c90dd047bb95dae80b9f9ede /contrib/intarray/_int.h | |
| parent | 164bac92f08ccddd6701d44a5338d72c22f7b5c2 (diff) | |
Specialize intarray sorting
There is at least one report in the field of storing millions of
integers in arrays, so it seems like a good time to specialize
intarray's qsort function. In doing so, streamline the comparators:
Previously there were three, two for each direction for sorting
and one passed to qunique_arg. To preserve the early exit in the
case of descending input, pass the direction as an argument to
the comparator. This requires giving up duplicate detection, which
previously allowed skipping the qunique_arg() call. Testing showed
no regressions this way.
In passing, get rid of nearby checks that the input has at least
two elements, since preserving them would make some macros less
readable. These are not necessary for correctness, and seem like
premature optimizations.
Author: Andrey M. Borodin <x4mmm@yandex-team.ru>
Discussion: https://postgr.es/m/098A3E67-E4A6-4086-9C66-B1EAEB1DFE1C@yandex-team.ru
Diffstat (limited to 'contrib/intarray/_int.h')
| -rw-r--r-- | contrib/intarray/_int.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/contrib/intarray/_int.h b/contrib/intarray/_int.h index 0352cbd3682..ab899a81b4f 100644 --- a/contrib/intarray/_int.h +++ b/contrib/intarray/_int.h @@ -41,17 +41,17 @@ typedef struct #define SORT(x) \ do { \ int _nelems_ = ARRNELEMS(x); \ - if (_nelems_ > 1) \ - isort(ARRPTR(x), _nelems_); \ + bool _ascending = true; \ + isort(ARRPTR(x), _nelems_, &_ascending); \ } while(0) /* sort the elements of the array and remove duplicates */ #define PREPAREARR(x) \ do { \ int _nelems_ = ARRNELEMS(x); \ - if (_nelems_ > 1) \ - if (isort(ARRPTR(x), _nelems_)) \ - (x) = _int_unique(x); \ + bool _ascending = true; \ + isort(ARRPTR(x), _nelems_, &_ascending); \ + (x) = _int_unique(x); \ } while(0) /* "wish" function */ @@ -109,7 +109,7 @@ typedef struct /* * useful functions */ -bool isort(int32 *a, int len); +void isort(int32 *a, size_t len, void *arg); ArrayType *new_intArrayType(int num); ArrayType *copy_intArrayType(ArrayType *a); ArrayType *resize_intArrayType(ArrayType *a, int num); @@ -176,16 +176,12 @@ bool execconsistent(QUERYTYPE *query, ArrayType *array, bool calcnot); bool gin_bool_consistent(QUERYTYPE *query, bool *check); bool query_has_required_values(QUERYTYPE *query); -int compASC(const void *a, const void *b); -int compDESC(const void *a, const void *b); - /* sort, either ascending or descending */ #define QSORT(a, direction) \ do { \ int _nelems_ = ARRNELEMS(a); \ - if (_nelems_ > 1) \ - qsort((void*) ARRPTR(a), _nelems_, sizeof(int32), \ - (direction) ? compASC : compDESC ); \ + bool _ascending = (direction) ? true : false; \ + isort(ARRPTR(a), _nelems_, &_ascending); \ } while(0) #endif /* ___INT_H__ */ |