Skip to content

Commit

Permalink
[#22449] YSQL: wal2json YB specific changes
Browse files Browse the repository at this point in the history
Summary:
Diff D35521 incorrectly imported `wal2json` plugin to contrib folder but it should have been added to third-party-extensions.
It also added YB specific changes on top. So two things are required to fix this.

- Add wal2json as subtree merge to third-party-extensions folder.
- Add YB specific changes on top of that.

First part of subtree done by diff D36690. This diff addresses the part to add YB specific changes.

Difference between `third-party-extensions/wal2json` and `contrib/wal2json`:

- `sql/` and `expected/` folders that were removed from contrib/wal2json are restored in third-party-extensions/wal2json. Although not added to a test schedule.
- `README.md` that was from contrib/wal2json is restored in third-party-extensions/wal2json. Made inline with [[ https://github.com/eulerto/wal2json/tree/wal2json_2_6 | thirdparty ]] repo.
- `wal2json.sln` and `wal2json.vcxproj` :  provide build configuration to build on windows. Restored them and inline with thirdparty repo.
- `logical.conf` which was present in contrib/wal2json not added in third-party-extensions/wal2json , not required.
- `.gitignore` now inline with thirdparty repo.
- `Makefile` now inline with thirdparty repo. No change required as plugin is built without any changes.
Jira: DB-11366

Test Plan:
Jenkins: test regex: .*ReplicationSlot.*

  ./yb_build.sh --java-test 'org.yb.pgsql.TestPgReplicationSlot#testWithWal2JsonPlugin'

Reviewers: sumukh.phalgaonkar, jason, skumar

Reviewed By: jason

Subscribers: yql

Differential Revision: https://phorge.dev.yugabyte.com/D36694
  • Loading branch information
Devansh Saxena committed Jul 25, 2024
1 parent b4c4294 commit 84fb7ad
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 3,509 deletions.
3 changes: 1 addition & 2 deletions src/postgres/contrib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ SUBDIRS = \
tsm_system_rows \
tsm_system_time \
unaccent \
vacuumlo \
wal2json
vacuumlo

ifeq ($(with_openssl),yes)
SUBDIRS += sslinfo
Expand Down
6 changes: 0 additions & 6 deletions src/postgres/contrib/wal2json/.gitignore

This file was deleted.

27 changes: 0 additions & 27 deletions src/postgres/contrib/wal2json/LICENSE

This file was deleted.

49 changes: 0 additions & 49 deletions src/postgres/contrib/wal2json/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions src/postgres/contrib/wal2json/logical.conf

This file was deleted.

Loading

0 comments on commit 84fb7ad

Please sign in to comment.