diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-03-31 10:26:38 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-03-31 10:26:38 +0300 |
| commit | 0cfa34c25a7c8e7017cac346d954016fad0dfc16 (patch) | |
| tree | 9b4158fef3a00431864290a38a964b329b144f6e /src/backend/access/gin/ginlogic.c | |
| parent | 7317d8d961f210c3a6b20972cd605bcd9bffb06e (diff) | |
| download | postgresql-0cfa34c25a7c8e7017cac346d954016fad0dfc16.tar.gz postgresql-0cfa34c25a7c8e7017cac346d954016fad0dfc16.zip | |
Rename GinLogicValue to GinTernaryValue.
It's more descriptive. Also, get rid of the enum, and use #defines instead,
per Greg Stark's suggestion.
Diffstat (limited to 'src/backend/access/gin/ginlogic.c')
| -rw-r--r-- | src/backend/access/gin/ginlogic.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/src/backend/access/gin/ginlogic.c b/src/backend/access/gin/ginlogic.c index e6d9e051696..167d25ea5c7 100644 --- a/src/backend/access/gin/ginlogic.c +++ b/src/backend/access/gin/ginlogic.c @@ -58,7 +58,7 @@ trueConsistentFn(GinScanKey key) key->recheckCurItem = false; return true; } -static GinLogicValue +static GinTernaryValue trueTriConsistentFn(GinScanKey key) { return GIN_TRUE; @@ -91,17 +91,18 @@ directBoolConsistentFn(GinScanKey key) /* * A helper function for calling a native ternary logic consistent function. */ -static GinLogicValue +static GinTernaryValue directTriConsistentFn(GinScanKey key) { - return DatumGetGinLogicValue(FunctionCall7Coll(key->triConsistentFmgrInfo, - key->collation, - PointerGetDatum(key->entryRes), - UInt16GetDatum(key->strategy), - key->query, - UInt32GetDatum(key->nuserentries), - PointerGetDatum(key->extra_data), - PointerGetDatum(key->queryValues), + return DatumGetGinTernaryValue(FunctionCall7Coll( + key->triConsistentFmgrInfo, + key->collation, + PointerGetDatum(key->entryRes), + UInt16GetDatum(key->strategy), + key->query, + UInt32GetDatum(key->nuserentries), + PointerGetDatum(key->extra_data), + PointerGetDatum(key->queryValues), PointerGetDatum(key->queryCategories))); } @@ -113,15 +114,16 @@ directTriConsistentFn(GinScanKey key) static bool shimBoolConsistentFn(GinScanKey key) { - GinLogicValue result; - result = DatumGetGinLogicValue(FunctionCall7Coll(key->triConsistentFmgrInfo, - key->collation, - PointerGetDatum(key->entryRes), - UInt16GetDatum(key->strategy), - key->query, - UInt32GetDatum(key->nuserentries), - PointerGetDatum(key->extra_data), - PointerGetDatum(key->queryValues), + GinTernaryValue result; + result = DatumGetGinTernaryValue(FunctionCall7Coll( + key->triConsistentFmgrInfo, + key->collation, + PointerGetDatum(key->entryRes), + UInt16GetDatum(key->strategy), + key->query, + UInt32GetDatum(key->nuserentries), + PointerGetDatum(key->extra_data), + PointerGetDatum(key->queryValues), PointerGetDatum(key->queryCategories))); if (result == GIN_MAYBE) { @@ -147,7 +149,7 @@ shimBoolConsistentFn(GinScanKey key) * * NB: This function modifies the key->entryRes array! */ -static GinLogicValue +static GinTernaryValue shimTriConsistentFn(GinScanKey key) { int nmaybe; @@ -155,7 +157,7 @@ shimTriConsistentFn(GinScanKey key) int i; bool boolResult; bool recheck = false; - GinLogicValue curResult; + GinTernaryValue curResult; /* * Count how many MAYBE inputs there are, and store their indexes in |