Some function call cleanup to make things more consistent.

Author: JerrySievert

META.json

@@ -17,9 +17,9 @@
   },
   "provides": {
     "pljs": {
-      "file": "pljs--1.0.3.sql",
+      "file": "pljs--1.0.4.sql",
       "docfile": "README.md",
-      "version": "1.0.3",
+      "version": "1.0.4",
       "abstract": "PLJS trusted procedural language"
     }
   },

Makefile

@@ -1,6 +1,6 @@
 .PHONY: lintcheck format cleansql docs clean test all
 
-PLJS_VERSION = 1.0.3
+PLJS_VERSION = 1.0.4
 
 PG_CONFIG ?= pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -21,9 +21,6 @@ SHLIB_LINK = -Ldeps/quickjs -lquickjs
 ifeq ($(DEBUG), 1)
 PG_CFLAGS += -g
 SHLIB_LINK += -g
-else
-PG_CFLAGS += -O3
-SHLIB_LINK += -O3
 endif
 
 ifeq ($(DEBUG_MEMORY), 1)

docs/CHANGELOG.md

@@ -29,8 +29,10 @@ Released _August 20, 2025_.
 
 - PGXN release went out with an incorrect control file
 
-### 1.1.0
+### 1.0.4
 
 - Up memory default limit to 512MB
 - Remove unnecessary include from modules.c
 - Remove extra running of GC after each execution
+- Better handling of SRF's, including freeing resources
+- Increased test timeouts to accommodate slower CI machines

pljs.control

@@ -1,6 +1,6 @@
 comment = 'PL/JS trusted procedural language'
 
-default_version = '1.0.3'
+default_version = '1.0.4'
 module_pathname = '$libdir/pljs'
 relocatable = false
 schema = pg_catalog

src/functions.c

