Prefer the anticipated node_funcs file for common code

Author: pdobacz

pg_diffix/node_funcs.h

@@ -0,0 +1,14 @@
+#ifndef PG_DIFFIX_NODE_FUNCS_H
+#define PG_DIFFIX_NODE_FUNCS_H
+
+#include "nodes/params.h"
+#include "nodes/primnodes.h"
+
+/*
+ * Returns `true` if the node represents a constant from pg_diffix perspective, i.e. `1` or `$1`.
+ */
+extern bool is_simple_constant(Node *node);
+
+extern void get_simple_constant_typed_value(Node *node, ParamListInfo bound_params, Oid *type, Datum *value, bool *isnull);
+
+#endif /* PG_DIFFIX_NODE_FUNCS_H */

pg_diffix/query/anonymization.h

@@ -6,6 +6,7 @@
 
 #include "pg_diffix/aggregation/common.h"
 #include "pg_diffix/aggregation/noise.h"
+#include "pg_diffix/node_funcs.h"
 
 /*
  * Opaque struct containing references to anonymizing (sub)queries.

pg_diffix/utils.h

@@ -1,9 +1,7 @@
 #ifndef PG_DIFFIX_UTILS_H
 #define PG_DIFFIX_UTILS_H
 
-#include "nodes/params.h"
 #include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
 #include "utils/datum.h"
 
 /*-------------------------------------------------------------------------
@@ -121,68 +119,4 @@ static inline List *hash_set_union(List *dst_set, const List *src_set)
 
 #endif
 
-/*-------------------------------------------------------------------------
- * Node utils
- *-------------------------------------------------------------------------
- */
-
-static inline ParamExternData *get_param_data(ParamListInfo bound_params, int one_based_paramid)
-{
-#if PG_MAJORVERSION_NUM == 13
-  int paramid = one_based_paramid;
-#else
-  int paramid = one_based_paramid - 1;
-#endif
-  if (bound_params->paramFetch != NULL)
-    return bound_params->paramFetch(bound_params, paramid, true, NULL);
-  else
-    return &bound_params->params[paramid];
-}
-
-static inline bool is_simple_constant(Node *node)
-{
-  return IsA(node, Const) || (IsA(node, Param) && ((Param *)node)->paramkind == PARAM_EXTERN);
-}
-
-static inline void get_simple_constant_typed_value(Node *node, ParamListInfo bound_params, Oid *type, Datum *value, bool *isnull)
-{
-  if (IsA(node, Const))
-  {
-    Const *const_expr = (Const *)node;
-    *type = const_expr->consttype;
-    *value = const_expr->constvalue;
-    *isnull = const_expr->constisnull;
-  }
-  else if (IsA(node, Param) && ((Param *)node)->paramkind == PARAM_EXTERN)
-  {
-    Param *param_expr = (Param *)node;
-    ParamExternData *param_data = get_param_data(bound_params, param_expr->paramid);
-    *type = param_data->ptype;
-    *value = param_data->value;
-    *isnull = param_data->isnull;
-  }
-  else
-  {
-    FAILWITH("Attempted to get simple constant value of non-Const, non-PARAM_EXTERN node");
-  }
-}
-
-static inline int get_simple_constant_location(Node *node)
-{
-  if (IsA(node, Const))
-  {
-    Const *const_expr = (Const *)node;
-    return const_expr->location;
-  }
-  else if (IsA(node, Param) && ((Param *)node)->paramkind == PARAM_EXTERN)
-  {
-    Param *param_expr = (Param *)node;
-    return param_expr->location;
-  }
-  else
-  {
-    FAILWITH("Attempted to get simple constant value of non-Const, non-PARAM_EXTERN node");
-  }
-}
-
 #endif /* PG_DIFFIX_UTILS_H */

src/node_funcs.c

