Skip to content

Commit 05d8449

Browse files
robertmhaasrobertmhaas
committed
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
1 parent 008cf04 commit 05d8449

File tree

39 files changed

+41
-41
lines changed

39 files changed

+41
-41
lines changed

‎contrib/citext/citext.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#include "postgres.h"
55

66
#include "catalog/pg_collation.h"
7+
#include "common/hashfn.h"
78
#include "utils/builtins.h"
89
#include "utils/formatting.h"
9-
#include "utils/hashutils.h"
1010
#include "utils/varlena.h"
1111

1212
PG_MODULE_MAGIC;

‎contrib/hstore/hstore_op.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
#include "access/htup_details.h"
77
#include "catalog/pg_type.h"
8+
#include "common/hashfn.h"
89
#include "funcapi.h"
910
#include "hstore.h"
1011
#include "utils/builtins.h"
11-
#include "utils/hashutils.h"
1212
#include "utils/memutils.h"
1313

1414
/* old names for C functions */

‎contrib/pg_stat_statements/pg_stat_statements.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
#include <unistd.h>
6363

6464
#include "catalog/pg_authid.h"
65+
#include "common/hashfn.h"
6566
#include "executor/instrument.h"
6667
#include "funcapi.h"
6768
#include "mb/pg_wchar.h"
@@ -77,7 +78,6 @@
7778
#include "tcop/utility.h"
7879
#include "utils/acl.h"
7980
#include "utils/builtins.h"
80-
#include "utils/hashutils.h"
8181
#include "utils/memutils.h"
8282

8383
PG_MODULE_MAGIC;

‎contrib/sepgsql/uavc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
#include "catalog/pg_proc.h"
1616
#include "commands/seclabel.h"
17+
#include "common/hashfn.h"
1718
#include "sepgsql.h"
1819
#include "storage/ipc.h"
1920
#include "utils/guc.h"
20-
#include "utils/hashutils.h"
2121
#include "utils/memutils.h"
2222

2323
/*

‎src/backend/access/common/tupdesc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
#include "access/tupdesc_details.h"
2424
#include "catalog/pg_collation.h"
2525
#include "catalog/pg_type.h"
26+
#include "common/hashfn.h"
2627
#include "miscadmin.h"
2728
#include "parser/parse_type.h"
2829
#include "utils/acl.h"
2930
#include "utils/builtins.h"
3031
#include "utils/datum.h"
31-
#include "utils/hashutils.h"
3232
#include "utils/resowner_private.h"
3333
#include "utils/syscache.h"
3434

‎src/backend/access/hash/hashfunc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
#include "access/hash.h"
3030
#include "catalog/pg_collation.h"
31+
#include "common/hashfn.h"
3132
#include "utils/builtins.h"
32-
#include "utils/hashutils.h"
3333
#include "utils/pg_locale.h"
3434

3535
/*

‎src/backend/access/tablesample/bernoulli.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
#include "access/tsmapi.h"
3030
#include "catalog/pg_type.h"
31+
#include "common/hashfn.h"
3132
#include "optimizer/optimizer.h"
3233
#include "utils/builtins.h"
33-
#include "utils/hashutils.h"
3434

3535

3636
/* Private state */

‎src/backend/access/tablesample/system.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include "access/relscan.h"
3030
#include "access/tsmapi.h"
3131
#include "catalog/pg_type.h"
32+
#include "common/hashfn.h"
3233
#include "optimizer/optimizer.h"
3334
#include "utils/builtins.h"
34-
#include "utils/hashutils.h"
3535

3636

3737
/* Private state */

‎src/backend/commands/async.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
#include "access/xact.h"
127127
#include "catalog/pg_database.h"
128128
#include "commands/async.h"
129+
#include "common/hashfn.h"
129130
#include "funcapi.h"
130131
#include "libpq/libpq.h"
131132
#include "libpq/pqformat.h"
@@ -138,7 +139,6 @@
138139
#include "storage/sinval.h"
139140
#include "tcop/tcopprot.h"
140141
#include "utils/builtins.h"
141-
#include "utils/hashutils.h"
142142
#include "utils/memutils.h"
143143
#include "utils/ps_status.h"
144144
#include "utils/snapmgr.h"

‎src/backend/executor/execGrouping.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#include "postgres.h"
2020

2121
#include "access/parallel.h"
22+
#include "common/hashfn.h"
2223
#include "executor/executor.h"
2324
#include "miscadmin.h"
24-
#include "utils/hashutils.h"
2525
#include "utils/lsyscache.h"
2626
#include "utils/memutils.h"
2727

‎src/backend/lib/bloomfilter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535

3636
#include <math.h>
3737

38+
#include "common/hashfn.h"
3839
#include "lib/bloomfilter.h"
3940
#include "port/pg_bitutils.h"
40-
#include "utils/hashutils.h"
4141

4242
#define MAX_HASH_FUNCS 10
4343

‎src/backend/lib/dshash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131

3232
#include "postgres.h"
3333

