Add a hook for handling logical decoding messages on subscribers.
4 patchsets tracked - current t248589_19
v19t248589_19posted Aug 06, 16:58successneeds rebaserecent 19dpg 20
base0e9a31be8 Aug 04, 12:56 - 19 days / 226 commits behind master (from history)
applyapplied Aug 06, 17:01
rebaselast tried about 2 hours ago on 8aa49d34e
Applying: Add a hook for handling logical messages on subscribers. Using index info to reconstruct a base tree... M doc/src/sgml/ref/alter_subscription.sgml M src/backend/catalog/pg_subscription.c M src/backend/catalog/system_views.sql M src/backend/commands/subscriptioncmds.c M src/backend/replication/logical/worker.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/psql/describe.c M src/include/catalog/pg_subscription.h M src/test/modules/Makefile M src/test/modules/meson.build M src/test/regress/expected/subscription.out M src/test/regress/sql/subscription.sql M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/sql/subscription.sql Auto-merging src/test/regress/expected/subscription.out Auto-merging src/test/modules/meson.build Auto-merging src/test/modules/Makefile Auto-merging src/include/catalog/pg_subscription.h CONFLICT (content): Merge conflict in src/include/catalog/pg_subscription.h Auto-merging src/bin/psql/describe.c Auto-merging src/bin/pg_dump/pg_dump.h Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/backend/replication/logical/worker.c Auto-merging src/backend/commands/subscriptioncmds.c CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c Auto-merging src/backend/catalog/system_views.sql Auto-merging src/backend/catalog/pg_subscription.c Auto-merging doc/src/sgml/ref/alter_subscription.sgml Patch failed at 0001 Add a hook for handling logical messages on subscribers. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/include/catalog/pg_subscription.h, src/backend/commands/subscriptioncmds.c
pushAug 06, 17:01 -> 58fad41bebranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1019 / 1019 | 2m 56s / 5m 29s | docker run ... :t248589 | Aug 06, 22:37 |
run 31121839012executed 1019 - ccache 166 hit / 6453 miss - head 58fad41be - digest sha256:5c54b7d48c9013... - run 31121839012 | ||||||
v16t248589_16posted Aug 05, 18:55successsupersededrecent 19dpg 20
base0e9a31be8 Aug 04, 12:56 - 19 days / 226 commits behind master (from history)
applyapplied Aug 05, 18:56
rebaselast tried Aug 05, 18:56 on 6d04cd2b8
Applying: Add a hook for handling logical messages on subscribers. Using index info to reconstruct a base tree... M src/backend/catalog/pg_subscription.c M src/backend/commands/subscriptioncmds.c M src/backend/replication/logical/worker.c M src/include/catalog/pg_subscription.h Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/pg_subscription.h CONFLICT (content): Merge conflict in src/include/catalog/pg_subscription.h Auto-merging src/backend/replication/logical/worker.c Auto-merging src/backend/commands/subscriptioncmds.c Auto-merging src/backend/catalog/pg_subscription.c Patch failed at 0001 Add a hook for handling logical messages on subscribers. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/include/catalog/pg_subscription.h
pushAug 05, 18:57 -> a5fb39f04branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1019 / 1019 | 2m 57s / 5m 31s | docker run ... @sha256:eaa3305... | Aug 05, 19:10 |
run 31037141174executed 1019 - ccache 166 hit / 6453 miss - head a5fb39f04 - digest sha256:eaa3305c5b635e... - run 31037141174 | ||||||
v8t248589_8posted Aug 04, 00:41tests failedsupersededrecent 19dpg 20
basea37e57454 Aug 04, 22:04 on master
applyapplied Aug 05, 00:44
rebaselast tried Aug 05, 00:44 on a37e57454
pushAug 05, 00:44 -> 5d17fbab4branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| tests failed | 1 | 20 | 974 / 975 | 2m 54s / 4m 56s | docker run ... @sha256:2925320... | Aug 05, 00:55 |
run 30964257194failed: pg_dump/002_pg_dump executed 975 - ccache 166 hit / 6453 miss - head 5d17fbab4 - digest sha256:2925320f5f3665... - run 30964257194 | ||||||
| tests failed | 1 | 20 | 974 / 975 | 2m 55s / 5m 00s | docker run ... @sha256:46b2f88... | Aug 04, 00:54 |
run 30866482667failed: pg_dump/002_pg_dump executed 975 - ccache 166 hit / 6453 miss - head 0c25e6359 - digest sha256:46b2f883193784... - run 30866482667 | ||||||
v1t248589_1posted Jun 19, 22:33successsupersededstale 2mopg 19
base702e9dfd6 Jun 18, 16:20 - 66 days / 641 commits behind master (from history)
applyapplied Jul 29, 00:08
rebaselast tried Jul 29, 00:08 on dd50eb914
Applying: Add a hook for handling logical messages on subscribers. Using index info to reconstruct a base tree... M src/backend/catalog/pg_subscription.c M src/backend/catalog/system_views.sql M src/backend/commands/subscriptioncmds.c M src/backend/replication/libpqwalreceiver/libpqwalreceiver.c M src/backend/replication/logical/worker.c M src/bin/pg_dump/pg_dump.c M src/bin/psql/describe.c M src/include/catalog/pg_subscription.h M src/include/replication/walreceiver.h M src/test/modules/Makefile M src/test/regress/expected/subscription.out M src/test/regress/sql/subscription.sql M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/sql/subscription.sql Auto-merging src/test/regress/expected/subscription.out Auto-merging src/test/modules/Makefile Auto-merging src/include/replication/walreceiver.h Auto-merging src/include/catalog/pg_subscription.h CONFLICT (content): Merge conflict in src/include/catalog/pg_subscription.h Auto-merging src/bin/psql/describe.c Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/backend/replication/logical/worker.c Auto-merging src/backend/replication/libpqwalreceiver/libpqwalreceiver.c Auto-merging src/backend/commands/subscriptioncmds.c CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c Auto-merging src/backend/catalog/system_views.sql CONFLICT (content): Merge conflict in src/backend/catalog/system_views.sql Auto-merging src/backend/catalog/pg_subscription.c CONFLICT (content): Merge conflict in src/backend/catalog/pg_subscription.c Patch failed at 0001 Add a hook for handling logical messages on subscribers. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/include/catalog/pg_subscription.h, src/backend/commands/subscriptioncmds.c, src/backend/catalog/system_views.sql, src/backend/catalog/pg_subscription.c
pushJul 29, 00:08 -> bc235c71fbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1006 / 1006 | 1m 53s / 4m 04s | docker run ... @sha256:3590813... | Jul 29, 00:20 |
run 30410218041executed 1006 - ccache 145 hit / 6475 miss - head bc235c71f - digest sha256:3590813e669f60... - run 30410218041 | ||||||