database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-07 00:36:50 +03:00
Code Activity

Fix numeric abbreviation for --disable-float8-byval.

Browse Source 
When committing abd94bcac4, I tried to make
it decide what kind of abbreviation to use based only on SIZEOF_DATUM,
without regard to USE_FLOAT8_BYVAL.  That attempt was a few bricks short
of a load, so try to fix it, and add a comment explaining what we're
about.

Patch by me; review (but not a full endorsement) by Andrew Gierth.
This commit is contained in:
Robert Haas
2015-04-03 22:34:37 -04:00
parent b7e1652d5d
commit 368b7c601e
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/utils/adt/numeric.c
View File

@ -296,13 +296,21 @@ typedef struct
hyperLogLogState abbr_card; /* cardinality estimator */ hyperLogLogState abbr_card; /* cardinality estimator */
} NumericSortSupport; } NumericSortSupport;
/*
* We define our own macros for packing and unpacking abbreviated-key
* representations for numeric values in order to avoid depending on
* USE_FLOAT8_BYVAL. The type of abbreviation we use is based only on
* the size of a datum, not the argument-passing convention for float8.
*/
#define NUMERIC_ABBREV_BITS (SIZEOF_DATUM * BITS_PER_BYTE) #define NUMERIC_ABBREV_BITS (SIZEOF_DATUM * BITS_PER_BYTE)
#if SIZEOF_DATUM == 8 #if SIZEOF_DATUM == 8
#define DatumGetNumericAbbrev(d) ((int64) d) #define NumericAbbrevGetDatum(X) ((Datum) SET_8_BYTES(X))
#define NUMERIC_ABBREV_NAN Int64GetDatum(PG_INT64_MIN) #define DatumGetNumericAbbrev(X) ((int64) GET_8_BYTES(X))
#define NUMERIC_ABBREV_NAN NumericAbbrevGetDatum(PG_INT64_MIN)
#else #else
#define DatumGetNumericAbbrev(d) ((int32) d) #define NumericAbbrevGetDatum(X) ((Datum) SET_4_BYTES(X))
#define NUMERIC_ABBREV_NAN Int32GetDatum(PG_INT32_MIN) #define DatumGetNumericAbbrev(X) ((int32) GET_4_BYTES(X))
#define NUMERIC_ABBREV_NAN NumericAbbrevGetDatum(PG_INT32_MIN)
#endif #endif
@ -1883,7 +1891,7 @@ numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss)
addHyperLogLog(&nss->abbr_card, DatumGetUInt32(hash_uint32(tmp))); addHyperLogLog(&nss->abbr_card, DatumGetUInt32(hash_uint32(tmp)));
} }
return Int64GetDatum(result); return NumericAbbrevGetDatum(result);
} }
#endif /* NUMERIC_ABBREV_BITS == 64 */ #endif /* NUMERIC_ABBREV_BITS == 64 */
@ -1960,7 +1968,7 @@ numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss)
addHyperLogLog(&nss->abbr_card, DatumGetUInt32(hash_uint32(tmp))); addHyperLogLog(&nss->abbr_card, DatumGetUInt32(hash_uint32(tmp)));
} }
return Int32GetDatum(result); return NumericAbbrevGetDatum(result);
} }
#endif /* NUMERIC_ABBREV_BITS == 32 */ #endif /* NUMERIC_ABBREV_BITS == 32 */