From 6adeecd232441cfd4f0c52ed394bb193f430b72f Mon Sep 17 00:00:00 2001 From: Nikita Glukhov Date: Fri, 25 Jan 2019 22:50:25 +0300 Subject: [PATCH v1 2/8] Add raw jbvArray and jbvObject support to jsonpath --- src/backend/utils/adt/jsonpath_exec.c | 96 +++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 11 deletions(-) diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 9f13f4b..1b05307 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -254,6 +254,7 @@ static JsonbValue *JsonbInitBinary(JsonbValue *jbv, Jsonb *jb); static int JsonbType(JsonbValue *jb); static JsonbValue *getScalar(JsonbValue *scalar, enum jbvType type); static JsonbValue *wrapItemsInArray(const JsonValueList *items); +static JsonbValue *wrapJsonObjectOrArray(JsonbValue *jbv, JsonbValue *buf); static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, bool useTz, bool *have_error); @@ -646,7 +647,14 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp, } case jpiKey: - if (JsonbType(jb) == jbvObject) + if (jb->type == jbvObject) + { + JsonbValue obj; + + jb = wrapJsonObjectOrArray(jb, &obj); + return executeItemOptUnwrapTarget(cxt, jsp, jb, found, unwrap); + } + else if (jb->type == jbvBinary && JsonbType(jb) == jbvObject) { JsonbValue *v; JsonbValue key; @@ -725,6 +733,7 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp, int innermostArraySize = cxt->innermostArraySize; int i; int size = JsonbArraySize(jb); + bool binary = jb->type == jbvBinary; bool singleton = size < 0; bool hasNext = jspGetNext(jsp, &elem); @@ -784,7 +793,7 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp, v = jb; copy = true; } - else + else if (binary) { v = getIthJsonbValueFromContainer(jb->val.binary.data, (uint32) index); @@ -794,6 +803,11 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp, copy = false; } + else + { + v = &jb->val.array.elems[index]; + copy = true; + } if (!hasNext && !found) return jperOk; @@ -858,10 +872,10 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp, case jpiAnyKey: if (JsonbType(jb) == jbvObject) { + JsonbValue bin; bool hasNext = jspGetNext(jsp, &elem); - if (jb->type != jbvBinary) - elog(ERROR, "invalid jsonb object type: %d", jb->type); + jb = wrapJsonObjectOrArray(jb, &bin); return executeAnyItem (cxt, hasNext ? &elem : NULL, @@ -926,8 +940,11 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp, case jpiAny: { + JsonbValue bin; bool hasNext = jspGetNext(jsp, &elem); + jb = wrapJsonObjectOrArray(jb, &bin); + /* first try without any intermediate steps */ if (jsp->content.anybounds.first == 0) { @@ -1127,10 +1144,34 @@ executeItemUnwrapTargetArray(JsonPathExecContext *cxt, JsonPathItem *jsp, JsonbValue *jb, JsonValueList *found, bool unwrapElements) { - if (jb->type != jbvBinary) + if (jb->type == jbvArray) { - Assert(jb->type != jbvArray); - elog(ERROR, "invalid jsonb array value type: %d", jb->type); + JsonPathExecResult res = jperNotFound; + JsonbValue *elem = jb->val.array.elems; + JsonbValue *last = elem + jb->val.array.nElems; + + for (; elem < last; elem++) + { + if (jsp) + { + res = executeItemOptUnwrapTarget(cxt, jsp, elem, found, + unwrapElements); + + if (jperIsError(res)) + break; + if (res == jperOk && !found) + break; + } + else + { + if (found) + JsonValueListAppend(found, copyJsonbValue(elem)); + else + return jperOk; + } + } + + return res; } return executeAnyItem @@ -1191,8 +1232,6 @@ executeItemOptUnwrapResult(JsonPathExecContext *cxt, JsonPathItem *jsp, JsonValueListInitIterator(&seq, &it); while ((item = JsonValueListNext(&seq, &it))) { - Assert(item->type != jbvArray); - if (JsonbType(item) == jbvArray) executeItemUnwrapTargetArray(cxt, NULL, item, found, false); else @@ -1931,6 +1970,7 @@ executeKeyValueMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, JsonPathExecResult res = jperNotFound; JsonPathItem next; JsonbContainer *jbc; + JsonbValue bin; JsonbValue key; JsonbValue val; JsonbValue idval; @@ -1942,12 +1982,13 @@ executeKeyValueMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, int64 id; bool hasNext; - if (JsonbType(jb) != jbvObject || jb->type != jbvBinary) + if (JsonbType(jb) != jbvObject) RETURN_ERROR(ereport(ERROR, (errcode(ERRCODE_SQL_JSON_OBJECT_NOT_FOUND), errmsg("jsonpath item method .%s() can only be applied to an object", jspOperationName(jsp->type))))); + jb = wrapJsonObjectOrArray(jb, &bin); jbc = jb->val.binary.data; if (!JsonContainerSize(jbc)) @@ -2144,7 +2185,8 @@ getJsonPathVariable(JsonPathExecContext *cxt, JsonPathItem *variable, static int JsonbArraySize(JsonbValue *jb) { - Assert(jb->type != jbvArray); + if (jb->type == jbvArray) + return jb->val.array.nElems; if (jb->type == jbvBinary) { @@ -2521,6 +2563,33 @@ JsonbInitBinary(JsonbValue *jbv, Jsonb *jb) } /* + * Transform a JsonbValue into a binary JsonbValue by encoding it to a + * binary jsonb container. + */ +static JsonbValue * +JsonbWrapInBinary(JsonbValue *jbv, JsonbValue *out) +{ + Jsonb *jb; + + if (!out) + out = palloc(sizeof(*out)); + + jb = JsonbValueToJsonb(jbv); + JsonbInitBinary(out, jb); + + return out; +} + +static JsonbValue * +wrapJsonObjectOrArray(JsonbValue *jbv, JsonbValue *buf) +{ + if (jbv->type != jbvObject && jbv->type != jbvArray) + return jbv; + + return JsonbWrapInBinary(jbv, buf); +} + +/* * Returns jbv* type of JsonbValue. Note, it never returns jbvBinary as is. */ static int @@ -2569,7 +2638,12 @@ wrapItemsInArray(const JsonValueList *items) JsonValueListInitIterator(items, &it); while ((jbv = JsonValueListNext(items, &it))) + { + JsonbValue bin; + + jbv = wrapJsonObjectOrArray(jbv, &bin); pushJsonbValue(&ps, WJB_ELEM, jbv); + } return pushJsonbValue(&ps, WJB_END_ARRAY, NULL); } -- 2.7.4