postgrespro
diff --git a/‎jsonb_gin_ops.c
Copy file name to clipboardExpand all lines: jsonb_gin_ops.c
+13-13Lines changed: 13 additions & 13 deletions b/‎jsonb_gin_ops.c
Copy file name to clipboardExpand all lines: jsonb_gin_ops.c
+13-13Lines changed: 13 additions & 13 deletions
diff --git a/‎jsquery.h
Copy file name to clipboardExpand all lines: jsquery.h
+4-11Lines changed: 4 additions & 11 deletions b/‎jsquery.h
Copy file name to clipboardExpand all lines: jsquery.h
+4-11Lines changed: 4 additions & 11 deletions
@@ -59,7 +59,7 @@ typedef struct
 static uint32 get_bloom_value(uint32 hash);
 static uint32 get_path_bloom(PathHashStack *stack);
 static GINKey *make_gin_key(JsonbValue *v, uint32 hash);
-static GINKey *make_gin_query_key(JsQueryValue *value, uint32 hash);
+static GINKey *make_gin_query_key(JsQueryItemR *value, uint32 hash);
 static GINKey *make_gin_query_key_minus_inf(uint32 hash);
 static int32 compare_gin_key_value(GINKey *arg1, GINKey *arg2);
 static int add_entry(Entries *e, Datum key, Pointer extra, bool pmatch);
@@ -281,11 +281,11 @@ make_gin_key(JsonbValue *v, uint32 hash)
 }
 
 static GINKey *
-make_gin_query_key(JsQueryValue *value, uint32 hash)
+make_gin_query_key(JsQueryItemR *value, uint32 hash)
 {
 	GINKey *key;
-	char   *jqBase = value->jqBase;
-	int		len, jqPos = value->jqPos;
+	int32	len;
+	char	*s;
 	Numeric	numeric;
 
 	switch(value->type)
@@ -296,21 +296,19 @@ make_gin_query_key(JsQueryValue *value, uint32 hash)
 			SET_VARSIZE(key, GINKEYLEN);
 			break;
 		case jqiString:
-			read_int32(len, jqBase, jqPos);
 			key = (GINKey *)palloc(GINKeyLenString);
 			key->type = jbvString;
-			GINKeyDataString(key) = hash_any((unsigned char *)jqBase + jqPos,
-															  len);
+			s = jsqGetString(value, &len);
+			GINKeyDataString(key) = hash_any((unsigned char *)s, len);
 			SET_VARSIZE(key, GINKeyLenString);
 			break;
 		case jqiBool:
-			read_byte(len, jqBase, jqPos);
 			key = (GINKey *)palloc(GINKEYLEN);
-			key->type = jbvBool | (len ? GINKeyTrue : 0);
+			key->type = jbvBool | (jsqGetBool(value) ? GINKeyTrue : 0);
 			SET_VARSIZE(key, GINKEYLEN);
 			break;
 		case jqiNumeric:
-			numeric = (Numeric)(jqBase + jqPos);
+			numeric = jsqGetNumeric(value);
 			key = (GINKey *)palloc(GINKeyLenNumeric(VARSIZE_ANY(numeric)));
 			key->type = jbvNumeric;
 			memcpy(GINKeyDataNumeric(key), numeric, VARSIZE_ANY(numeric));
@@ -319,6 +317,7 @@ make_gin_query_key(JsQueryValue *value, uint32 hash)
 		default:
 			elog(ERROR,"Wrong state");
 	}
+
 	key->hash = hash;
 	return key;
 }
@@ -852,10 +851,11 @@ make_hash_entry_handler(ExtractedNode *node, Pointer extra)
 	{
 		if (node->bounds.exact->type == jqiAny)
 		{
-			JsQueryValue value;
-			value.jqBase = NULL;
-			value.jqPos = 0;
+			JsQueryItemR value;
+
 			value.type = jqiNull;
+			value.nextPos = 0;
+			value.base = NULL;
 			key = make_gin_query_key(&value, hash);
 			partialMatch = true;
 			keyExtra->lossy = true;
 
@@ -154,9 +154,9 @@ typedef enum
 typedef struct PathItem PathItem;
 struct PathItem
 {
-	char		   *s;
 	PathItemType	type;
 	int				len;
+	char		   *s;
 	PathItem	   *parent;
 };
 
@@ -168,13 +168,6 @@ typedef enum
 	eNot
 } ExtractedNodeType;
 
-typedef struct
-{
-	char   *jqBase;
-	int32	jqPos;
-	int32	type;
-} JsQueryValue;
-
 typedef struct ExtractedNode ExtractedNode;
 struct ExtractedNode
 {
@@ -193,9 +186,9 @@ struct ExtractedNode
 			bool			inequality;
 			bool			leftInclusive;
 			bool			rightInclusive;
-			JsQueryValue   *exact;
-			JsQueryValue   *leftBound;
-			JsQueryValue   *rightBound;
+			JsQueryItemR	*exact;
+			JsQueryItemR	*leftBound;
+			JsQueryItemR	*rightBound;
 		} bounds;
 		int	entryNum;
 	};