Commit1ef3ad2

Alexander Korotkov

committed

Fix jqiIndexArray handling in GIN.

1 parentbd4989b commit1ef3ad2Copy full SHA for 1ef3ad2

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -947,7 +947,7 @@ get_query_path_hash(PathItem pathItem, uint32 hash)`
`947`	`947`	`hash= (hash <<1) \| (*hash >>31);`
`948`	`948`	`hash ^=hash_any((unsignedchar)pathItem->s,pathItem->len);`
`949`	`949`	`}`
`950`		`-elseif (pathItem->type==iAnyArray)`
	`950`	`+elseif (pathItem->type==iAnyArray\|\|pathItem->type==iIndexArray)`
`951`	`951`	`{`
`952`	`952`	`hash= (hash <<1) \| (*hash >>31);`
`953`	`953`	`*hash ^=JB_FARRAY;`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -170,14 +170,16 @@ typedef enum`
`170`	`170`	`iAny=jqiAny,`
`171`	`171`	`iAnyArray=jqiAnyArray,`
`172`	`172`	`iKey=jqiKey,`
`173`		`-iAnyKey=jqiAnyKey`
	`173`	`+iAnyKey=jqiAnyKey,`
	`174`	`+iIndexArray=jqiIndexArray`
`174`	`175`	`}PathItemType;`
`175`	`176`
`176`	`177`	`typedefstructPathItemPathItem;`
`177`	`178`	`structPathItem`
`178`	`179`	`{`
`179`	`180`	`PathItemTypetype;`
`180`	`181`	`intlen;`
	`182`	`+intarrayIndex;`
`181`	`183`	`char*s;`
`182`	`184`	`PathItem*parent;`
`183`	`185`	`};`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,12 @@ recursiveExtract(JsQueryItem jsq, bool not, bool indirect, PathItem path)`
`106`	`106`	`jsqGetNext(jsq,&elem);`
`107`	`107`	`returnrecursiveExtract(&elem,not, true,pathItem);`
`108`	`108`	`casejqiIndexArray:`
	`109`	`+pathItem= (PathItem*)palloc(sizeof(PathItem));`
	`110`	`+pathItem->type=iIndexArray;`
	`111`	`+pathItem->arrayIndex=jsq->arrayIndex;`
	`112`	`+pathItem->parent=path;`
	`113`	`+jsqGetNext(jsq,&elem);`
	`114`	`+returnrecursiveExtract(&elem,not, true,pathItem);`
`109`	`115`	`casejqiAnyArray:`
`110`	`116`	`casejqiAllArray:`
`111`	`117`	`if ((not&&jsq->type==jqiAnyArray)\|\| (!not&&jsq->type==jqiAllArray))`
`@@ -864,6 +870,9 @@ debugPath(StringInfo buf, PathItem *path)`
`864`	`870`	`casejqiAnyArray:`
`865`	`871`	`appendStringInfoChar(buf,'#');`
`866`	`872`	`break;`
	`873`	`+casejqiIndexArray:`
	`874`	`+appendStringInfo(buf,"#%d",path->arrayIndex);`
	`875`	`+break;`
`867`	`876`	`casejqiKey:`
`868`	`877`	`appendBinaryStringInfo(buf,path->s,path->len);`
`869`	`878`	`break;`

Comments

(0)