Use PG_GETARG_JSONB consistently

diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c
index 1787995edc87996efedec3a00d60e4c15d4768fb..af0ff363bb018385f41639b7a8010488b18a90c2 100644 (file)
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@ -76,7 +76,7 @@ makeitemFromValue(JsonbValue *v, char flag)
 Datum
 gin_extract_jsonb(PG_FUNCTION_ARGS)
 {
-   Jsonb           *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb           *hs = (Jsonb*) PG_GETARG_JSONB(0);
    int32           *nentries = (int32 *) PG_GETARG_POINTER(1);
    Datum           *entries = NULL;
    int             total = 2 * JB_ROOT_COUNT(hs);
@@ -327,7 +327,7 @@ hash_value(JsonbValue *v, PathHashStack *stack)
 Datum
 gin_extract_jsonb_hash(PG_FUNCTION_ARGS)
 {
-   Jsonb           *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb           *hs = PG_GETARG_JSONB(0);
    int32           *nentries = (int32 *) PG_GETARG_POINTER(1);
    Datum           *entries = NULL;
    int             total = 2 * JB_ROOT_COUNT(hs);

diff --git a/src/backend/utils/adt/jsonb_gist.c b/src/backend/utils/adt/jsonb_gist.c
index de06e5dfaae4493acc512991491b63e9a3be1ddf..42dd069a9f2b7181c8722416c5d01460532fe862 100644 (file)
--- a/src/backend/utils/adt/jsonb_gist.c
+++ b/src/backend/utils/adt/jsonb_gist.c
@@ -262,7 +262,7 @@ gjsonb_consistent(PG_FUNCTION_ARGS)
        qe = fcinfo->flinfo->fn_extra;
        if (qe == NULL)
        {
-           Jsonb           *query = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(1));
+           Jsonb           *query = PG_GETARG_JSONB(1);
 
            qe = MemoryContextAlloc(fcinfo->flinfo->fn_mcxt, sizeof(BITVEC));
            memset(qe, 0, sizeof(BITVEC));

diff --git a/src/backend/utils/adt/jsonb_op.c b/src/backend/utils/adt/jsonb_op.c
index a144a49aa2d05aaaa5434c91cbdba0b37ddda5d9..6bc4990a02da8cea4cc2e7fa6c68cb916d16f84a 100644 (file)
--- a/src/backend/utils/adt/jsonb_op.c
+++ b/src/backend/utils/adt/jsonb_op.c
@@ -217,7 +217,7 @@ JsonbDeepFetch(Jsonb *in, ArrayType *path)
 Datum
 jsonb_exists(PG_FUNCTION_ARGS)
 {
-   Jsonb       *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb       *hs = PG_GETARG_JSONB(0);
    text        *key = PG_GETARG_TEXT_PP(1);
    JsonbValue  *v = NULL;
 
@@ -234,7 +234,7 @@ jsonb_exists(PG_FUNCTION_ARGS)
 Datum
 jsonb_exists_idx(PG_FUNCTION_ARGS)
 {
-   Jsonb       *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb       *hs = PG_GETARG_JSONB(0);
    int         ith = PG_GETARG_INT32(1);
    JsonbValue  *v = NULL;
 
@@ -247,7 +247,7 @@ jsonb_exists_idx(PG_FUNCTION_ARGS)
 Datum
 jsonb_exists_path(PG_FUNCTION_ARGS)
 {
-   Jsonb       *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb       *hs = PG_GETARG_JSONB(0);
    ArrayType   *path = PG_GETARG_ARRAYTYPE_P(1);
 
    PG_RETURN_BOOL(JsonbDeepFetch(hs, path) != NULL);
@@ -256,7 +256,7 @@ jsonb_exists_path(PG_FUNCTION_ARGS)
 Datum
 jsonb_exists_any(PG_FUNCTION_ARGS)
 {
-   Jsonb           *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb           *hs = PG_GETARG_JSONB(0);
    ArrayType       *keys = PG_GETARG_ARRAYTYPE_P(1);
    JsonbValue      *v = arrayToJsonbSortedArray(keys);
    int             i;
@@ -290,7 +290,7 @@ jsonb_exists_any(PG_FUNCTION_ARGS)
 Datum
 jsonb_exists_all(PG_FUNCTION_ARGS)
 {
-   Jsonb           *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb           *hs = PG_GETARG_JSONB(0);
    ArrayType       *keys = PG_GETARG_ARRAYTYPE_P(1);
    JsonbValue      *v = arrayToJsonbSortedArray(keys);
    int             i;
@@ -499,8 +499,8 @@ deepContains(JsonbIterator **it1, JsonbIterator **it2)
 Datum
 jsonb_contains(PG_FUNCTION_ARGS)
 {
-   Jsonb           *val = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
-   Jsonb           *tmpl = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(1));
+   Jsonb           *val = PG_GETARG_JSONB(0);
+   Jsonb           *tmpl = PG_GETARG_JSONB(1);
 
    bool            res = true;
    JsonbIterator   *it1, *it2;
@@ -553,8 +553,8 @@ jsonb_contained(PG_FUNCTION_ARGS)
 Datum
 jsonb_cmp(PG_FUNCTION_ARGS)
 {
-   Jsonb           *hs1 = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
-   Jsonb           *hs2 = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(1));
+   Jsonb           *hs1 = PG_GETARG_JSONB(0);
+   Jsonb           *hs2 = PG_GETARG_JSONB(1);
 
    int             res;
 
@@ -650,7 +650,7 @@ jsonb_le(PG_FUNCTION_ARGS)
 Datum
 jsonb_hash(PG_FUNCTION_ARGS)
 {
-   Jsonb       *hs = (Jsonb*) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
+   Jsonb       *hs = PG_GETARG_JSONB(0);
 
    Datum       hval = hash_any((unsigned char *) VARDATA(hs),
                                VARSIZE(hs) - VARHDRSZ);