Move src/backend/utils/hash/hashfn.c to src/common

This also involves renaming src/include/utils/hashutils.h, which
becomes src/include/common/hashfn.h. Perhaps an argument can be
made for keeping the hashutils.h name, but it seemed more
consistent to make it match the name of the file, and also more
descriptive of what is actually going on here.

Patch by me, reviewed by Suraj Kharage and Mark Dilger. Off-list
advice on how not to break the Windows build from Davinder Singh
and Amit Kapila.

Discussion: http://postgr.es/m/CA+TgmoaRiG4TXND8QuM6JXFRkM_1wL2ZNhzaUKsuec9-4yrkgw@mail.gmail.com

diff --git a/contrib/citext/citext.c b/contrib/citext/citext.c
index a4adafe89588ff8c9c3b12ca5bf23e371df24493..df139462a65da4557b583599e44d19e53eb965e3 100644 (file)
--- a/contrib/citext/citext.c
+++ b/contrib/citext/citext.c
@@ -4,9 +4,9 @@
 #include "postgres.h"
 
 #include "catalog/pg_collation.h"
+#include "common/hashfn.h"
 #include "utils/builtins.h"
 #include "utils/formatting.h"
-#include "utils/hashutils.h"
 #include "utils/varlena.h"
 
 PG_MODULE_MAGIC;

diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index 01e59beaa3020f744704d74493926fea22d1fc4a..fb1bb0681cca55dd794fc48b249b1bc3547fe035 100644 (file)
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -5,10 +5,10 @@
 
 #include "access/htup_details.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "funcapi.h"
 #include "hstore.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/memutils.h"
 
 /* old names for C functions */

diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index e0dbeebde3d8aba20e3a9a6bb6f2fa9147df2d2b..e4fda4b4049fae4b6e93733679ac78c95e9f3103 100644 (file)
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -62,6 +62,7 @@
 #include <unistd.h>
 
 #include "catalog/pg_authid.h"
+#include "common/hashfn.h"
 #include "executor/instrument.h"
 #include "funcapi.h"
 #include "mb/pg_wchar.h"
@@ -77,7 +78,6 @@
 #include "tcop/utility.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/memutils.h"
 
 PG_MODULE_MAGIC;

diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index d3723768a6635bdde95f744073afa60e72af1c66..639a52c5567b0d69171fb1a549db56ac4f3e96f5 100644 (file)
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -14,10 +14,10 @@
 
 #include "catalog/pg_proc.h"
 #include "commands/seclabel.h"
+#include "common/hashfn.h"
 #include "sepgsql.h"
 #include "storage/ipc.h"
 #include "utils/guc.h"
-#include "utils/hashutils.h"
 #include "utils/memutils.h"
 
 /*

diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 00bb4cb53d9476894d8846fe73e5eb227533890d..28835512f0089243dca2d9ed9946c60293263c87 100644 (file)
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -23,12 +23,12 @@
 #include "access/tupdesc_details.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "miscadmin.h"
 #include "parser/parse_type.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
-#include "utils/hashutils.h"
 #include "utils/resowner_private.h"
 #include "utils/syscache.h"
 

diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index 5b517106ff427e71ec64b7ce32d6bc7a85047389..a8498226e32d742142975af780d5ce6aa64401d9 100644 (file)
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -28,8 +28,8 @@
 
 #include "access/hash.h"
 #include "catalog/pg_collation.h"
+#include "common/hashfn.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/pg_locale.h"
 
 /*

diff --git a/src/backend/access/tablesample/bernoulli.c b/src/backend/access/tablesample/bernoulli.c
index 46016fb5de6a2dd6b7aedd0f1c2f13079782e852..606730d6cbe85785c7f0af3cde0daf299274ff40 100644 (file)
--- a/src/backend/access/tablesample/bernoulli.c
+++ b/src/backend/access/tablesample/bernoulli.c
@@ -28,9 +28,9 @@
 
 #include "access/tsmapi.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "optimizer/optimizer.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 
 
 /* Private state */

diff --git a/src/backend/access/tablesample/system.c b/src/backend/access/tablesample/system.c
index 8a5f03bfd3e01055931de19075807ba6e16bb6f0..29b7c0d3c284d926d6d2b80a75cf3c03e815e3b7 100644 (file)
--- a/src/backend/access/tablesample/system.c
+++ b/src/backend/access/tablesample/system.c
@@ -29,9 +29,9 @@
 #include "access/relscan.h"
 #include "access/tsmapi.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "optimizer/optimizer.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 
 
 /* Private state */

diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 9aa2b61600e04715f47b1622a1fd65d76abdc362..dae939a4ab8f9d8c4d0004d7986b69bd40fe6b51 100644 (file)
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -126,6 +126,7 @@
 #include "access/xact.h"
 #include "catalog/pg_database.h"
 #include "commands/async.h"
+#include "common/hashfn.h"
 #include "funcapi.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
@@ -138,7 +139,6 @@
 #include "storage/sinval.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/snapmgr.h"

diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index de0205f4fcdcd902c611eaaccebbd16089555f87..f6c3e4cbde4ff67dfdec977f8c356424b89f838c 100644 (file)
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -19,9 +19,9 @@
 #include "postgres.h"
 
 #include "access/parallel.h"
+#include "common/hashfn.h"
 #include "executor/executor.h"
 #include "miscadmin.h"
-#include "utils/hashutils.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 

diff --git a/src/backend/lib/bloomfilter.c b/src/backend/lib/bloomfilter.c
index 29b62e70e41089995422e6db005304852525a7f0..f040e83c01629e149148dff344ea6aaaff9b36e9 100644 (file)
--- a/src/backend/lib/bloomfilter.c
+++ b/src/backend/lib/bloomfilter.c
@@ -35,9 +35,9 @@
 
 #include <math.h>
 
+#include "common/hashfn.h"
 #include "lib/bloomfilter.h"
 #include "port/pg_bitutils.h"
-#include "utils/hashutils.h"
 
 #define MAX_HASH_FUNCS         10
 

diff --git a/src/backend/lib/dshash.c b/src/backend/lib/dshash.c
index 5e0167d9b0801ae4ad2e2f08c95b91470fa8c36a..78ccf03217fe154e1608706bcca61c7157d414f3 100644 (file)
--- a/src/backend/lib/dshash.c
+++ b/src/backend/lib/dshash.c
@@ -31,11 +31,11 @@
 
 #include "postgres.h"
 
+#include "common/hashfn.h"
 #include "lib/dshash.h"
 #include "storage/ipc.h"
 #include "storage/lwlock.h"
 #include "utils/dsa.h"
-#include "utils/hashutils.h"
 #include "utils/memutils.h"
 
 /*

diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c
index f711e6c69953b64def86738197e627d2e8ad49b0..2719ea45a3eb52ceab008f522699568299d8bbf4 100644 (file)
--- a/src/backend/nodes/bitmapset.c
+++ b/src/backend/nodes/bitmapset.c
@@ -20,10 +20,10 @@
  */
 #include "postgres.h"
 
+#include "common/hashfn.h"
 #include "nodes/bitmapset.h"
 #include "nodes/pg_list.h"
 #include "port/pg_bitutils.h"
-#include "utils/hashutils.h"
 
 
 #define WORDNUM(x)     ((x) / BITS_PER_BITMAPWORD)

diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c
index e102589e7460c1cf9fbdb2abb25c1a4fdd99d837..ad4e071ca3b567d4ff7af50337dc26fc05f14c34 100644 (file)
--- a/src/backend/nodes/tidbitmap.c
+++ b/src/backend/nodes/tidbitmap.c
@@ -41,11 +41,11 @@
 #include <limits.h>
 
 #include "access/htup_details.h"
+#include "common/hashfn.h"
 #include "nodes/bitmapset.h"
 #include "nodes/tidbitmap.h"
 #include "storage/lwlock.h"
 #include "utils/dsa.h"