34+
#include "common/hashfn.h"
3435
#include "lib/dshash.h"
3536
#include "storage/ipc.h"
3637
#include "storage/lwlock.h"
3738
#include "utils/dsa.h"
38-
#include "utils/hashutils.h"
3939
#include "utils/memutils.h"
4040

4141
/*

‎src/backend/nodes/bitmapset.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
*/
2121
#include "postgres.h"
2222

23+
#include "common/hashfn.h"
2324
#include "nodes/bitmapset.h"
2425
#include "nodes/pg_list.h"
2526
#include "port/pg_bitutils.h"
26-
#include "utils/hashutils.h"
2727

2828

2929
#define WORDNUM(x) ((x) / BITS_PER_BITMAPWORD)

‎src/backend/nodes/tidbitmap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
#include <limits.h>
4242

4343
#include "access/htup_details.h"
44+
#include "common/hashfn.h"
4445
#include "nodes/bitmapset.h"
4546
#include "nodes/tidbitmap.h"
4647
#include "storage/lwlock.h"
4748
#include "utils/dsa.h"
48-
#include "utils/hashutils.h"
4949

5050
/*
5151
* The maximum number of tuples per page is not large (typically 256 with

‎src/backend/partitioning/partbounds.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "catalog/pg_inherits.h"
2222
#include "catalog/pg_type.h"
2323
#include "commands/tablecmds.h"
24+
#include "common/hashfn.h"
2425
#include "executor/executor.h"
2526
#include "miscadmin.h"
2627
#include "nodes/makefuncs.h"
@@ -32,7 +33,6 @@
3233
#include "utils/builtins.h"
3334
#include "utils/datum.h"
3435
#include "utils/fmgroids.h"
35-
#include "utils/hashutils.h"
3636
#include "utils/lsyscache.h"
3737
#include "utils/partcache.h"
3838
#include "utils/ruleutils.h"

‎src/backend/storage/file/sharedfileset.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
#include "catalog/pg_tablespace.h"
2424
#include "commands/tablespace.h"
25+
#include "common/hashfn.h"
2526
#include "miscadmin.h"
2627
#include "storage/dsm.h"
2728
#include "storage/sharedfileset.h"
2829
#include "utils/builtins.h"
29-
#include "utils/hashutils.h"
3030

3131
static void SharedFileSetOnDetach(dsm_segment *segment, Datum datum);
3232
static void SharedFileSetPath(char *path, SharedFileSet *fileset, Oid tablespace);

‎src/backend/tsearch/ts_typanalyze.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include "catalog/pg_collation.h"
1717
#include "catalog/pg_operator.h"
1818
#include "commands/vacuum.h"
19+
#include "common/hashfn.h"
1920
#include "tsearch/ts_type.h"
2021
#include "utils/builtins.h"
21-
#include "utils/hashutils.h"
2222

2323

2424
/* A hash key for lexemes */

‎src/backend/utils/adt/acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "commands/dbcommands.h"
2727
#include "commands/proclang.h"
2828
#include "commands/tablespace.h"
29+
#include "common/hashfn.h"
2930
#include "foreign/foreign.h"
3031
#include "funcapi.h"
3132
#include "lib/qunique.h"
@@ -34,7 +35,6 @@
3435
#include "utils/array.h"
3536
#include "utils/builtins.h"
3637
#include "utils/catcache.h"
37-
#include "utils/hashutils.h"
3838
#include "utils/inval.h"
3939
#include "utils/lsyscache.h"
4040
#include "utils/memutils.h"

‎src/backend/utils/adt/date.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <time.h>
2222

2323
#include "access/xact.h"
24+
#include "common/hashfn.h"
2425
#include "libpq/pqformat.h"
2526
#include "miscadmin.h"
2627
#include "nodes/supportnodes.h"
@@ -29,7 +30,6 @@
2930
#include "utils/builtins.h"
3031
#include "utils/date.h"
3132
#include "utils/datetime.h"
32-
#include "utils/hashutils.h"
3333
#include "utils/sortsupport.h"
3434