@@ -0,0 +1,45 @@
+#include "postgres.h"
+
+#include "pg_diffix/node_funcs.h"
+#include "pg_diffix/utils.h"
+
+static ParamExternData *get_param_data(ParamListInfo bound_params, int one_based_paramid)
+{
+#if PG_MAJORVERSION_NUM == 13
+  int paramid = one_based_paramid;
+#else
+  int paramid = one_based_paramid - 1;
+#endif
+  if (bound_params->paramFetch != NULL)
+    return bound_params->paramFetch(bound_params, paramid, true, NULL);
+  else
+    return &bound_params->params[paramid];
+}
+
+bool is_simple_constant(Node *node)
+{
+  return IsA(node, Const) || (IsA(node, Param) && ((Param *)node)->paramkind == PARAM_EXTERN);
+}
+
+void get_simple_constant_typed_value(Node *node, ParamListInfo bound_params, Oid *type, Datum *value, bool *isnull)
+{
+  if (IsA(node, Const))
+  {
+    Const *const_expr = (Const *)node;
+    *type = const_expr->consttype;
+    *value = const_expr->constvalue;
+    *isnull = const_expr->constisnull;
+  }
+  else if (IsA(node, Param) && ((Param *)node)->paramkind == PARAM_EXTERN)
+  {
+    Param *param_expr = (Param *)node;
+    ParamExternData *param_data = get_param_data(bound_params, param_expr->paramid);
+    *type = param_data->ptype;
+    *value = param_data->value;
+    *isnull = param_data->isnull;
+  }
+  else
+  {
+    FAILWITH("Attempted to get simple constant value of non-Const, non-PARAM_EXTERN node");
+  }
+}

src/query/anonymization.c

@@ -365,7 +365,7 @@ static bool collect_seed_material(Node *node, CollectMaterialContext *context)
     get_simple_constant_typed_value(node, context->bound_params, &type, &value, &isnull);
 
     if (!is_supported_numeric_type(type))
-      FAILWITH_LOCATION(get_simple_constant_location(node), "Unsupported constant type used in bucket definition!");
+      FAILWITH_LOCATION(exprLocation(node), "Unsupported constant type used in bucket definition!");
 
     double const_as_double = numeric_value_to_double(type, value);
     char const_as_string[DOUBLE_SHORTEST_DECIMAL_LEN];

src/query/validation.c

@@ -15,6 +15,7 @@
 #include "utils/lsyscache.h"
 
 #include "pg_diffix/auth.h"
+#include "pg_diffix/node_funcs.h"
 #include "pg_diffix/oid_cache.h"
 #include "pg_diffix/query/allowed_objects.h"
 #include "pg_diffix/query/validation.h"
@@ -238,7 +239,7 @@ static void verify_bucket_expression(Node *node)
   }
   else if (is_simple_constant(node))
   {
-    FAILWITH_LOCATION(get_simple_constant_location(node), "Simple constants are not allowed as bucket expressions.");
+    FAILWITH_LOCATION(exprLocation(node), "Simple constants are not allowed as bucket expressions.");
   }
   else if (IsA(node, RelabelType))
   {
@@ -273,7 +274,7 @@ static void verify_substring(FuncExpr *func_expr, ParamListInfo bound_params)
   get_simple_constant_typed_value(node, bound_params, &type, &value, &isnull);
 
   if (DatumGetUInt32(value) != 1)
-    FAILWITH_LOCATION(get_simple_constant_location(node), "Generalization used in the query is not allowed in untrusted access level.");
+    FAILWITH_LOCATION(exprLocation(node), "Generalization used in the query is not allowed in untrusted access level.");
 }
 
 /* money-style numbers, i.e. 1, 2, or 5 preceeded by or followed by zeros: ⟨... 0.1, 0.2, 0.5, 1, 2, 5, 10, ...⟩ */
@@ -300,10 +301,10 @@ static void verify_bin_size(Node *range_expr, ParamListInfo bound_params)
   get_simple_constant_typed_value(range_node, bound_params, &type, &value, &isnull);
 
   if (!is_supported_numeric_type(type))
-    FAILWITH_LOCATION(get_simple_constant_location(range_node), "Unsupported constant type used in generalization.");
+    FAILWITH_LOCATION(exprLocation(range_node), "Unsupported constant type used in generalization.");
 
   if (!is_money_style(numeric_value_to_double(type, value)))
-    FAILWITH_LOCATION(get_simple_constant_location(range_node), "Generalization used in the query is not allowed in untrusted access level.");
+    FAILWITH_LOCATION(exprLocation(range_node), "Generalization used in the query is not allowed in untrusted access level.");
 }
 
 static void verify_generalization(Node *node, ParamListInfo bound_params)