Changeset: 56ad85c2c144 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/56ad85c2c144
Modified Files:
monetdb5/modules/atoms/pg_jsonpath/jsonpath_exec.c
monetdb5/modules/atoms/pg_jsonpath/postgres_defines_internal.h
Branch: json-extend
Log Message:
fix list macro's
diffs (31 lines):
diff --git a/monetdb5/modules/atoms/pg_jsonpath/jsonpath_exec.c
b/monetdb5/modules/atoms/pg_jsonpath/jsonpath_exec.c
--- a/monetdb5/modules/atoms/pg_jsonpath/jsonpath_exec.c
+++ b/monetdb5/modules/atoms/pg_jsonpath/jsonpath_exec.c
@@ -2209,12 +2209,9 @@ setBaseObject(JsonPathExecContext *cxt,
}
-#define TODO_get_list_as_context(L) List* escontext = (L)->list;
-
static void
JsonValueListAppend(JsonValueList *jvl, JsonbValue *jbv)
{
- TODO_get_list_as_context(jvl);
if (jvl->singleton)
{
jvl->list = list_make2(jvl->singleton, jbv);
diff --git a/monetdb5/modules/atoms/pg_jsonpath/postgres_defines_internal.h
b/monetdb5/modules/atoms/pg_jsonpath/postgres_defines_internal.h
--- a/monetdb5/modules/atoms/pg_jsonpath/postgres_defines_internal.h
+++ b/monetdb5/modules/atoms/pg_jsonpath/postgres_defines_internal.h
@@ -40,9 +40,8 @@ typedef struct Node
#define Max(A,B) MAX(A, B)
#define Min(A,B) MIN(A, B)
-#define SA (escontext->sa)
-#define list_make1(X) sa_list_append(SA, NULL, X)
-#define list_make2(X, Y) list_append(sa_list_append(SA, NULL, X), Y)
+#define list_make1(X) list_add(NULL, X)
+#define list_make2(X, Y) list_append(list_add(NULL, X), Y)
#define lappend(X, Y) list_append(X, Y)
#define linitial(L) (L->h ? L->h->data : NULL)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
