Fix jqiIndexArray handling in GIN.

Author: Alexander Korotkov

jsonb_gin_ops.c

@@ -947,7 +947,7 @@ get_query_path_hash(PathItem *pathItem, uint32 *hash)
 				*hash = (*hash << 1) | (*hash >> 31);
 				*hash ^= hash_any((unsigned char *)pathItem->s, pathItem->len);
 			}
-			else if (pathItem->type == iAnyArray)
+			else if (pathItem->type == iAnyArray || pathItem->type == iIndexArray)
 			{
 				*hash = (*hash << 1) | (*hash >> 31);
 				*hash ^= JB_FARRAY;

jsquery.h

@@ -170,14 +170,16 @@ typedef enum
 	iAny		= jqiAny,
 	iAnyArray	= jqiAnyArray,
 	iKey		= jqiKey,
-	iAnyKey		= jqiAnyKey
+	iAnyKey		= jqiAnyKey,
+	iIndexArray = jqiIndexArray
 } PathItemType;
 
 typedef struct PathItem PathItem;
 struct PathItem
 {
 	PathItemType	type;
 	int				len;
+	int				arrayIndex;
 	char		   *s;
 	PathItem	   *parent;
 };

jsquery_extract.c

@@ -106,6 +106,12 @@ recursiveExtract(JsQueryItem *jsq, bool not, bool indirect, PathItem *path)
 			jsqGetNext(jsq, &elem);
 			return recursiveExtract(&elem, not, true, pathItem);
 		case jqiIndexArray:
+			pathItem = (PathItem *)palloc(sizeof(PathItem));
+			pathItem->type = iIndexArray;
+			pathItem->arrayIndex = jsq->arrayIndex;
+			pathItem->parent = path;
+			jsqGetNext(jsq, &elem);
+			return recursiveExtract(&elem, not, true, pathItem);
 		case jqiAnyArray:
 		case jqiAllArray:
 			if ((not && jsq->type == jqiAnyArray) || (!not && jsq->type == jqiAllArray))
@@ -864,6 +870,9 @@ debugPath(StringInfo buf, PathItem *path)
 		case jqiAnyArray:
 			appendStringInfoChar(buf, '#');
 			break;
+		case jqiIndexArray:
+			appendStringInfo(buf, "#%d", path->arrayIndex);
+			break;
 		case jqiKey:
 			appendBinaryStringInfo(buf, path->s, path->len);
 			break;