-#include "utils/hashutils.h"
 
 /*
  * The maximum number of tuples per page is not large (typically 256 with

diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 54eb83a0d1ac99e4d7740dff60621d8efc10109f..35953f23facafb82a276e166c92d44907f8fcf53 100644 (file)
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -21,6 +21,7 @@
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_type.h"
 #include "commands/tablecmds.h"
+#include "common/hashfn.h"
 #include "executor/executor.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
@@ -32,7 +33,6 @@
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/fmgroids.h"
-#include "utils/hashutils.h"
 #include "utils/lsyscache.h"
 #include "utils/partcache.h"
 #include "utils/ruleutils.h"

diff --git a/src/backend/storage/file/sharedfileset.c b/src/backend/storage/file/sharedfileset.c
index 6666a25521f385110b87e961a7bc0ac758b34ca6..f7206c9175f38d1c4ed2eeafd7462c7fa5276ee0 100644 (file)
--- a/src/backend/storage/file/sharedfileset.c
+++ b/src/backend/storage/file/sharedfileset.c
@@ -22,11 +22,11 @@
 
 #include "catalog/pg_tablespace.h"
 #include "commands/tablespace.h"
+#include "common/hashfn.h"
 #include "miscadmin.h"
 #include "storage/dsm.h"
 #include "storage/sharedfileset.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 
 static void SharedFileSetOnDetach(dsm_segment *segment, Datum datum);
 static void SharedFileSetPath(char *path, SharedFileSet *fileset, Oid tablespace);

diff --git a/src/backend/tsearch/ts_typanalyze.c b/src/backend/tsearch/ts_typanalyze.c
index 24c6479f6153d0a6c3dbd2be650bad7ede404bda..2eed0cd137c5e12a7a187e6e610cd398edec1d35 100644 (file)
--- a/src/backend/tsearch/ts_typanalyze.c
+++ b/src/backend/tsearch/ts_typanalyze.c
@@ -16,9 +16,9 @@
 #include "catalog/pg_collation.h"
 #include "catalog/pg_operator.h"
 #include "commands/vacuum.h"
+#include "common/hashfn.h"
 #include "tsearch/ts_type.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 
 
 /* A hash key for lexemes */

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index cc4170efbf260ea9f4036b793256aa208c2dafce..bce1f1e0b16cc5137556d1517363218d532bf4e7 100644 (file)
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -26,6 +26,7 @@
 #include "commands/dbcommands.h"
 #include "commands/proclang.h"
 #include "commands/tablespace.h"
+#include "common/hashfn.h"
 #include "foreign/foreign.h"
 #include "funcapi.h"
 #include "lib/qunique.h"
@@ -34,7 +35,6 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
-#include "utils/hashutils.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"

diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 393ee991b06e0f9931b6df3e3d461261478fe68b..0c55b68fbf63181191e7b7a93c3a5abc52d8ae17 100644 (file)
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -21,6 +21,7 @@
 #include <time.h>
 
 #include "access/xact.h"
+#include "common/hashfn.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
 #include "nodes/supportnodes.h"
@@ -29,7 +30,6 @@
 #include "utils/builtins.h"
 #include "utils/date.h"
 #include "utils/datetime.h"
