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.

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

Merge with the latest PG 16 sources as well as addition of the heap_merge.sh tool #18

Merged
merged 4 commits into from
Sep 15, 2023

Conversation

hqakhtar
Copy link
Contributor

The PR contains three commits:
(1) Addition of the heap_merge.sh tool
(2) Fixing a compilation issue due to missing parameter name
(3) Merge with the upstream heap access code changes.

Hamid Akhtar added 3 commits September 13, 2023 21:03
heap code changes.

The script generates file-wise patches between two PG commits and applies it to
the TDE extension source.

By default, it only performs a dry run of the patch application. See the usage
options for applying clean patches or forcefully applying all patches.

It clones both PG and TDE repositories in the working directory. If TDE path is
specified either with its usage option or via the environment variable, then
the script will use the given TDE source code.
Copy link
Member

@dAdAbird dAdAbird left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It makes sense to update PG commit in CI scripts (.github/workflows dir) and in README as well

Copy link
Collaborator

@dutow dutow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we discussed earlier on slack, please also update the CI scripts and the README

@@ -50,7 +50,7 @@ int keyringFilePreloadCache(void)
return 1;
}

int keyringFileStoreKey(const keyInfo*)
int keyringFileStoreKey(const keyInfo* ki)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be unrelated to the merge?

@dutow dutow merged commit 822ec0f into percona:tuple_enc Sep 15, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants