From f7c62462402972b13d10e43f104ca0c0fecb6d08 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 25 Jan 2017 13:28:38 -0500 Subject: Introduce convenience macros to hide JsonbContainer header accesses better. This improves readability a bit and may make future improvements easier. In passing, make sure that the JB_ROOT_IS_XXX macros deliver boolean (0/1) results; the previous coding was a bug hazard, though no actual bugs are known. Nikita Glukhov, extended a bit by me Discussion: https://postgr.es/m/9e21a39c-c1d7-b9b5-44a0-c5345a5029f6@postgrespro.ru --- src/backend/utils/adt/jsonfuncs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/utils/adt/jsonfuncs.c') diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index a75df62d2a0..6a7aab2f432 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -1266,10 +1266,10 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text) uint32 nelements; /* Container must be array, but make sure */ - if ((container->header & JB_FARRAY) == 0) + if (!JsonContainerIsArray(container)) elog(ERROR, "not a jsonb array"); - nelements = container->header & JB_CMASK; + nelements = JsonContainerSize(container); if (-lindex > nelements) PG_RETURN_NULL(); -- cgit v1.2.3