Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest PG16 access/heap changes #13

Closed
wants to merge 3 commits into from
Closed

Merge latest PG16 access/heap changes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a431b0a
Merge pull request #12 from Percona-Lab/keys_tde_fork
codeforall Sep 4, 2023
7071e41
Merge PG REL_16_STABLE
dAdAbird Sep 5, 2023
26ab10c
Update PG commit in readme and CI workflows
dAdAbird Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/postgresql-16-src-make.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'postgres/postgres'
ref: '93dcdfa88f5f9befb781558920e02d3ee86dc629'
ref: '9ddecd40664f7523b18f760aea0e04936e8a2302'
path: 'src'

- name: Clone postgres-tde-ext repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/postgresql-16-src-meson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'postgres/postgres'
ref: '93dcdfa88f5f9befb781558920e02d3ee86dc629'
ref: '9ddecd40664f7523b18f760aea0e04936e8a2302'
path: 'src'

- name: Clone postgres-tde-ext repository
Expand Down
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ TAP_TESTS = 0

OBJS = src/encryption/enc_tuple.o \
src/encryption/enc_aes.o \
src/access/pg_tde_io.o \
src/access/pg_tdeam_visibility.o \
src/access/heapam_visibility.o \
src/access/heapam_handler.o \
src/access/heapam.o \
src/access/heaptoast.o \
src/access/hio.o \
src/access/pruneheap.o \
src/access/rewriteheap.o \
src/access/vacuumlazy.o \
src/access/visibilitymap.o \
src/access/pg_tde_tdemap.o \
src/access/pg_tdeam.o \
src/access/pg_tdetoast.o \
src/access/pg_tde_prune.o \
src/access/pg_tde_vacuumlazy.o \
src/access/pg_tde_visibilitymap.o \
src/access/pg_tde_rewrite.o \
src/access/pg_tdeam_handler.o \
src/transam/pg_tde_xact_handler.o \
src/keyring/keyring_config.o \
src/keyring/keyring_file.o \
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This is based on the heap code as of the following commit:

```
commit 93dcdfa88f5f9befb781558920e02d3ee86dc629
Author: Tom Lane <[email protected]>
Date: Mon Jul 10 12:14:34 2023 -0400
commit 9ddecd40664f7523b18f760aea0e04936e8a2302
Author: Peter Eisentraut <[email protected]>
Date: Tue Sep 5 11:36:55 2023 +0200
```
20 changes: 11 additions & 9 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ jsondep = dependency('json-c')
pg_tde_sources = files(
'src/pg_tde.c',
'src/transam/pg_tde_xact_handler.c',

'src/access/pg_tde_tdemap.c',
'src/access/pg_tdeam.c',
'src/access/pg_tdeam_handler.c',
'src/access/pg_tdeam_visibility.c',
'src/access/pg_tdetoast.c',
'src/access/pg_tde_io.c',
'src/access/pg_tde_prune.c',
'src/access/pg_tde_rewrite.c',
'src/access/pg_tde_vacuumlazy.c',
'src/access/pg_tde_visibilitymap.c',

'src/access/heapam_handler.c',
'src/access/heapam_visibility.c',
'src/access/heapam.c',
'src/access/heaptoast.c',
'src/access/hio.c',
'src/access/pruneheap.c',
'src/access/rewriteheap.c',
'src/access/vacuumlazy.c',
'src/access/visibilitymap.c',

'src/encryption/enc_tuple.c',
'src/encryption/enc_aes.c',
Expand Down
Loading
Loading