-#include "utils/hashutils.h"
 #include "utils/sortsupport.h"
 
 /*

diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c
index 72a88121d5ac49fbc5ea7f4c310dad3f75e47021..63122edf2e4c49c10e2312dce667b5833210fb18 100644 (file)
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@ -63,9 +63,9 @@
 #include "access/stratnum.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/jsonb.h"
 #include "utils/jsonpath.h"
 #include "utils/varlena.h"

diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index edec657cd3ceaadfc3e26e3dd6d4a1057f9cf4bd..04b70c805b44a220a60a1f9363cb0b08702d29f0 100644 (file)
--- a/src/backend/utils/adt/jsonb_util.c
+++ b/src/backend/utils/adt/jsonb_util.c
@@ -15,11 +15,11 @@
 
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "common/jsonapi.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/datetime.h"
-#include "utils/hashutils.h"
 #include "utils/json.h"
 #include "utils/jsonb.h"
 #include "utils/memutils.h"

diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index f9eb0b57d8b8d17abe3cb93486e2b09a4c0972a8..8aeddc686326cd4fe3260be0d5a1718774ff1a34 100644 (file)
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -13,12 +13,12 @@
 
 #include "postgres.h"
 
+#include "common/hashfn.h"
 #include "lib/hyperloglog.h"
 #include "libpq/pqformat.h"
 #include "port/pg_bswap.h"
 #include "utils/builtins.h"
 #include "utils/guc.h"
-#include "utils/hashutils.h"
 #include "utils/inet.h"
 #include "utils/sortsupport.h"
 

diff --git a/src/backend/utils/adt/mac8.c b/src/backend/utils/adt/mac8.c
index 571eee920fdc05d9c6c7002e821a9d78dc50850b..b7b2968b926c9e15f2019e16bde2e64f1a443304 100644 (file)
--- a/src/backend/utils/adt/mac8.c
+++ b/src/backend/utils/adt/mac8.c
@@ -21,9 +21,9 @@
 
 #include "postgres.h"
 
+#include "common/hashfn.h"
 #include "libpq/pqformat.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/inet.h"
 
 /*

diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index a6dd8b75aa279520f8af446349c028af1b098266..0ab54316f8eaf2dcebbe779fee0fe6355e452a23 100644 (file)
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -15,6 +15,7 @@
 #include "access/stratnum.h"
 #include "catalog/pg_opfamily.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "common/ip.h"
 #include "lib/hyperloglog.h"
 #include "libpq/libpq-be.h"
@@ -26,7 +27,6 @@
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/guc.h"
-#include "utils/hashutils.h"
 #include "utils/inet.h"
 #include "utils/lsyscache.h"
 #include "utils/sortsupport.h"

diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index c92ad5a4fe06318df431bfefae5a35e0fa313464..bd00f23b9464e189775592a14ff457cc2cdba58f 100644 (file)
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -27,6 +27,7 @@
 #include <math.h>
 
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "common/int.h"
 #include "funcapi.h"
 #include "lib/hyperloglog.h"
@@ -38,7 +39,6 @@
 #include "utils/builtins.h"
 #include "utils/float.h"
 #include "utils/guc.h"
-#include "utils/hashutils.h"
 #include "utils/int8.h"
 #include "utils/numeric.h"
 #include "utils/sortsupport.h"

diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
index 639e1dad6c2b3e0c02e75b6ae30a386731e26837..b95132b714869d260b611d6f284ba4d1eee9163f 100644 (file)
--- a/src/backend/utils/adt/rangetypes.c
+++ b/src/backend/utils/adt/rangetypes.c
@@ -31,12 +31,12 @@
 #include "postgres.h"
 
 #include "access/tupmacs.h"
+#include "common/hashfn.h"
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/date.h"
-#include "utils/hashutils.h"
 #include "utils/int8.h"
 #include "utils/lsyscache.h"
 #include "utils/rangetypes.h"

diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index fad20577543781ab634cb3651f6512e4f79d4eba..4ce8375eab70fb2eb6ca521a59942b4c1b2e9da9 100644 (file)
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -25,12 +25,12 @@
 #include "access/tableam.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
 #include "parser/parsetree.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
 #include "utils/varlena.h"

diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c
index 4abd861dd72a4ad93e981c542fb6b11bcf64d8ae..c906ee789d92fba1bc670ac9b84e3a57228a7baf 100644 (file)
--- a/src/backend/utils/adt/uuid.c
+++ b/src/backend/utils/adt/uuid.c
@@ -13,12 +13,12 @@
 
 #include "postgres.h"
 
+#include "common/hashfn.h"
 #include "lib/hyperloglog.h"
 #include "libpq/pqformat.h"
 #include "port/pg_bswap.h"
 #include "utils/builtins.h"
 #include "utils/guc.h"
-#include "utils/hashutils.h"
 #include "utils/sortsupport.h"
 #include "utils/uuid.h"
 

diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 1e1239a1ba9402575136af6bc8c63d0d0af99da7..39acfdff6c1d905ad544cf37d05d11dab82e384a 100644 (file)
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -17,13 +17,13 @@
 #include "access/detoast.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "libpq/pqformat.h"
 #include "mb/pg_wchar.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/supportnodes.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/hashutils.h"
 #include "utils/lsyscache.h"
 #include "utils/pg_locale.h"
 #include "utils/varlena.h"

diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 875b02d64394b07afd14d914e6183454f53c72fa..18900e0f1ea56ebe001bef3a5d1579de2f5353b5 100644 (file)
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -20,6 +20,7 @@
 #include "access/detoast.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "common/int.h"
 #include "lib/hyperloglog.h"
 #include "libpq/pqformat.h"
@@ -29,7 +30,6 @@
 #include "regex/regex.h"
 #include "utils/builtins.h"
 #include "utils/bytea.h"
-#include "utils/hashutils.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/pg_locale.h"

diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 64776e3209213ef0279f9b962e8e963bf6fcff42..3613ae5f44d3d2ad1b8b603afe7605a614207e06 100644 (file)
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -24,6 +24,7 @@
 #include "catalog/pg_collation.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
+#include "common/hashfn.h"
 #include "miscadmin.h"
 #ifdef CATCACHE_STATS
 #include "storage/ipc.h"               /* for on_proc_exit */
@@ -32,7 +33,6 @@
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/fmgroids.h"
-#include "utils/hashutils.h"
 #include "utils/inval.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"

diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile
index fc7b165f7fc55b5b6b6544d22c633001dc6b09f1..d4c1210e36faf06a1d502fa2a73dcc2f3a4fa6a9 100644 (file)
--- a/src/backend/utils/hash/Makefile
+++ b/src/backend/utils/hash/Makefile
@@ -14,7 +14,6 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = \
        dynahash.o \
