postgrespro
diff --git a/‎jsquery.h
Copy file name to clipboardExpand all lines: jsquery.h
+1Lines changed: 1 addition & 0 deletions b/‎jsquery.h
Copy file name to clipboardExpand all lines: jsquery.h
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎jsquery_op.c
Copy file name to clipboardExpand all lines: jsquery_op.c
+35-21Lines changed: 35 additions & 21 deletions b/‎jsquery_op.c
Copy file name to clipboardExpand all lines: jsquery_op.c
+35-21Lines changed: 35 additions & 21 deletions
@@ -19,6 +19,7 @@
 #include "fmgr.h"
 #include "utils/numeric.h"
 #include "utils/jsonb.h"
+#include "utils/json_generic.h"
 
 typedef struct
 {
 
@@ -43,7 +43,6 @@ compareNumeric(Numeric a, Numeric b)
 			);
 }
 
-#define jbvScalar jbvBinary
 static int
 JsonbType(JsonbValue *jb)
 {
@@ -52,15 +51,9 @@ JsonbType(JsonbValue *jb)
 	if (jb->type == jbvBinary)
 	{
 		JsonbContainer	*jbc = jb->val.binary.data;
-
-		if (jbc->header & JB_FSCALAR)
+		type = jbc->type;
+		if (type == (jbvArray | jbvScalar))
 			type = jbvScalar;
-		else if (jbc->header & JB_FOBJECT)
-			type = jbvObject;
-		else if (jbc->header & JB_FARRAY)
-			type = jbvArray;
-		else
-			elog(ERROR, "Unknown container type: 0x%08x", jbc->header);
 	}
 
 	return type;
@@ -174,18 +167,22 @@ checkArrayEquality(JsQueryItem *jsq, JsonbValue *jb)
 	JsonbIterator	*it;
 	JsonbValue		v;
 	JsQueryItem	elem;
+	int				nelems;
 
 	if (!(jsq->type == jqiArray && JsonbType(jb) == jbvArray))
 		return false;
 
+	nelems = JsonContainerSize(jb->val.binary.data);
+	if (nelems < 0)
+		nelems = JsonGetArraySize(jb->val.binary.data);
+
+	if (nelems != jsq->array.nelems)
+		return false;
 
 	it = JsonbIteratorInit(jb->val.binary.data);
 	r = JsonbIteratorNext(&it, &v, true);
 	Assert(r == WJB_BEGIN_ARRAY);
 
-	if (v.val.array.nElems != jsq->array.nelems)
-		return false;
-
 	while((r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)
 	{
 		if (r != WJB_ELEM)
@@ -338,7 +335,28 @@ executeExpr(JsQueryItem *jsq, int32 op, JsonbValue *jb, JsQueryItem *jsqLeftArg)
 			r = JsonbIteratorNext(&it, &v, true);
 			Assert(r == WJB_BEGIN_ARRAY || r == WJB_BEGIN_OBJECT);
 
-			length = (r == WJB_BEGIN_ARRAY) ? v.val.array.nElems : v.val.object.nPairs;
+			if (r == WJB_BEGIN_ARRAY)
+			{
+				length = v.val.array.nElems;
+
+				if (length < 0)
+					length = JsonGetArraySize(jb->val.binary.data);
+			}
+			else
+			{
+				length = v.val.object.nPairs;
+
+				if (length < 0)
+				{
+					length = 0;
+
+					while ((r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)
+					{
+						if (r == WJB_KEY)
+							length++;
+					}
+				}
+			}
 
 			v.type = jbvNumeric;
 			v.val.numeric = DatumGetNumeric(DirectFunctionCall1(int4_numeric, Int32GetDatum(length)));
@@ -609,16 +627,14 @@ jsquery_json_exec(PG_FUNCTION_ARGS)
 	JsonbValue		jbv;
 	JsQueryItem	jsq;
 
-	jbv.type = jbvBinary;
-	jbv.val.binary.data = &jb->root;
-	jbv.val.binary.len = VARSIZE_ANY_EXHDR(jb);
+	JsonValueInitBinary(&jbv, &jb->root);
 
 	jsqInit(&jsq, jq);
 
 	res = recursiveExecute(&jsq, &jbv, NULL);
 
 	PG_FREE_IF_COPY(jq, 0);
-	PG_FREE_IF_COPY(jb, 1);
+	PG_FREE_IF_COPY_JSONB(jb, 1);
 
 	PG_RETURN_BOOL(res);
 }
@@ -633,15 +649,13 @@ json_jsquery_exec(PG_FUNCTION_ARGS)
 	JsonbValue		jbv;
 	JsQueryItem	jsq;
 
-	jbv.type = jbvBinary;
-	jbv.val.binary.data = &jb->root;
-	jbv.val.binary.len = VARSIZE_ANY_EXHDR(jb);
+	JsonValueInitBinary(&jbv, &jb->root);
 
 	jsqInit(&jsq, jq);
 
 	res = recursiveExecute(&jsq, &jbv, NULL);
 
-	PG_FREE_IF_COPY(jb, 0);
+	PG_FREE_IF_COPY_JSONB(jb, 0);
 	PG_FREE_IF_COPY(jq, 1);
 
 	PG_RETURN_BOOL(res);
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include "fmgr.h"`
`20`	`20`	`#include "utils/numeric.h"`
`21`	`21`	`#include "utils/jsonb.h"`
	`22`	`+#include "utils/json_generic.h"`
`22`	`23`
`23`	`24`	`typedef struct`
`24`	`25`	`{`