Rename function for reducing a hash set to a seed.

Author: cristianberneanu

pg_diffix/aggregation/noise.h

@@ -3,8 +3,6 @@
 
 #include "pg_diffix/utils.h"
 
-typedef hash_t seed_t;
-
 /*
  * Returns a uniform integer in the positive interval [min, max] for the given seed and step name.
  */

pg_diffix/utils.h

@@ -21,6 +21,7 @@
  */
 
 typedef uint64 hash_t;
+typedef hash_t seed_t;
 
 static inline hash_t hash_bytes(const void *bytes, size_t size)
 {
@@ -66,7 +67,7 @@ static inline List *hash_set_add(List *hash_set, hash_t hash)
   return list_append_unique_ptr(hash_set, (void *)hash);
 }
 
-extern hash_t hash_set_combine(const List *hash_set);
+extern seed_t hash_set_to_seed(const List *hash_set);
 
 static inline List *hash_set_union(List *dst_set, const List *src_set)
 {

src/aggregation/count_distinct.c

@@ -87,7 +87,7 @@ static bool aid_set_is_high_count(seed_t bucket_seed, const List *aid_values_set
   if (list_length(aid_values_set) < g_config.low_count_min_threshold)
     return false; /* Fewer AID values than minimum threshold, value is low-count. */
 
-  seed_t aid_seed = hash_set_combine(aid_values_set);
+  seed_t aid_seed = hash_set_to_seed(aid_values_set);
 
   seed_t seeds[] = {bucket_seed, aid_seed};
   int threshold = generate_lcf_threshold(seeds, ARRAY_LENGTH(seeds));

src/query/anonymization.c

@@ -490,7 +490,7 @@ static void prepare_bucket_seeds(Query *query)
     seed_material_hash_set = hash_set_add(seed_material_hash_set, seed_material_hash);
   }
 
-  g_sql_seed = hash_set_combine(seed_material_hash_set);
+  g_sql_seed = hash_set_to_seed(seed_material_hash_set);
 
   list_free(seed_material_hash_set);
 }
@@ -576,7 +576,7 @@ seed_t compute_bucket_seed(const Bucket *bucket, const BucketDescriptor *bucket_
     label_hash_set = hash_set_add(label_hash_set, label_hash);
   }
 
-  seed_t bucket_seed = g_sql_seed ^ hash_set_combine(label_hash_set);
+  seed_t bucket_seed = g_sql_seed ^ hash_set_to_seed(label_hash_set);
 
   list_free(label_hash_set);
 

src/utils.c

@@ -10,10 +10,10 @@
 
 #include "pg_diffix/utils.h"
 
-hash_t hash_set_combine(const List *hash_set)
+seed_t hash_set_to_seed(const List *hash_set)
 {
   ListCell *cell = NULL;
-  hash_t accumulator = 0;
+  seed_t accumulator = 0;
   foreach (cell, hash_set)
   {
     hash_t hash = (hash_t)lfirst(cell);