-       hashfn.o \
        pg_crc.o
 
 include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index d245e1aa12ceeb8e7cea732b69fc2a3d00c861ff..b5381958e70bc84fd55dbf35cf7eabd16033b420 100644 (file)
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -86,10 +86,10 @@
 #include <limits.h>
 
 #include "access/xact.h"
+#include "common/hashfn.h"
 #include "storage/shmem.h"
 #include "storage/spin.h"
 #include "utils/dynahash.h"
-#include "utils/hashutils.h"
 #include "utils/memutils.h"
 
 

diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c
index ac6f226f59f3999b9040538e6f0c914a808226a1..3c39e48825a8d24cc07d507488158e1be924451d 100644 (file)
--- a/src/backend/utils/resowner/resowner.c
+++ b/src/backend/utils/resowner/resowner.c
@@ -20,12 +20,12 @@
  */
 #include "postgres.h"
 
+#include "common/hashfn.h"
 #include "jit/jit.h"
 #include "storage/bufmgr.h"
 #include "storage/ipc.h"
 #include "storage/predicate.h"
 #include "storage/proc.h"
-#include "utils/hashutils.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/resowner_private.h"

diff --git a/src/common/Makefile b/src/common/Makefile
index ab98f4faafb0bf8aa77a449e60ab984b82b25bed..ce01df68b975ec3ba4d4e2e29d235c2663774c9f 100644 (file)
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -54,6 +54,7 @@ OBJS_COMMON = \
        exec.o \
        f2s.o \
        file_perm.o \
+       hashfn.o \
        ip.o \
        jsonapi.o \
        keywords.o \

diff --git a/src/backend/utils/hash/hashfn.c b/src/common/hashfn.c
similarity index 99%
rename from src/backend/utils/hash/hashfn.c
rename to src/common/hashfn.c
index ecc52014afbce9d83decbe4254369bfdaff26559..990f18e610b8cccb6f73729a00037e1503eb41ef 100644 (file)
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/common/hashfn.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *       src/backend/utils/hash/hashfn.c
+ *       src/common/hashfn.c
  *
  * NOTES
  *       It is expected that every bit of a hash function's 32-bit result is
@@ -23,7 +23,7 @@
  */
 #include "postgres.h"
 
-#include "utils/hashutils.h"
+#include "common/hashfn.h"
 
 
 /*

diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 9fc0696096afe02dcb6109c325242ab1b98c6e9f..2707e1924b9b7a564a100c91a98cc451ed25a879 100644 (file)
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -21,10 +21,10 @@
 #include "access/itup.h"
 #include "access/sdir.h"
 #include "catalog/pg_am_d.h"
+#include "common/hashfn.h"
 #include "lib/stringinfo.h"
 #include "storage/bufmgr.h"
 #include "storage/lockdefs.h"
-#include "utils/hashutils.h"
 #include "utils/hsearch.h"
 #include "utils/relcache.h"
 

diff --git a/src/include/utils/hashutils.h b/src/include/common/hashfn.h
similarity index 97%
rename from src/include/utils/hashutils.h
rename to src/include/common/hashfn.h
index ba3ecb7592561a641817ff0baad7e13994928ff6..6ecc864f840ec89ff3280ceb151452398982416b 100644 (file)
--- a/src/include/utils/hashutils.h
+++ b/src/include/common/hashfn.h
@@ -4,8 +4,8 @@
  * Portions Copyright (c) 2017-2020, PostgreSQL Global Development Group
  */
 
-#ifndef HASHUTILS_H
-#define HASHUTILS_H
+#ifndef HASHFN_H
+#define HASHFN_H
 
 
 /*
@@ -101,4 +101,4 @@ murmurhash32(uint32 data)
        return h;
 }
 
-#endif                                                 /* HASHUTILS_H */
+#endif                                                 /* HASHFN_H */

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 727a8fdec9b28492179ce4b8c25ee66868f5dd9d..834c2c39d18bf4072c70c90764c55feb3162fb25 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -120,7 +120,7 @@ sub mkvcbuild
 
        our @pgcommonallfiles = qw(
          base64.c config_info.c controldata_utils.c d2s.c encnames.c exec.c
-         f2s.c file_perm.c ip.c jsonapi.c
+         f2s.c file_perm.c hashfn.c ip.c jsonapi.c
          keywords.c kwlookup.c link-canary.c md5.c
          pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c
          saslprep.c scram-common.c string.c stringinfo.c unicode_norm.c username.c