Commitf26ac6d

committed

Merge with jsquery 0.36.

1 parent73b7912 commitf26ac6dCopy full SHA for f26ac6d

File tree

+166

-87

lines changed

+166

-87

lines changed

Lines changed: 31 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ select 'a in (0,1,2)'::jsquery;`
`354`	`354`	`"a" IN (0, 1, 2)`
`355`	`355`	`(1 row)`
`356`	`356`
`357`		`-select 'ain (0,null, "null", xxx, "zzz", 2)'::jsquery;`
	`357`	`+select 'aIN (0,null, "null", xxx, "zzz", 2)'::jsquery;`
`358`	`358`	`jsquery`
`359`	`359`	`-------------------------------------------`
`360`	`360`	`"a" IN (0, null, "null", "xxx", "zzz", 2)`
`@@ -786,3 +786,33 @@ select '[1,2,3]'::jsonb @@ '#($ = 2)';`
`786`	`786`	`t`
`787`	`787`	`(1 row)`
`788`	`788`
	`789`	`+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%.b=3';`
	`790`	`+ ?column?`
	`791`	`+----------`
	`792`	`+ t`
	`793`	`+(1 row)`
	`794`	`+`
	`795`	`+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ 'a.%=3';`
	`796`	`+ ?column?`
	`797`	`+----------`
	`798`	`+ t`
	`799`	`+(1 row)`
	`800`	`+`
	`801`	`+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%.%="hey"';`
	`802`	`+ ?column?`
	`803`	`+----------`
	`804`	`+ t`
	`805`	`+(1 row)`
	`806`	`+`
	`807`	`+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%="hey"';`
	`808`	`+ ?column?`
	`809`	`+----------`
	`810`	`+ f`
	`811`	`+(1 row)`
	`812`	`+`
	`813`	`+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%=[5,6]';`
	`814`	`+ ?column?`
	`815`	`+----------`
	`816`	`+ t`
	`817`	`+(1 row)`
	`818`	`+`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ get_query_path_bloom(PathItem pathItem, bool lossy)`
`179`	`179`	`val=get_bloom_value(hash);`
`180`	`180`	`res \|=val;`
`181`	`181`	`}`
`182`		`-elseif (pathItem->type==iAny)`
	`182`	`+elseif (pathItem->type==iAny\|\|pathItem->type==iAnyKey)`
`183`	`183`	`{`
`184`	`184`	`*lossy= true;`
`185`	`185`	`}`
`@@ -783,7 +783,7 @@ get_query_path_hash(PathItem pathItem, uint32 hash)`
`783`	`783`	`}`
`784`	`784`	`else`
`785`	`785`	`{`
`786`		`-if (pathItem->type==iAny)`
	`786`	`+if (pathItem->type==iAny\|\|pathItem->type==iAnyKey)`
`787`	`787`	`{`
`788`	`788`	`return false;`
`789`	`789`	`}`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,10 @@ struct JsQueryItem {`
`49`	`49`	`jqiGreaterOrEqual='}',`
`50`	`50`	`jqiContains='@',`
`51`	`51`	`jqiContained='^',`
`52`		`-jqiOverlap='%',`
	`52`	`+jqiOverlap='O',`
`53`	`53`	`jqiAny='*',`
`54`	`54`	`jqiAnyArray='#',`
	`55`	`+jqiAnyKey='%',`
`55`	`56`	`jqiKey='K',`
`56`	`57`	`jqiCurrent='$',`
`57`	`58`	`jqiIn='I'`
`@@ -108,7 +109,8 @@ typedef enum`
`108`	`109`	`{`
`109`	`110`	`iAny=1,`
`110`	`111`	`iAnyArray,`
`111`		`-iKey`
	`112`	`+iKey,`
	`113`	`+iAnyKey`
`112`	`114`	`}PathItemType;`
`113`	`115`
`114`	`116`	`typedefstructPathItemPathItem;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ copyJsQuery(StringInfo buf, char *jqBase, int32 jqPos)`
`118`	`118`	`casejqiAny:`
`119`	`119`	`casejqiCurrent:`
`120`	`120`	`casejqiAnyArray:`
	`121`	`+casejqiAnyKey:`
`121`	`122`	`break;`
`122`	`123`	`default:`
`123`	`124`	`elog(ERROR,"Unknown JsQueryItem type: %d",type);`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,12 @@ recursiveExtract(char jqBase, int32 jqPos,bool indirect, PathItem path)`
`109`	`109`	`pathItem->type=iAnyArray;`
`110`	`110`	`pathItem->parent=path;`
`111`	`111`	`returnrecursiveExtract(jqBase,nextPos, true,pathItem);`
	`112`	`+casejqiAnyKey:`
	`113`	`+Assert(nextPos!=0);`
	`114`	`+pathItem= (PathItem*)palloc(sizeof(PathItem));`
	`115`	`+pathItem->type=iAnyKey;`
	`116`	`+pathItem->parent=path;`
	`117`	`+returnrecursiveExtract(jqBase,nextPos, true,pathItem);`
`112`	`118`	`casejqiCurrent:`
`113`	`119`	`returnrecursiveExtract(jqBase,nextPos,indirect,path);`
`114`	`120`	`casejqiEqual:`

Comments

(0)