3535
/*

‎src/backend/utils/adt/jsonb_gin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
#include "access/stratnum.h"
6464
#include "catalog/pg_collation.h"
6565
#include "catalog/pg_type.h"
66+
#include "common/hashfn.h"
6667
#include "miscadmin.h"
6768
#include "utils/builtins.h"
68-
#include "utils/hashutils.h"
6969
#include "utils/jsonb.h"
7070
#include "utils/jsonpath.h"
7171
#include "utils/varlena.h"

‎src/backend/utils/adt/jsonb_util.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
#include "catalog/pg_collation.h"
1717
#include "catalog/pg_type.h"
18+
#include "common/hashfn.h"
1819
#include "common/jsonapi.h"
1920
#include "miscadmin.h"
2021
#include "utils/builtins.h"
2122
#include "utils/datetime.h"
22-
#include "utils/hashutils.h"
2323
#include "utils/json.h"
2424
#include "utils/jsonb.h"
2525
#include "utils/memutils.h"

‎src/backend/utils/adt/mac.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
#include "postgres.h"
1515

16+
#include "common/hashfn.h"
1617
#include "lib/hyperloglog.h"
1718
#include "libpq/pqformat.h"
1819
#include "port/pg_bswap.h"
1920
#include "utils/builtins.h"
2021
#include "utils/guc.h"
21-
#include "utils/hashutils.h"
2222
#include "utils/inet.h"
2323
#include "utils/sortsupport.h"
2424

‎src/backend/utils/adt/mac8.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include "postgres.h"
2323

24+
#include "common/hashfn.h"
2425
#include "libpq/pqformat.h"
2526
#include "utils/builtins.h"
26-
#include "utils/hashutils.h"
2727
#include "utils/inet.h"
2828

2929
/*

‎src/backend/utils/adt/network.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "access/stratnum.h"
1616
#include "catalog/pg_opfamily.h"
1717
#include "catalog/pg_type.h"
18+
#include "common/hashfn.h"
1819
#include "common/ip.h"
1920
#include "lib/hyperloglog.h"
2021
#include "libpq/libpq-be.h"
@@ -26,7 +27,6 @@
2627
#include "utils/builtins.h"
2728
#include "utils/fmgroids.h"
2829
#include "utils/guc.h"
29-
#include "utils/hashutils.h"
3030
#include "utils/inet.h"
3131
#include "utils/lsyscache.h"
3232
#include "utils/sortsupport.h"

‎src/backend/utils/adt/numeric.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <math.h>
2828

2929
#include "catalog/pg_type.h"
30+
#include "common/hashfn.h"
3031
#include "common/int.h"
3132
#include "funcapi.h"
3233
#include "lib/hyperloglog.h"
@@ -38,7 +39,6 @@
3839
#include "utils/builtins.h"
3940
#include "utils/float.h"
4041
#include "utils/guc.h"
41-
#include "utils/hashutils.h"
4242
#include "utils/int8.h"
4343
#include "utils/numeric.h"
4444
#include "utils/sortsupport.h"

‎src/backend/utils/adt/rangetypes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
#include "postgres.h"
3232

3333
#include "access/tupmacs.h"
34+
#include "common/hashfn.h"
3435
#include "lib/stringinfo.h"
3536
#include "libpq/pqformat.h"
3637
#include "miscadmin.h"
3738
#include "utils/builtins.h"
3839
#include "utils/date.h"
39-
#include "utils/hashutils.h"
4040
#include "utils/int8.h"
4141
#include "utils/lsyscache.h"
4242
#include "utils/rangetypes.h"

‎src/backend/utils/adt/tid.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
#include "access/tableam.h"
2626
#include "catalog/namespace.h"
2727
#include "catalog/pg_type.h"
28+
#include "common/hashfn.h"
2829
#include "libpq/pqformat.h"
2930
#include "miscadmin.h"
3031
#include "parser/parsetree.h"
3132
#include "utils/acl.h"
3233
#include "utils/builtins.h"
33-
#include "utils/hashutils.h"
3434
#include "utils/rel.h"
3535
#include "utils/snapmgr.h"
3636
#include "utils/varlena.h"

‎src/backend/utils/adt/uuid.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
#include "postgres.h"
1515

16+
#include "common/hashfn.h"
1617
#include "lib/hyperloglog.h"
1718
#include "libpq/pqformat.h"
1819
#include "port/pg_bswap.h"
1920
#include "utils/builtins.h"
2021
#include "utils/guc.h"
21-
#include "utils/hashutils.h"
2222
#include "utils/sortsupport.h"
2323
#include "utils/uuid.h"
2424

‎src/backend/utils/adt/varchar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#include "access/detoast.h"
1818
#include "catalog/pg_collation.h"
1919
#include "catalog/pg_type.h"
20+
#include "common/hashfn.h"
2021
#include "libpq/pqformat.h"
2122
#include "mb/pg_wchar.h"
2223
#include "nodes/nodeFuncs.h"
2324
#include "nodes/supportnodes.h"
2425
#include "utils/array.h"
2526
#include "utils/builtins.h"
26-
#include "utils/hashutils.h"
2727
#include "utils/lsyscache.h"
2828
#include "utils/pg_locale.h"
2929
#include "utils/varlena.h"

‎src/backend/utils/adt/varlena.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "access/detoast.h"
2121
#include "catalog/pg_collation.h"
2222
#include "catalog/pg_type.h"
23+
#include "common/hashfn.h"
2324
#include "common/int.h"
2425
#include "lib/hyperloglog.h"
2526
#include "libpq/pqformat.h"
@@ -29,7 +30,6 @@
2930
#include "regex/regex.h"
3031
#include "utils/builtins.h"
3132
#include "utils/bytea.h"
32-
#include "utils/hashutils.h"
3333
#include "utils/lsyscache.h"
3434
#include "utils/memutils.h"
3535
#include "utils/pg_locale.h"

0 commit comments

Comments
 (0)