NotificationsYou must be signed in to change notification settings
Fork49
Star707

Commit4d94911

committed

finish refactoring, now indexes uses new interface. Get rid of JsQueryValue

1 parent90a853d commit4d94911Copy full SHA for 4d94911

File tree

3 files changed

+92

-137

lines changed

3 files changed

+92

-137

lines changed

`‎jsonb_gin_ops.c‎`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ typedef struct`
`59`	`59`	`staticuint32get_bloom_value(uint32hash);`
`60`	`60`	`staticuint32get_path_bloom(PathHashStack*stack);`
`61`	`61`	`staticGINKeymake_gin_key(JsonbValuev,uint32hash);`
`62`		`-staticGINKeymake_gin_query_key(JsQueryValuevalue,uint32hash);`
	`62`	`+staticGINKeymake_gin_query_key(JsQueryItemRvalue,uint32hash);`
`63`	`63`	`staticGINKey*make_gin_query_key_minus_inf(uint32hash);`
`64`	`64`	`staticint32compare_gin_key_value(GINKeyarg1,GINKeyarg2);`
`65`	`65`	`staticintadd_entry(Entries*e,Datumkey,Pointerextra,boolpmatch);`
`@@ -281,11 +281,11 @@ make_gin_key(JsonbValue *v, uint32 hash)`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`staticGINKey*`
`284`		`-make_gin_query_key(JsQueryValue*value,uint32hash)`
	`284`	`+make_gin_query_key(JsQueryItemR*value,uint32hash)`
`285`	`285`	`{`
`286`	`286`	`GINKey*key;`
`287`		`-char*jqBase=value->jqBase;`
`288`		`-intlen,jqPos=value->jqPos;`
	`287`	`+int32len;`
	`288`	`+char*s;`
`289`	`289`	`Numericnumeric;`
`290`	`290`
`291`	`291`	`switch(value->type)`
`@@ -296,21 +296,19 @@ make_gin_query_key(JsQueryValue *value, uint32 hash)`
`296`	`296`	`SET_VARSIZE(key,GINKEYLEN);`
`297`	`297`	`break;`
`298`	`298`	`casejqiString:`
`299`		`-read_int32(len,jqBase,jqPos);`
`300`	`299`	`key= (GINKey*)palloc(GINKeyLenString);`
`301`	`300`	`key->type=jbvString;`
`302`		`-GINKeyDataString(key)=hash_any((unsignedchar*)jqBase+jqPos,`
`303`		`-len);`
	`301`	`+s=jsqGetString(value,&len);`
	`302`	`+GINKeyDataString(key)=hash_any((unsignedchar*)s,len);`
`304`	`303`	`SET_VARSIZE(key,GINKeyLenString);`
`305`	`304`	`break;`
`306`	`305`	`casejqiBool:`
`307`		`-read_byte(len,jqBase,jqPos);`
`308`	`306`	`key= (GINKey*)palloc(GINKEYLEN);`
`309`		`-key->type=jbvBool \| (len ?GINKeyTrue :0);`
	`307`	`+key->type=jbvBool \| (jsqGetBool(value) ?GINKeyTrue :0);`
`310`	`308`	`SET_VARSIZE(key,GINKEYLEN);`
`311`	`309`	`break;`
`312`	`310`	`casejqiNumeric:`
`313`		`-numeric=(Numeric)(jqBase+jqPos);`
	`311`	`+numeric=jsqGetNumeric(value);`
`314`	`312`	`key= (GINKey*)palloc(GINKeyLenNumeric(VARSIZE_ANY(numeric)));`
`315`	`313`	`key->type=jbvNumeric;`
`316`	`314`	`memcpy(GINKeyDataNumeric(key),numeric,VARSIZE_ANY(numeric));`
`@@ -319,6 +317,7 @@ make_gin_query_key(JsQueryValue *value, uint32 hash)`
`319`	`317`	`default:`
`320`	`318`	`elog(ERROR,"Wrong state");`
`321`	`319`	`}`
	`320`	`+`
`322`	`321`	`key->hash=hash;`
`323`	`322`	`returnkey;`
`324`	`323`	`}`
`@@ -852,10 +851,11 @@ make_hash_entry_handler(ExtractedNode *node, Pointer extra)`
`852`	`851`	`{`
`853`	`852`	`if (node->bounds.exact->type==jqiAny)`
`854`	`853`	`{`
`855`		`-JsQueryValuevalue;`
`856`		`-value.jqBase=NULL;`
`857`		`-value.jqPos=0;`
	`854`	`+JsQueryItemRvalue;`
	`855`	`+`
`858`	`856`	`value.type=jqiNull;`
	`857`	`+value.nextPos=0;`
	`858`	`+value.base=NULL;`
`859`	`859`	`key=make_gin_query_key(&value,hash);`
`860`	`860`	`partialMatch= true;`
`861`	`861`	`keyExtra->lossy= true;`

`‎jsquery.h‎`

Lines changed: 4 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,9 @@ typedef enum`
`154`	`154`	`typedefstructPathItemPathItem;`
`155`	`155`	`structPathItem`
`156`	`156`	`{`
`157`		`-char*s;`
`158`	`157`	`PathItemTypetype;`
`159`	`158`	`intlen;`
	`159`	`+char*s;`
`160`	`160`	`PathItem*parent;`
`161`	`161`	`};`
`162`	`162`
`@@ -168,13 +168,6 @@ typedef enum`
`168`	`168`	`eNot`
`169`	`169`	`}ExtractedNodeType;`
`170`	`170`
`171`		`-typedefstruct`
`172`		`-{`
`173`		`-char*jqBase;`
`174`		`-int32jqPos;`
`175`		`-int32type;`
`176`		`-}JsQueryValue;`
`177`		`-`
`178`	`171`	`typedefstructExtractedNodeExtractedNode;`
`179`	`172`	`structExtractedNode`
`180`	`173`	`{`
`@@ -193,9 +186,9 @@ struct ExtractedNode`
`193`	`186`	`boolinequality;`
`194`	`187`	`boolleftInclusive;`
`195`	`188`	`boolrightInclusive;`
`196`		`-JsQueryValue*exact;`
`197`		`-JsQueryValue*leftBound;`
`198`		`-JsQueryValue*rightBound;`
	`189`	`+JsQueryItemR*exact;`
	`190`	`+JsQueryItemR*leftBound;`
	`191`	`+JsQueryItemR*rightBound;`
`199`	`192`	`}bounds;`
`200`	`193`	`intentryNum;`
`201`	`194`	`};`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4d94911

File tree

3 files changed

3 files changed

`‎jsonb_gin_ops.c‎`

`‎jsquery.h‎`

0 commit comments