From 0cfa34c25a7c8e7017cac346d954016fad0dfc16 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 31 Mar 2014 10:26:38 +0300 Subject: Rename GinLogicValue to GinTernaryValue. It's more descriptive. Also, get rid of the enum, and use #defines instead, per Greg Stark's suggestion. --- src/backend/utils/adt/jsonb_gin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/backend/utils/adt/jsonb_gin.c') diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c index 4a6b8fd6888..32ca024c694 100644 --- a/src/backend/utils/adt/jsonb_gin.c +++ b/src/backend/utils/adt/jsonb_gin.c @@ -288,12 +288,12 @@ gin_consistent_jsonb(PG_FUNCTION_ARGS) Datum gin_triconsistent_jsonb(PG_FUNCTION_ARGS) { - GinLogicValue *check = (GinLogicValue *) PG_GETARG_POINTER(0); + GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0); StrategyNumber strategy = PG_GETARG_UINT16(1); /* Jsonb *query = PG_GETARG_JSONB(2); */ int32 nkeys = PG_GETARG_INT32(3); /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ - GinLogicValue res = GIN_TRUE; + GinTernaryValue res = GIN_TRUE; int32 i; @@ -366,7 +366,7 @@ gin_triconsistent_jsonb(PG_FUNCTION_ARGS) else elog(ERROR, "unrecognized strategy number: %d", strategy); - PG_RETURN_GIN_LOGIC_VALUE(res); + PG_RETURN_GIN_TERNARY_VALUE(res); } /* @@ -414,12 +414,12 @@ gin_consistent_jsonb_hash(PG_FUNCTION_ARGS) Datum gin_triconsistent_jsonb_hash(PG_FUNCTION_ARGS) { - GinLogicValue *check = (GinLogicValue *) PG_GETARG_POINTER(0); + GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0); StrategyNumber strategy = PG_GETARG_UINT16(1); /* Jsonb *query = PG_GETARG_JSONB(2); */ int32 nkeys = PG_GETARG_INT32(3); /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ - GinLogicValue res = GIN_TRUE; + GinTernaryValue res = GIN_TRUE; int32 i; bool has_maybe = false; @@ -455,7 +455,7 @@ gin_triconsistent_jsonb_hash(PG_FUNCTION_ARGS) if (!has_maybe && res == GIN_TRUE) res = GIN_MAYBE; - PG_RETURN_GIN_LOGIC_VALUE(res); + PG_RETURN_GIN_TERNARY_VALUE(res); } Datum -- cgit v1.2.3