mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Standardize on using the Min, Max, and Abs macros that are in our c.h file,
getting rid of numerous ad-hoc versions that have popped up in various places. Shortens code and avoids conflict with Windows min() and max() macros.
This commit is contained in:
@ -14,10 +14,6 @@
|
||||
/* number ranges for compression */
|
||||
#define MAXNUMRANGE 100
|
||||
|
||||
#define max(a,b) ((a) > (b) ? (a) : (b))
|
||||
#define min(a,b) ((a) <= (b) ? (a) : (b))
|
||||
#define abs(a) ((a) < (0) ? -(a) : (a))
|
||||
|
||||
/* dimension of array */
|
||||
#define NDIM 1
|
||||
|
||||
|
@ -425,7 +425,7 @@ g_int_picksplit(PG_FUNCTION_ARGS)
|
||||
union_d = inner_int_union(datum_r, datum_alpha);
|
||||
rt__int_size(union_d, &size_beta);
|
||||
pfree(union_d);
|
||||
costvector[i - 1].cost = abs((size_alpha - size_l) - (size_beta - size_r));
|
||||
costvector[i - 1].cost = Abs((size_alpha - size_l) - (size_beta - size_r));
|
||||
}
|
||||
qsort((void *) costvector, maxoff, sizeof(SPLITCOST), comparecost);
|
||||
|
||||
|
@ -137,7 +137,7 @@ inner_int_inter(ArrayType *a, ArrayType *b)
|
||||
nb = ARRNELEMS(b);
|
||||
da = ARRPTR(a);
|
||||
db = ARRPTR(b);
|
||||
r = new_intArrayType(min(na, nb));
|
||||
r = new_intArrayType(Min(na, nb));
|
||||
dr = ARRPTR(r);
|
||||
|
||||
i = j = 0;
|
||||
|
@ -402,7 +402,7 @@ g_intbig_picksplit(PG_FUNCTION_ARGS)
|
||||
_j = GETENTRY(entryvec, j);
|
||||
size_alpha = hemdist(datum_l, _j);
|
||||
size_beta = hemdist(datum_r, _j);
|
||||
costvector[j - 1].cost = abs(size_alpha - size_beta);
|
||||
costvector[j - 1].cost = Abs(size_alpha - size_beta);
|
||||
}
|
||||
qsort((void *) costvector, maxoff, sizeof(SPLITCOST), comparecost);
|
||||
|
||||
|
Reference in New Issue
Block a user