8000 Move code in pg_tde_shmem.h to pg_tde.h · percona/postgres@5e3e1c0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5e3e1c0

Browse files
jeltzjeltz
committed
Move code in pg_tde_shmem.h to pg_tde.h
Now that we have removed our shared memory tools the remaining contents of the header can be moved elsewhere.
1 parent aee94d1 commit 5e3e1c0

File tree

8 files changed

+12
-50
lines changed

8 files changed

+12
-50
lines changed

‎contrib/pg_tde/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ src/keyring/keyring_api.o \
4444
src/catalog/tde_keyring.o \
4545
src/catalog/tde_keyring_parse_opts.o \
4646
src/catalog/tde_principal_key.o \
47-
src/common/pg_tde_shmem.o \
4847
src/common/pg_tde_utils.o \
4948
src/smgr/pg_tde_smgr.o \
5049
src/pg_tde_event_capture.o \

‎contrib/pg_tde/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pg_tde_sources = files(
77
'src/catalog/tde_keyring.c',
88
'src/catalog/tde_keyring_parse_opts.c',
99
'src/catalog/tde_principal_key.c',
10-
'src/common/pg_tde_shmem.c',
1110
'src/common/pg_tde_utils.c',
1211
'src/encryption/enc_aes.c',
1312
'src/encryption/enc_tde.c',

‎contrib/pg_tde/src/catalog/tde_keyring.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
#ifndef FRONTEND
3232
#include "access/heapam.h"
33-
#include "common/pg_tde_shmem.h"
3433
#include "funcapi.h"
3534
#include "access/relscan.h"
3635
#include "access/relation.h"

‎contrib/pg_tde/src/catalog/tde_principal_key.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#ifndef FRONTEND
3636
#include "access/genam.h"
3737
#include "access/table.h"
38-
#include "common/pg_tde_shmem.h"
3938
#include "funcapi.h"
4039
#include "lib/dshash.h"
4140
#include "storage/lwlock.h"

‎contrib/pg_tde/src/common/pg_tde_shmem.c

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎contrib/pg_tde/src/include/common/pg_tde_shmem.h

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎contrib/pg_tde/src/include/pg_tde.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@
1414

1515
#define PG_TDE_DATA_DIR "pg_tde"
1616

17+
#define TDE_TRANCHE_NAME "pg_tde_tranche"
18+
19+
typedef enum
20+
{
21+
TDE_LWLOCK_ENC_KEY,
22+
TDE_LWLOCK_PI_FILES,
23+
24+
/* Must be the last entry in the enum */
25+
TDE_LWLOCK_COUNT
26+
} TDELockTypes;
27+
1728
typedef struct XLogExtensionInstall
1829
{
1930
Oid database_id;

‎contrib/pg_tde/src/pg_tde.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "access/xlog.h"
2525
#include "access/xloginsert.h"
2626
#include "keyring/keyring_api.h"
27-
#include "common/pg_tde_shmem.h"
2827
#include "catalog/tde_principal_key.h"
2928
#include "keyring/keyring_file.h"
3029
#include "keyring/keyring_vault.h"
@@ -54,15 +53,14 @@ static void
5453
tde_shmem_request(void)
5554
{
5655
Size sz = 0;
57-
int required_locks = TdeRequiredLocksCount();
5856

5957
sz = add_size(sz, TDEXLogEncryptStateSize());
6058
sz = add_size(sz, TDEXLogEncryptStateSize());
6159

6260
if (prev_shmem_request_hook)
6361
prev_shmem_request_hook();
6462
RequestAddinShmemSpace(sz);
65-
RequestNamedLWLockTranche(TDE_TRANCHE_NAME, required_locks);
63+
RequestNamedLWLockTranche(TDE_TRANCHE_NAME, TDE_LWLOCK_COUNT);
6664
ereport(LOG, errmsg("tde_shmem_request: requested %ld bytes", sz));
6765
}
6866

0 commit comments

Comments
 (0)
0