Merge pull request #395 from diffix/edon/refactor

Simplify noise dummy aggs

Author: edongashi

pg_diffix--1.0.0.sql

@@ -11,6 +11,29 @@ DO $$ BEGIN
   EXECUTE 'ALTER DATABASE ' || current_database() || ' SET pg_diffix.salt TO ''' || gen_random_uuid() || '''';
 END $$ LANGUAGE plpgsql;
 
+/* ----------------------------------------------------------------
+ * Internal functions
+ * ----------------------------------------------------------------
+ */
+
+CREATE FUNCTION placeholder_func(anyelement)
+RETURNS anyelement
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT
+SECURITY INVOKER SET search_path = '';
+
+CREATE FUNCTION placeholder_func(anyelement, "any")
+RETURNS anyelement
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT
+SECURITY INVOKER SET search_path = '';
+
+CREATE FUNCTION internal_qual_wrapper(boolean)
+RETURNS boolean
+AS 'MODULE_PATHNAME'
+LANGUAGE C VOLATILE
+SECURITY INVOKER SET search_path = '';
+
 /* ----------------------------------------------------------------
  * Utilities
  * ----------------------------------------------------------------
@@ -159,71 +182,33 @@ AS 'MODULE_PATHNAME'
 LANGUAGE C STABLE
 SECURITY INVOKER SET search_path = '';
 
-
 /* ----------------------------------------------------------------
  * Non-anonymizing aggregators
  * ----------------------------------------------------------------
  */
 
-/*
- * Present here only to provide the proper signatures for the aggregators available
- * to the non-direct access users.
- */
-
-CREATE FUNCTION dummy_agg_noise_transfn(AnonAggState)
-RETURNS AnonAggState
-AS 'MODULE_PATHNAME'
-LANGUAGE C STABLE
-SECURITY INVOKER SET search_path = '';
-
-CREATE FUNCTION dummy_agg_noise_transfn(AnonAggState, value "any")
-RETURNS AnonAggState
-AS 'MODULE_PATHNAME'
-LANGUAGE C STABLE
-SECURITY INVOKER SET search_path = '';
-
-CREATE FUNCTION dummy_agg_noise_finalfn(AnonAggState)
-RETURNS float8
-AS 'MODULE_PATHNAME'
-LANGUAGE C STABLE
-SECURITY INVOKER SET search_path = '';
-
-CREATE FUNCTION dummy_agg_noise_finalfn(AnonAggState, value "any")
-RETURNS float8
-AS 'MODULE_PATHNAME'
-LANGUAGE C STABLE
-SECURITY INVOKER SET search_path = '';
-
 CREATE AGGREGATE count_noise(*) (
-  sfunc = dummy_agg_noise_transfn,
-  stype = AnonAggState,
-  finalfunc = dummy_agg_noise_finalfn,
-  finalfunc_extra = true,
-  finalfunc_modify = read_write
+  sfunc = placeholder_func,
+  stype = float8,
+  initcond = 0.0
 );
 
 CREATE AGGREGATE count_noise(value "any") (
-  sfunc = dummy_agg_noise_transfn,
-  stype = AnonAggState,
-  finalfunc = dummy_agg_noise_finalfn,
-  finalfunc_extra = true,
-  finalfunc_modify = read_write
+  sfunc = placeholder_func,
+  stype = float8,
+  initcond = 0.0
 );
 
 CREATE AGGREGATE sum_noise(value "any") (
-  sfunc = dummy_agg_noise_transfn,
-  stype = AnonAggState,
-  finalfunc = dummy_agg_noise_finalfn,
-  finalfunc_extra = true,
-  finalfunc_modify = read_write
+  sfunc = placeholder_func,
+  stype = float8,
+  initcond = 0.0
 );
 
 CREATE AGGREGATE avg_noise(value "any") (
-  sfunc = dummy_agg_noise_transfn,
-  stype = AnonAggState,
-  finalfunc = dummy_agg_noise_finalfn,
-  finalfunc_extra = true,
-  finalfunc_modify = read_write
+  sfunc = placeholder_func,
+  stype = float8,
+  initcond = 0.0
 );
 
 /* ----------------------------------------------------------------
@@ -314,24 +299,12 @@ CREATE AGGREGATE anon_sum_noise(value "any", variadic aids "any") (
  * ----------------------------------------------------------------
  */
 
-CREATE FUNCTION placeholder_func(anyelement)
-RETURNS anyelement
-AS 'MODULE_PATHNAME'
-LANGUAGE C IMMUTABLE STRICT
-SECURITY INVOKER SET search_path = '';
-
 CREATE AGGREGATE is_suppress_bin(*) (
   sfunc = placeholder_func,
   stype = boolean,
   initcond = false
 );
 
-CREATE FUNCTION internal_qual_wrapper(boolean)
-RETURNS boolean
-AS 'MODULE_PATHNAME'
-LANGUAGE C VOLATILE
-SECURITY INVOKER SET search_path = '';
-
 /* ----------------------------------------------------------------
  * Scalar functions
  * ----------------------------------------------------------------

src/aggregation/common.c

@@ -21,8 +21,6 @@ PG_FUNCTION_INFO_V1(anon_agg_state_input);
 PG_FUNCTION_INFO_V1(anon_agg_state_output);
 PG_FUNCTION_INFO_V1(anon_agg_state_transfn);
 PG_FUNCTION_INFO_V1(anon_agg_state_finalfn);
-PG_FUNCTION_INFO_V1(dummy_agg_noise_transfn);
-PG_FUNCTION_INFO_V1(dummy_agg_noise_finalfn);
 
 const AnonAggFuncs *find_agg_funcs(Oid oid)
 {
@@ -144,20 +142,6 @@ Datum anon_agg_state_finalfn(PG_FUNCTION_ARGS)
   PG_RETURN_AGG_STATE(state);
 }
 
-/* 
- * These functions should never be called except in `direct` access level. Non-anonymized `_noise` aggregators are to be
- * always rewritten to their anonymized versions. In `direct`, they return the true result: 0.0 noise.
- */
-Datum dummy_agg_noise_transfn(PG_FUNCTION_ARGS)
-{
-  PG_RETURN_AGG_STATE(0);
-}
-
-Datum dummy_agg_noise_finalfn(PG_FUNCTION_ARGS)
-{
-  PG_RETURN_AGG_STATE(0);
-}
-
 bool all_aids_null(NullableDatum *args, int aids_offset, int aids_count)
 {
   for (int aid_index = aids_offset; aid_index < aids_offset + aids_count; aid_index++)