@@ -90,7 +90,7 @@ recursiveAny(JsQueryItemR *jsq, JsonbValue *jb)
9090}
9191
9292static bool
93- checkEquality (JsQueryItemR * jsq , JsonbValue * jb )
93+ checkScalarEquality (JsQueryItemR * jsq , JsonbValue * jb )
9494{
9595 int len ;
9696 char * s ;
@@ -148,15 +148,15 @@ checkArrayEquality(JsQueryItemR *jsq, JsonbValue *jb)
148148
149149 jsqIterateArray (jsq , & elem );
150150
151- if (checkEquality (& elem , & v ) == false)
151+ if (checkScalarEquality (& elem , & v ) == false)
152152 return false;
153153 }
154154
155155 return true;
156156}
157157
158158static bool
159- checkIn (JsQueryItemR * jsq , JsonbValue * jb )
159+ checkScalarIn (JsQueryItemR * jsq , JsonbValue * jb )
160160{
161161 JsQueryItemR elem ;
162162
@@ -167,7 +167,7 @@ checkIn(JsQueryItemR *jsq, JsonbValue *jb)
167167 return false;
168168
169169 while (jsqIterateArray (jsq , & elem ))
170- if (checkEquality (& elem , jb ))
170+ if (checkScalarEquality (& elem , jb ))
171171 return true;
172172
173173 return false;
@@ -196,7 +196,7 @@ executeArrayOp(JsQueryItemR *jsq, int32 op, JsonbValue *jb)
196196
197197 while (res == false && (r = JsonbIteratorNext (& it , & v , true)) != WJB_DONE )
198198 {
199- if (r == WJB_ELEM && checkEquality (& elem , & v ))
199+ if (r == WJB_ELEM && checkScalarEquality (& elem , & v ))
200200 res = true;
201201 }
202202
@@ -217,7 +217,7 @@ executeArrayOp(JsQueryItemR *jsq, int32 op, JsonbValue *jb)
217217 jsqIterateInit (jsq );
218218 while (jsqIterateArray (jsq , & elem ))
219219 {
220- if (checkEquality (& elem , & v ))
220+ if (checkScalarEquality (& elem , & v ))
221221 {
222222 if (op == jqiOverlap )
223223 return true;
@@ -282,9 +282,9 @@ executeExpr(JsQueryItemR *jsq, int32 op, JsonbValue *jb)
282282 case jqiEqual :
283283 if (JsonbType (jb ) == jbvArray && jsq -> type == jqiArray )
284284 return checkArrayEquality (jsq , jb );
285- return checkEquality (jsq , jb );
285+ return checkScalarEquality (jsq , jb );
286286 case jqiIn :
287- return checkIn (jsq , jb );
287+ return checkScalarIn (jsq , jb );
288288 case jqiOverlap :
289289 case jqiContains :
290290 case jqiContained :
0 commit comments