Skip to content

Commit 910f9aa

Browse files
feodorfeodor
committed
:1,$ s/JsQueryItemR/JsQueryItem/g; :1,$ s/JsQueryItem/JsQueryParseItem/g
1 parent 341eed5 commit 910f9aa

12 files changed

+235
-233
lines changed

Diff for: ‎jsonb_gin_ops.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ typedef struct
5959
static uint32 get_bloom_value(uint32 hash);
6060
static uint32 get_path_bloom(PathHashStack *stack);
6161
static GINKey *make_gin_key(JsonbValue *v, uint32 hash);
62-
static GINKey *make_gin_query_key(JsQueryItemR *value, uint32 hash);
62+
static GINKey *make_gin_query_key(JsQueryItem *value, uint32 hash);
6363
static GINKey *make_gin_query_key_minus_inf(uint32 hash);
6464
static int32 compare_gin_key_value(GINKey *arg1, GINKey *arg2);
6565
static int add_entry(Entries *e, Datum key, Pointer extra, bool pmatch);
@@ -281,7 +281,7 @@ make_gin_key(JsonbValue *v, uint32 hash)
281281
}
282282

283283
static GINKey *
284-
make_gin_query_key(JsQueryItemR *value, uint32 hash)
284+
make_gin_query_key(JsQueryItem *value, uint32 hash)
285285
{
286286
GINKey *key;
287287
int32 len;
@@ -851,7 +851,7 @@ make_hash_entry_handler(ExtractedNode *node, Pointer extra)
851851
{
852852
if (node->bounds.exact->type == jqiAny)
853853
{
854-
JsQueryItemR value;
854+
JsQueryItem value;
855855

856856
value.type = jqiNull;
857857
value.nextPos = 0;

Diff for: ‎jsquery.h

+29-27
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,24 @@ typedef enum JsQueryItemType {
5454
jqiIn = 'I'
5555
} JsQueryItemType;
5656

57-
typedef struct JsQueryItemR {
57+
typedef struct JsQueryItem {
5858
JsQueryItemType type;
5959
int32 nextPos;
6060
char *base;
6161

6262
union {
6363
struct {
64-
char *data;
65-
int datalen; /* filled only for string */
64+
char *data; /* for bool, numeric and string/key */
65+
int datalen; /* filled only for string/key */
6666
} value;
6767

6868
struct {
6969
int32 left;
7070
int32 right;
7171
} args;
72+
7273
int32 arg;
74+
7375
struct {
7476
int nelems;
7577
int current;
@@ -78,37 +80,37 @@ typedef struct JsQueryItemR {
7880
};
7981

8082

81-
} JsQueryItemR;
83+
} JsQueryItem;
8284

83-
extern void jsqInit(JsQueryItemR *v, JsQuery *js);
84-
extern void jsqInitByBuffer(JsQueryItemR *v, char *base, int32 pos);
85-
extern bool jsqGetNext(JsQueryItemR *v, JsQueryItemR *a);
86-
extern void jsqGetArg(JsQueryItemR *v, JsQueryItemR *a);
87-
extern void jsqGetLeftArg(JsQueryItemR *v, JsQueryItemR *a);
88-
extern void jsqGetRightArg(JsQueryItemR *v, JsQueryItemR *a);
89-
extern Numeric jsqGetNumeric(JsQueryItemR *v);
90-
extern bool jsqGetBool(JsQueryItemR *v);
91-
extern char * jsqGetString(JsQueryItemR *v, int32 *len);
92-
extern void jsqIterateInit(JsQueryItemR *v);
93-
extern bool jsqIterateArray(JsQueryItemR *v, JsQueryItemR *e);
85+
extern void jsqInit(JsQueryItem *v, JsQuery *js);
86+
extern void jsqInitByBuffer(JsQueryItem *v, char *base, int32 pos);
87+
extern bool jsqGetNext(JsQueryItem *v, JsQueryItem *a);
88+
extern void jsqGetArg(JsQueryItem *v, JsQueryItem *a);
89+
extern void jsqGetLeftArg(JsQueryItem *v, JsQueryItem *a);
90+
extern void jsqGetRightArg(JsQueryItem *v, JsQueryItem *a);
91+
extern Numeric jsqGetNumeric(JsQueryItem *v);
92+
extern bool jsqGetBool(JsQueryItem *v);
93+
extern char * jsqGetString(JsQueryItem *v, int32 *len);
94+
extern void jsqIterateInit(JsQueryItem *v);
95+
extern bool jsqIterateArray(JsQueryItem *v, JsQueryItem *e);
9496

9597
/*
9698
* Parsing
9799
*/
98100

99-
typedef struct JsQueryItem JsQueryItem;
101+
typedef struct JsQueryParseItem JsQueryParseItem;
100102

101-
struct JsQueryItem {
103+
struct JsQueryParseItem {
102104
JsQueryItemType type;
103-
JsQueryItem *next; /* next in path */
105+
JsQueryParseItem *next; /* next in path */
104106

105107
union {
106108
struct {
107-
JsQueryItem *left;
108-
JsQueryItem *right;
109+
JsQueryParseItem *left;
110+
JsQueryParseItem *right;
109111
} args;
110112

111-
JsQueryItem *arg;
113+
JsQueryParseItem *arg;
112114

113115
Numeric numeric;
114116
bool boolean;
@@ -118,13 +120,13 @@ struct JsQueryItem {
118120
} string;
119121

120122
struct {
121-
int nelems;
122-
JsQueryItem **elems;
123+
int nelems;
124+
JsQueryParseItem **elems;
123125
} array;
124126
};
125127
};
126128

127-
extern JsQueryItem* parsejsquery(const char *str, int len);
129+
extern JsQueryParseItem* parsejsquery(const char *str, int len);
128130

129131
void alignStringInfoInt(StringInfo buf);
130132

@@ -173,9 +175,9 @@ struct ExtractedNode
173175
bool inequality;
174176
bool leftInclusive;
175177
bool rightInclusive;
176-
JsQueryItemR *exact;
177-
JsQueryItemR *leftBound;
178-
JsQueryItemR *rightBound;
178+
JsQueryItem *exact;
179+
JsQueryItem *leftBound;
180+
JsQueryItem *rightBound;
179181
} bounds;
180182
int entryNum;
181183
};

Diff for: ‎jsquery_constr.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "jsquery.h"
2121

2222
static int32
23-
copyJsQuery(StringInfo buf, JsQueryItemR *jsq)
23+
copyJsQuery(StringInfo buf, JsQueryItem *jsq)
2424
{
25-
JsQueryItemR elem;
25+
JsQueryItem elem;
2626
int32 next, chld;
2727
int32 resPos = buf->len - VARHDRSZ; /* position from begining of jsquery data */
2828

@@ -128,7 +128,7 @@ copyJsQuery(StringInfo buf, JsQueryItemR *jsq)
128128
case jqiAnyKey:
129129
break;
130130
default:
131-
elog(ERROR, "Unknown JsQueryItem type: %d", jsq->type);
131+
elog(ERROR, "Unknown type: %d", jsq->type);
132132
}
133133

134134
if (jsqGetNext(jsq, &elem))
@@ -143,7 +143,7 @@ joinJsQuery(JsQueryItemType type, JsQuery *jq1, JsQuery *jq2)
143143
JsQuery *out;
144144
StringInfoData buf;
145145
int32 left, right, chld;
146-
JsQueryItemR v;
146+
JsQueryItem v;
147147

148148
initStringInfo(&buf);
149149
enlargeStringInfo(&buf, VARSIZE_ANY(jq1) + VARSIZE_ANY(jq2) + 4 * sizeof(int32) + VARHDRSZ);
@@ -217,7 +217,7 @@ jsquery_not(PG_FUNCTION_ARGS)
217217
JsQuery *out;
218218
StringInfoData buf;
219219
int32 arg, chld;
220-
JsQueryItemR v;
220+
JsQueryItem v;
221221

222222
initStringInfo(&buf);
223223
enlargeStringInfo(&buf, VARSIZE_ANY(jq) + 4 * sizeof(int32) + VARHDRSZ);

Diff for: ‎jsquery_extract.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "miscadmin.h"
88
#include "jsquery.h"
99

10-
static ExtractedNode *recursiveExtract(JsQueryItemR *jsq, bool indirect, PathItem *path);
10+
static ExtractedNode *recursiveExtract(JsQueryItem *jsq, bool indirect, PathItem *path);
1111
static int coundChildren(ExtractedNode *node, ExtractedNodeType type, bool first, bool *found);
1212
static void fillChildren(ExtractedNode *node, ExtractedNodeType type, bool first, ExtractedNode **items, int *i);
1313
static void flatternTree(ExtractedNode *node);
@@ -16,14 +16,14 @@ static ExtractedNode *makeEntries(ExtractedNode *node, MakeEntryHandler handler,
1616
static int compareNodes(const void *a1, const void *a2);
1717
static void processGroup(ExtractedNode *node, int start, int end);
1818
static void simplifyRecursive(ExtractedNode *node);
19-
static int compareJsQueryItemR(JsQueryItemR *v1, JsQueryItemR *v2);
19+
static int compareJsQueryItem(JsQueryItem *v1, JsQueryItem *v2);
2020

2121
static ExtractedNode *
22-
recursiveExtract(JsQueryItemR *jsq, bool indirect, PathItem *path)
22+
recursiveExtract(JsQueryItem *jsq, bool indirect, PathItem *path)
2323
{
2424
ExtractedNode *leftNode, *rightNode, *result;
2525
PathItem *pathItem;
26-
JsQueryItemR elem, e;
26+
JsQueryItem elem, e;
2727

2828
check_stack_depth();
2929

@@ -112,7 +112,7 @@ recursiveExtract(JsQueryItemR *jsq, bool indirect, PathItem *path)
112112
result->path = path;
113113
result->indirect = indirect;
114114
result->bounds.inequality = false;
115-
result->bounds.exact = (JsQueryItemR *)palloc(sizeof(JsQueryItemR));
115+
result->bounds.exact = (JsQueryItem *)palloc(sizeof(JsQueryItem));
116116
jsqGetArg(jsq, result->bounds.exact);
117117
return result;
118118
case jqiIn:
@@ -146,7 +146,7 @@ recursiveExtract(JsQueryItemR *jsq, bool indirect, PathItem *path)
146146
item->path = pathItem;
147147

148148
item->bounds.inequality = false;
149-
item->bounds.exact = (JsQueryItemR *)palloc(sizeof(JsQueryItemR));
149+
item->bounds.exact = (JsQueryItem *)palloc(sizeof(JsQueryItem));
150150
*item->bounds.exact = e;
151151
result->args.items[result->args.count] = item;
152152
result->args.count++;
@@ -166,14 +166,14 @@ recursiveExtract(JsQueryItemR *jsq, bool indirect, PathItem *path)
166166
{
167167
result->bounds.leftInclusive = (jsq->type == jqiGreaterOrEqual);
168168
result->bounds.rightBound = NULL;
169-
result->bounds.leftBound = (JsQueryItemR *)palloc(sizeof(JsQueryItemR));
169+
result->bounds.leftBound = (JsQueryItem *)palloc(sizeof(JsQueryItem));
170170
jsqGetArg(jsq, result->bounds.leftBound);
171171
}
172172
else
173173
{
174174
result->bounds.rightInclusive = (jsq->type == jqiLessOrEqual);
175175
result->bounds.leftBound = NULL;
176-
result->bounds.rightBound = (JsQueryItemR *)palloc(sizeof(JsQueryItemR));
176+
result->bounds.rightBound = (JsQueryItem *)palloc(sizeof(JsQueryItem));
177177
jsqGetArg(jsq, result->bounds.rightBound);
178178
}
179179
return result;
@@ -319,7 +319,7 @@ compareNodes(const void *a1, const void *a2)
319319
}
320320

321321
static int
322-
compareJsQueryItemR(JsQueryItemR *v1, JsQueryItemR *v2)
322+
compareJsQueryItem(JsQueryItem *v1, JsQueryItem *v2)
323323
{
324324
char *s1, *s2;
325325
int32 len1, len2, cmp;
@@ -358,7 +358,7 @@ static void
358358
processGroup(ExtractedNode *node, int start, int end)
359359
{
360360
int i;
361-
JsQueryItemR *leftBound = NULL, *rightBound = NULL, *exact = NULL;
361+
JsQueryItem *leftBound = NULL, *rightBound = NULL, *exact = NULL;
362362
bool leftInclusive = false, rightInclusive = false;
363363
ExtractedNode *child;
364364

@@ -391,7 +391,7 @@ processGroup(ExtractedNode *node, int start, int end)
391391
leftBound = child->bounds.leftBound;
392392
leftInclusive = child->bounds.leftInclusive;
393393
}
394-
cmp = compareJsQueryItemR(child->bounds.leftBound, leftBound);
394+
cmp = compareJsQueryItem(child->bounds.leftBound, leftBound);
395395
if (cmp > 0)
396396
{
397397
leftBound = child->bounds.leftBound;
@@ -409,7 +409,7 @@ processGroup(ExtractedNode *node, int start, int end)
409409
rightBound = child->bounds.rightBound;
410410
rightInclusive = child->bounds.rightInclusive;
411411
}
412-
cmp = compareJsQueryItemR(child->bounds.rightBound, rightBound);
412+
cmp = compareJsQueryItem(child->bounds.rightBound, rightBound);
413413
if (cmp > 0)
414414
{
415415
rightBound = child->bounds.rightBound;
@@ -593,7 +593,7 @@ ExtractedNode *
593593
extractJsQuery(JsQuery *jq, MakeEntryHandler handler, Pointer extra)
594594
{
595595
ExtractedNode *root;
596-
JsQueryItemR jsq;
596+
JsQueryItem jsq;
597597

598598
jsqInit(&jsq, jq);
599599
root = recursiveExtract(&jsq, false, NULL);

0 commit comments

Comments
 (0)