@@ -362,7 +362,7 @@ static int pljs_execute_params(const char *sql, JSValue params,
     JSValue param = JS_GetPropertyUint32(ctx, params, i);
     bool is_null;
 
-    values[i] = pljs_jsvalue_to_datum(param, parstate.param_types[i], ctx, NULL,
+    values[i] = pljs_jsvalue_to_datum(parstate.param_types[i], param, ctx, NULL,
                                       &is_null);
 
     JS_FreeValue(ctx, param);
@@ -441,7 +441,7 @@ static JSValue pljs_plan_execute(JSContext *ctx, JSValueConst this_val,
     bool is_null;
 
     values[i] = pljs_jsvalue_to_datum(
-        param, plan->parstate ? plan->parstate->param_types[i] : 0, ctx, NULL,
+        plan->parstate ? plan->parstate->param_types[i] : 0, param, ctx, NULL,
         &is_null);
 
     JS_FreeValue(ctx, param);
@@ -739,7 +739,7 @@ static JSValue pljs_plan_cursor(JSContext *ctx, JSValueConst this_val, int argc,
     bool is_null;
 
     values[i] = pljs_jsvalue_to_datum(
-        param, plan->parstate ? plan->parstate->param_types[i] : 0, ctx, NULL,
+        plan->parstate ? plan->parstate->param_types[i] : 0, param, ctx, NULL,
         &is_null);
   }
 
@@ -1070,7 +1070,7 @@ static JSValue pljs_return_next(JSContext *ctx, JSValueConst this_val, int argc,
     }
 
     bool *nulls = (bool *)palloc0(sizeof(bool) * retstate->tuple_desc->natts);
-    Datum *values = pljs_jsvalue_to_datums(argv[0], NULL, ctx, &nulls,
+    Datum *values = pljs_jsvalue_to_datums(NULL, argv[0], ctx, &nulls,
                                            retstate->tuple_desc);
 
     tuplestore_putvalues(retstate->tuple_store_state, retstate->tuple_desc,
@@ -1080,9 +1080,9 @@ static JSValue pljs_return_next(JSContext *ctx, JSValueConst this_val, int argc,
     pfree(values);
   } else {
     bool is_null = false;
-    Datum result = pljs_jsvalue_to_datum(
-        argv[0], TupleDescAttr(retstate->tuple_desc, 0)->atttypid, ctx, NULL,
-        &is_null);
+    Datum result =
+        pljs_jsvalue_to_datum(TupleDescAttr(retstate->tuple_desc, 0)->atttypid,
+                              argv[0], ctx, NULL, &is_null);
     tuplestore_putvalues(retstate->tuple_store_state, retstate->tuple_desc,
                          &result, &is_null);
   }
@@ -1378,7 +1378,7 @@ static JSValue pljs_window_get_func_arg_in_partition(JSContext *ctx,
     return JS_UNDEFINED;
   }
 
-  return pljs_datum_to_jsvalue(res, storage->function->argtypes[argno], ctx,
+  return pljs_datum_to_jsvalue(storage->function->argtypes[argno], res, ctx,
                                false);
 }
 
@@ -1424,7 +1424,7 @@ static JSValue pljs_window_get_func_arg_in_frame(JSContext *ctx,
   if (isout) {
     return JS_UNDEFINED;
   }
-  return pljs_datum_to_jsvalue(res, storage->function->argtypes[argno], ctx,
+  return pljs_datum_to_jsvalue(storage->function->argtypes[argno], res, ctx,
                                false);
 }
 
@@ -1456,7 +1456,7 @@ static JSValue pljs_window_get_func_arg_current(JSContext *ctx,
   }
   PG_END_TRY();
 
-  return pljs_datum_to_jsvalue(res, storage->function->argtypes[argno], ctx,
+  return pljs_datum_to_jsvalue(storage->function->argtypes[argno], res, ctx,
                                false);
 }
 

src/pljs.c

@@ -432,7 +432,7 @@ static JSValueConst *convert_arguments_to_javascript(FunctionCallInfo fcinfo,
       if (isnull) {
         argv[i] = JS_NULL;
       } else {
-        argv[i] = pljs_datum_to_jsvalue(arg, argtypes[i], context->ctx, true);
+        argv[i] = pljs_datum_to_jsvalue(argtypes[i], arg, context->ctx, true);
       }
     }
   } else {
@@ -456,8 +456,8 @@ static JSValueConst *convert_arguments_to_javascript(FunctionCallInfo fcinfo,
       if (fcinfo->args[inargs].isnull == 1) {
         argv[inargs] = JS_NULL;
       } else {
-        argv[inargs] = pljs_datum_to_jsvalue(fcinfo->args[inargs].value,
-                                             argtype, context->ctx, false);
+        argv[inargs] = pljs_datum_to_jsvalue(
+            argtype, fcinfo->args[inargs].value, context->ctx, false);
       }
 
       inargs++;
@@ -986,7 +986,7 @@ static Datum call_trigger(FunctionCallInfo fcinfo, pljs_context *context) {
 
     pljs_type type;
     pljs_type_fill(&type, context->function->rettype);
-    Datum d = pljs_jsvalue_to_record(ret, &type, context->ctx, NULL, tupdesc);
+    Datum d = pljs_jsvalue_to_record(&type, ret, context->ctx, NULL, tupdesc);
 
     HeapTupleHeader header = DatumGetHeapTupleHeader(d);
 
@@ -1064,11 +1064,11 @@ static Datum call_function(FunctionCallInfo fcinfo, pljs_context *context,
       pljs_type type;
       pljs_type_fill(&type, rettype);
 
-      datum = pljs_jsvalue_to_record(ret, &type, context->ctx, NULL, tupdesc);
+      datum = pljs_jsvalue_to_record(&type, ret, context->ctx, NULL, tupdesc);
     } else {
       bool is_null;
       datum =
-          pljs_jsvalue_to_datum(ret, rettype, context->ctx, fcinfo, &is_null);
+          pljs_jsvalue_to_datum(rettype, ret, context->ctx, fcinfo, &is_null);
     }
 
     JS_FreeValue(context->ctx, ret);
@@ -1189,7 +1189,7 @@ static Datum call_srf_function(FunctionCallInfo fcinfo, pljs_context *context,
       if (state->is_composite) {
         bool *nulls = (bool *)palloc0(sizeof(bool) * state->tuple_desc->natts);
 
-        Datum *values = pljs_jsvalue_to_datums(argv[0], NULL, context->ctx,
+        Datum *values = pljs_jsvalue_to_datums(NULL, argv[0], context->ctx,
                                                &nulls, state->tuple_desc);
         tuplestore_putvalues(state->tuple_store_state, state->tuple_desc,
                              values, nulls);
@@ -1203,15 +1203,15 @@ static Datum call_srf_function(FunctionCallInfo fcinfo, pljs_context *context,
             JSValue val = JS_GetPropertyUint32(context->ctx, ret, i);
 
             Datum result = pljs_jsvalue_to_datum(
-                val, TupleDescAttr(state->tuple_desc, 0)->atttypid,
+                TupleDescAttr(state->tuple_desc, 0)->atttypid, val,
                 context->ctx, NULL, &is_null);
             tuplestore_putvalues(state->tuple_store_state, state->tuple_desc,
                                  &result, &is_null);
           }
         } else {
           if (!JS_IsUndefined(ret)) {
             Datum result = pljs_jsvalue_to_datum(
-                ret, TupleDescAttr(state->tuple_desc, 0)->atttypid,
+                TupleDescAttr(state->tuple_desc, 0)->atttypid, ret,
                 context->ctx, NULL, &is_null);
 
             tuplestore_putvalues(state->tuple_store_state, state->tuple_desc,

src/pljs.h

@@ -181,22 +181,22 @@ void pljs_cache_reset(void);
 // type.c
 
 // To Javascript
-JSValue pljs_datum_to_jsvalue(Datum arg, Oid type, JSContext *ctx,
+JSValue pljs_datum_to_jsvalue(Oid type, Datum arg, JSContext *ctx,
                               bool skip_composite);
-JSValue pljs_datum_to_array(Datum arg, pljs_type *type, JSContext *ctx);
-JSValue pljs_datum_to_object(Datum arg, pljs_type *type, JSContext *ctx);
+JSValue pljs_datum_to_array(pljs_type *type, Datum arg, JSContext *ctx);
+JSValue pljs_datum_to_object(pljs_type *type, Datum arg, JSContext *ctx);
 JSValue pljs_tuple_to_jsvalue(TupleDesc, HeapTuple, JSContext *ctx);
 JSValue pljs_spi_result_to_jsvalue(int, JSContext *);
 
 // To Postgres
-Datum pljs_jsvalue_to_array(JSValue, pljs_type *, JSContext *,
+Datum pljs_jsvalue_to_array(pljs_type *, JSValue, JSContext *,
                             FunctionCallInfo);
-Datum pljs_jsvalue_to_datum(JSValue, Oid, JSContext *, FunctionCallInfo,
-                            bool *);
-Datum pljs_jsvalue_to_record(JSValue val, pljs_type *type, JSContext *ctx,
+Datum pljs_jsvalue_to_datum(Oid, JSValue, JSContext *, FunctionCallInfo,
+                            bool *is_null);
+Datum pljs_jsvalue_to_record(pljs_type *type, JSValue val, JSContext *ctx,
                              bool *is_null, TupleDesc);
-Datum *pljs_jsvalue_to_datums(JSValue val, pljs_type *type, JSContext *ctx,
-                              bool **nulls, TupleDesc tupdesc);
+Datum *pljs_jsvalue_to_datums(pljs_type *type, JSValue val, JSContext *ctx,
+                              bool **is_null, TupleDesc tupdesc);
 
 // Utility
 uint32_t pljs_js_array_length(JSValue, JSContext *);