Mark some jsonpath functions as inline

Nikita Glukhov · Nikita Glukhov · commit 99fa8bcad1b2 · 2017-08-17T01:12:20.000+03:00
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
@@ -37,7 +37,7 @@ typedef struct JsonValueListIterator
 
 #define JsonValueListIteratorEnd ((ListCell *) -1)
 
-static JsonPathExecResult recursiveExecute(JsonPathExecContext *cxt,
+static inline JsonPathExecResult recursiveExecute(JsonPathExecContext *cxt,
 										   JsonPathItem *jsp, JsonbValue *jb,
 										   JsonValueList *found);
 
@@ -303,7 +303,7 @@ computeJsonPathItem(JsonPathExecContext *cxt, JsonPathItem *item, JsonbValue *va
  * as alias to jbvBinary
  */
 #define jbvScalar jbvBinary
-static int
+static inline int
 JsonbType(JsonbValue *jb)
 {
 	int type = jb->type;
@@ -411,7 +411,7 @@ compareNumeric(Numeric a, Numeric b)
 			);
 }
 
-static JsonPathExecResult
+static inline JsonPathExecResult
 checkEquality(JsonbValue *jb1, JsonbValue *jb2, bool not)
 {
 	bool	eq = false;
@@ -1783,7 +1783,7 @@ recursiveExecuteUnwrap(JsonPathExecContext *cxt, JsonPathItem *jsp,
 	return recursiveExecuteNoUnwrap(cxt, jsp, jb, found);
 }
 
-static JsonbValue *
+static inline JsonbValue *
 wrapItem(JsonbValue *jbv)
 {
 	JsonbParseState *ps = NULL;
@@ -1811,12 +1811,10 @@ wrapItem(JsonbValue *jbv)
 	return jbv;
 }
 
-static JsonPathExecResult
+static inline JsonPathExecResult
 recursiveExecute(JsonPathExecContext *cxt, JsonPathItem *jsp, JsonbValue *jb,
 				 JsonValueList *found)
 {
-	check_stack_depth();
-
 	if (cxt->lax)
 	{
 		switch (jsp->type)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ typedef struct JsonValueListIterator`
`37`	`37`
`38`	`38`	`#define JsonValueListIteratorEnd ((ListCell *) -1)`
`39`	`39`
`40`		`-static JsonPathExecResult recursiveExecute(JsonPathExecContext *cxt,`
	`40`	`+static inline JsonPathExecResult recursiveExecute(JsonPathExecContext *cxt,`
`41`	`41`	`JsonPathItem jsp, JsonbValue jb,`
`42`	`42`	`JsonValueList *found);`
`43`	`43`
`@@ -303,7 +303,7 @@ computeJsonPathItem(JsonPathExecContext cxt, JsonPathItem item, JsonbValue *va`
`303`	`303`	`* as alias to jbvBinary`
`304`	`304`	`*/`
`305`	`305`	`#define jbvScalar jbvBinary`
`306`		`-static int`
	`306`	`+static inline int`
`307`	`307`	`JsonbType(JsonbValue *jb)`
`308`	`308`	`{`
`309`	`309`	`int type = jb->type;`
`@@ -411,7 +411,7 @@ compareNumeric(Numeric a, Numeric b)`
`411`	`411`	`);`
`412`	`412`	`}`
`413`	`413`
`414`		`-static JsonPathExecResult`
	`414`	`+static inline JsonPathExecResult`
`415`	`415`	`checkEquality(JsonbValue jb1, JsonbValue jb2, bool not)`
`416`	`416`	`{`
`417`	`417`	`bool eq = false;`
`@@ -1783,7 +1783,7 @@ recursiveExecuteUnwrap(JsonPathExecContext cxt, JsonPathItem jsp,`
`1783`	`1783`	`return recursiveExecuteNoUnwrap(cxt, jsp, jb, found);`
`1784`	`1784`	`}`
`1785`	`1785`
`1786`		`-static JsonbValue *`
	`1786`	`+static inline JsonbValue *`
`1787`	`1787`	`wrapItem(JsonbValue *jbv)`
`1788`	`1788`	`{`
`1789`	`1789`	`JsonbParseState *ps = NULL;`
`@@ -1811,12 +1811,10 @@ wrapItem(JsonbValue *jbv)`
`1811`	`1811`	`return jbv;`
`1812`	`1812`	`}`
`1813`	`1813`
`1814`		`-static JsonPathExecResult`
	`1814`	`+static inline JsonPathExecResult`
`1815`	`1815`	`recursiveExecute(JsonPathExecContext cxt, JsonPathItem jsp, JsonbValue *jb,`
`1816`	`1816`	`JsonValueList *found)`
`1817`	`1817`	`{`
`1818`		`- check_stack_depth();`
`1819`		`-`
`1820`	`1818`	`if (cxt->lax)`
`1821`	`1819`	`{`
`1822`	`1820`	`switch (jsp->type)`