Changeset: e88986137f2a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e88986137f2a
Modified Files:
monetdb5/modules/atoms/pg_jsonpath/jsonpath.c
monetdb5/modules/atoms/pg_jsonpath/jsonpath_exec.c
monetdb5/modules/atoms/pg_jsonpath/postgres_defines_internal.h
Branch: json-extend
Log Message:
implement some TODO's
diffs (110 lines):
diff --git a/monetdb5/modules/atoms/pg_jsonpath/jsonpath.c
b/monetdb5/modules/atoms/pg_jsonpath/jsonpath.c
--- a/monetdb5/modules/atoms/pg_jsonpath/jsonpath.c
+++ b/monetdb5/modules/atoms/pg_jsonpath/jsonpath.c
@@ -140,9 +140,9 @@ jspOperationName(JsonPathItemType type)
case jpiTimestampTz:
return "timestamp_tz";
default:
- // elog(ERROR, "unrecognized jsonpath item type: %d",
type); TODO error handling
- return NULL;
+ assert(0);
}
+ return NULL;
}
/******************* Support functions for JsonPath *************************/
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
@@ -360,7 +360,7 @@ executeItemOptUnwrapTarget(JsonPathExecC
JsonPathExecResult res = jperNotFound;
JsonBaseObjectInfo baseObject;
- check_stack_depth();
+ check_stack_depth(jperError);
CHECK_FOR_INTERRUPTS();
switch (jsp->type)
@@ -1255,7 +1255,7 @@ executeBoolItem(JsonPathExecContext *cxt
JsonPathBool res2;
/* since this function recurses, it could be driven to stack overflow */
- check_stack_depth();
+ check_stack_depth(jpbUnknown);
if (!canHaveNext && jspHasNext(jsp)) {
elog(ERROR, "boolean jsonpath item cannot have next item");
@@ -1409,7 +1409,7 @@ executeAnyItem(JsonPathExecContext *cxt,
{
JsonPathExecResult res = jperNotFound;
- check_stack_depth();
+ check_stack_depth(jperError);
if (level > last)
return res;
@@ -1890,9 +1890,9 @@ executeKeyValueMethod(JsonPathExecContex
yyjson_mut_val * idstr = yyjson_mut_strcpy(cxt->mutable_doc, "id");
/* construct object id from its base object and offset inside that */
- yyjson_mut_val * id = yyjson_mut_uint(cxt->mutable_doc, 0 /*TODO
either generate proper object id's or remove this from the feature*/);
+
yyjson_obj_iter obj_iter = yyjson_obj_iter_with(jbc);
-
+ lng cnt = 0;
while ((key = yyjson_obj_iter_next(&obj_iter)))
{
@@ -1908,10 +1908,11 @@ executeKeyValueMethod(JsonPathExecContex
yyjson_mut_val* mut_obj = yyjson_mut_obj (cxt->mutable_doc);
yyjson_mut_val* mut_val = yyjson_val_mut_copy(cxt->mutable_doc,
val);
yyjson_mut_val* mut_key = yyjson_val_mut_copy(cxt->mutable_doc,
key);
+ yyjson_mut_val * mut_id = yyjson_mut_int(cxt->mutable_doc,
cnt++);
- (void) yyjson_mut_obj_add(mut_obj, keystr, mut_key); // TODO:
error handling
- (void) yyjson_mut_obj_add(mut_obj, valstr, mut_val); // TODO:
error handling
- (void) yyjson_mut_obj_add(mut_obj, idstr, id); // TODO: error
handling
+ (void) yyjson_mut_obj_add(mut_obj, keystr, mut_key); // TODO:
yyjson_mem: handle memory allocation errors
+ (void) yyjson_mut_obj_add(mut_obj, valstr, mut_val);
+ (void) yyjson_mut_obj_add(mut_obj, idstr, mut_id);
yyjson_doc* doc = yyjson_mut_val_imut_copy(mut_obj, cxt->alc);
yyjson_val* obj = yyjson_doc_get_root(doc);
@@ -2470,15 +2471,9 @@ JsonPathQuery(Datum jb, JsonPath *jp, Js
wrap = true;
else if (wrapper == JSW_CONDITIONAL)
wrap = count > 1;
- else
- {
- elog(ERROR, "unrecognized json wrapper %d", (int) wrapper);
- return NULL; // TODO I don't think it can happen
- wrap = false;
- }
if (wrap)
- return wrapItemsInArray(alc, &found); // TODO track the
yyjson_doc
+ return wrapItemsInArray(alc, &found);
/* No wrapping means only one item is expected. */
if (count > 1)
@@ -2507,7 +2502,7 @@ JsonPathQuery(Datum jb, JsonPath *jp, Js
}
if (singleton)
- return singleton; // TODO track the yyjson_doc
+ return singleton;
*empty = true;
return NULL;
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
@@ -46,7 +46,7 @@ pg_strtoint32(const char *s)
return res;
}
-#define check_stack_depth() /* TODO */
+#define check_stack_depth(result) if (THRhighwater()) {snprintf(cxt->_errmsg,
1024, "stack overflow"); return (res = result);}
#define CHECK_FOR_INTERRUPTS() /* TODO */
#define DatumGetNumeric(X) (X)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
