This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 53054131f67 Fix some conflicts on test
53054131f67 is described below
commit 53054131f674d150b494122f1dced0e271b8ae96
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Mar 8 22:19:14 2026 -0400
Fix some conflicts on test
---
.../expected/drop-index-concurrently-1.out | 12 ----
.../isolation/expected/temp-schema-cleanup.out | 4 --
src/test/isolation/isolation_schedule | 22 +-----
src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm | 81 ----------------------
src/test/perl/README | 3 -
src/test/subscription/t/001_rep_changes.pl | 16 -----
src/test/subscription/t/013_partition.pl | 80 ---------------------
src/test/subscription/t/015_stream.pl | 4 --
src/test/subscription/t/100_bugs.pl | 29 --------
9 files changed, 1 insertion(+), 250 deletions(-)
diff --git a/src/test/isolation/expected/drop-index-concurrently-1.out
b/src/test/isolation/expected/drop-index-concurrently-1.out
index 26f72458ccf..59debc9341a 100644
--- a/src/test/isolation/expected/drop-index-concurrently-1.out
+++ b/src/test/isolation/expected/drop-index-concurrently-1.out
@@ -21,17 +21,6 @@ Sort
Optimizer: Postgres query optimizer
(5 rows)
-<<<<<<< HEAD
-step explains: EXPLAIN (COSTS OFF) EXECUTE getrow_seq;
-QUERY PLAN
-----------------------------------------------
-Sort
- Sort Key: id, data
- -> Index Scan using test_dc_pkey on test_dc
- Filter: ((data)::text = '34'::text)
-Optimizer: Postgres query optimizer
-(5 rows)
-=======
step enableseq: SET enable_seqscan = true;
step explains: EXPLAIN (COSTS OFF) EXECUTE getrow_seqscan;
QUERY PLAN
@@ -41,7 +30,6 @@ Sort
-> Seq Scan on test_dc
Filter: (data = 34)
(4 rows)
->>>>>>> REL_16_9
step select2: SELECT * FROM test_dc WHERE data = 34 ORDER BY id,data;
id|data
diff --git a/src/test/isolation/expected/temp-schema-cleanup.out
b/src/test/isolation/expected/temp-schema-cleanup.out
index 05fc1f5f649..35b91d9e450 100644
--- a/src/test/isolation/expected/temp-schema-cleanup.out
+++ b/src/test/isolation/expected/temp-schema-cleanup.out
@@ -86,10 +86,6 @@ step s1_exit:
SELECT pg_terminate_backend(pg_backend_pid());
FATAL: terminating connection due to administrator command
-<<<<<<< HEAD
-FATAL: terminating connection due to administrator command
-=======
->>>>>>> REL_16_9
server closed the connection unexpectedly
This probably means the server terminated abnormally
before or while processing the request.
diff --git a/src/test/isolation/isolation_schedule
b/src/test/isolation/isolation_schedule
index f8e7bd3a7e3..79e4a20fa41 100644
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@ -64,17 +64,11 @@ test: deadlock-soft-2
#test: fk-contention
test: fk-deadlock
test: fk-deadlock2
-<<<<<<< HEAD
#test: fk-partitioned-1
#test: fk-partitioned-2
#test: eval-plan-qual
-=======
-test: fk-partitioned-1
-test: fk-partitioned-2
test: fk-snapshot
test: subxid-overflow
-test: eval-plan-qual
->>>>>>> REL_16_9
test: eval-plan-qual-trigger
test: inplace-inval
test: intra-grant-inplace
@@ -130,18 +124,14 @@ test: alter-table-2
#test: create-trigger
test: sequence-ddl
test: async-notify
-<<<<<<< HEAD
# vacuum-reltuples uses a cursor to keep page pinned, but in GPDB that doesn't
# keep it pinned.
#test: vacuum-reltuples
-=======
test: vacuum-no-cleanup-lock
->>>>>>> REL_16_9
test: timeouts
test: vacuum-concurrent-drop
test: vacuum-conflict
test: vacuum-skip-locked
-<<<<<<< HEAD
#test: predicate-hash
#test: predicate-gist
#test: predicate-gin
@@ -152,21 +142,15 @@ test: partition-drop-index-locking
# because it fails when test errors from ExecLockRows. The reason is that
# GPDB disabled triggers for foreign keys.
#test: partition-key-update-1
-=======
test: stats
->>>>>>> REL_16_9
test: horizons
test: partition-concurrent-attach
test: partition-drop-index-locking
-<<<<<<< HEAD
# GPDB_12_MERGE_FEATURE_NOT_SUPPORTED: Disabled test partition-key-update-1
# because it fails when test errors from ExecLockRows. The reason is that
# GPDB disabled triggers for foreign keys.
#test: partition-key-update-1
-=======
-test: partition-key-update-1
->>>>>>> REL_16_9
test: partition-key-update-2
test: partition-key-update-3
test: partition-key-update-4
@@ -174,7 +158,6 @@ test: plpgsql-toast
test: cluster-conflict
test: cluster-conflict-partition
test: truncate-conflict
-<<<<<<< HEAD
#test: serializable-parallel
#test: serializable-parallel-2
@@ -187,9 +170,6 @@ test: ao-repeatable-read-vacuum
test: ao-insert-eof create_index_hot udf-insert-deadlock heap-repeatable-read
ao-repeatable-read
test: vacuum-ao-concurrent-drop
-=======
-test: serializable-parallel
-test: serializable-parallel-2
+
test: serializable-parallel-3
test: matview-write-skew
->>>>>>> REL_16_9
diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index d61a9cce161..ac8916c16e4 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -76,8 +76,6 @@ sub adjust_database_contents
my ($old_version, %dbnames) = @_;
my $result = {};
-<<<<<<< HEAD
-=======
die "wrong type for \$old_version\n"
unless $old_version->isa("PostgreSQL::Version");
@@ -86,7 +84,6 @@ sub adjust_database_contents
# Therefore, use a modified version object that only contains the major.
$old_version = PostgreSQL::Version->new($old_version->major);
->>>>>>> REL_16_9
# remove dbs of modules known to cause pg_upgrade to fail
# anything not builtin and incompatible should clean up its own db
foreach my $bad_module ('test_ddl_deparse', 'tsearch2')
@@ -99,33 +96,12 @@ sub adjust_database_contents
}
}
-<<<<<<< HEAD
- # avoid version number issues with test_ext7
-=======
# avoid no-path-to-downgrade-extension-version issues
->>>>>>> REL_16_9
if ($dbnames{contrib_regression_test_extensions})
{
_add_st(
$result,
'contrib_regression_test_extensions',
-<<<<<<< HEAD
- 'drop extension if exists test_ext7');
- }
-
- # get rid of dblink's dependencies on regress.so
- my $regrdb =
- $old_version le '9.4'
- ? 'contrib_regression'
- : 'contrib_regression_dblink';
-
- if ($dbnames{$regrdb})
- {
- _add_st(
- $result, $regrdb,
- 'drop function if exists public.putenv(text)',
- 'drop function if exists public.wait_pid(integer)');
-=======
'drop extension if exists test_ext_cine',
'drop extension if exists test_ext7');
}
@@ -168,7 +144,6 @@ sub adjust_database_contents
'drop function if exists public.putenv(text)',
'drop function if exists
public.wait_pid(integer)');
}
->>>>>>> REL_16_9
}
# user table OIDs are gone from release 12 on
@@ -295,22 +270,17 @@ sub adjust_old_dumpfile
{
my ($old_version, $dump) = @_;
-<<<<<<< HEAD
-=======
die "wrong type for \$old_version\n"
unless $old_version->isa("PostgreSQL::Version");
# See adjust_database_contents about this
$old_version = PostgreSQL::Version->new($old_version->major);
->>>>>>> REL_16_9
# use Unix newlines
$dump =~ s/\r\n/\n/g;
# Version comments will certainly not match.
$dump =~ s/^-- Dumped from database version.*\n//mg;
-<<<<<<< HEAD
-=======
if ($old_version < 16)
{
# Fix up some view queries that no longer require
table-qualification.
@@ -328,7 +298,6 @@ sub adjust_old_dumpfile
{$1;}mxg;
}
->>>>>>> REL_16_9
# Change trigger definitions to say ... EXECUTE FUNCTION ...
if ($old_version < 12)
{
@@ -357,51 +326,11 @@ sub adjust_old_dumpfile
$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
}
-<<<<<<< HEAD
- # dumps from pre-9.6 databases will show assorted default grants
explicitly
- if ($old_version lt '9.6')
- {
- my $comment =
- "-- Name: SCHEMA public; Type: ACL; Schema: -; Owner: .*";
- my $sql =
- "REVOKE ALL ON SCHEMA public FROM PUBLIC;\n"
- . "REVOKE ALL ON SCHEMA public FROM .*;\n"
- . "GRANT ALL ON SCHEMA public TO .*;\n"
- . "GRANT ALL ON SCHEMA public TO PUBLIC;";
- $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-
- $comment = "-- Name: DATABASE .*; Type: ACL; Schema: -; Owner:
.*";
- $sql =
- "REVOKE ALL ON DATABASE .* FROM PUBLIC;\n"
- . "REVOKE ALL ON DATABASE .* FROM .*;\n"
- . "GRANT ALL ON DATABASE .* TO .*;\n"
- . "GRANT CONNECT,TEMPORARY ON DATABASE .* TO PUBLIC;\n";
- $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
- $dump =~ s/^$sql//mg;
-
- $sql =
- "REVOKE ALL ON TABLE .* FROM PUBLIC;\n"
- . "REVOKE ALL ON TABLE .* FROM .*;\n"
- . "GRANT ALL ON TABLE .* TO .*;\n";
- $dump =~ s/^$sql//mg;
- }
-
-=======
->>>>>>> REL_16_9
if ($old_version lt '9.5')
{
# adjust some places where we don't print so many parens anymore
my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-<<<<<<< HEAD
- my $orig = "((x > 3) AND (y <> 'check failed'::text))";
- my $repl = "(x > 3) AND (y <> 'check failed'::text)";
- $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
- $prefix = "CONSTRAINT insert_con CHECK [(][(]";
- $orig = "((x >= 3) AND (y <> 'check failed'::text))";
- $repl = "(x >= 3) AND (y <> 'check failed'::text)";
-=======
my $orig = "((x > 3) AND (y <> 'check failed'::text))";
my $repl = "(x > 3) AND (y <> 'check failed'::text)";
$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
@@ -409,7 +338,6 @@ sub adjust_old_dumpfile
$prefix = "CONSTRAINT insert_con CHECK [(][(]";
$orig = "((x >= 3) AND (y <> 'check failed'::text))";
$repl = "(x >= 3) AND (y <> 'check failed'::text)";
->>>>>>> REL_16_9
$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
$orig = "DEFAULT ((-1) *
currval('public.insert_seq'::regclass))";
@@ -476,8 +404,6 @@ sub adjust_old_dumpfile
return $dump;
}
-<<<<<<< HEAD
-=======
# Data for _mash_view_qualifiers
my @_unused_view_qualifiers = (
@@ -607,7 +533,6 @@ sub _mash_view_qualifiers
}
->>>>>>> REL_16_9
# Internal subroutine to mangle whitespace within view/rule commands.
# Any consecutive sequence of whitespace is reduced to one space.
sub _mash_view_whitespace
@@ -667,22 +592,17 @@ sub adjust_new_dumpfile
{
my ($old_version, $dump) = @_;
-<<<<<<< HEAD
-=======
die "wrong type for \$old_version\n"
unless $old_version->isa("PostgreSQL::Version");
# See adjust_database_contents about this
$old_version = PostgreSQL::Version->new($old_version->major);
->>>>>>> REL_16_9
# use Unix newlines
$dump =~ s/\r\n/\n/g;
# Version comments will certainly not match.
$dump =~ s/^-- Dumped from database version.*\n//mg;
-<<<<<<< HEAD
-=======
# pre-v16 dumps do not know about XMLSERIALIZE(NO INDENT).
if ($old_version < 16)
{
@@ -714,7 +634,6 @@ sub adjust_new_dumpfile
\s+FUNCTION\s2\s\(text,\stext\)\spublic\.part_hashtext_length\(text,bigint\);}
{}mxg;
}
->>>>>>> REL_16_9
# pre-v12 dumps will not say anything about default_table_access_method.
if ($old_version < 12)
{
diff --git a/src/test/perl/README b/src/test/perl/README
index 1222e297c6a..8fb44184b91 100644
--- a/src/test/perl/README
+++ b/src/test/perl/README
@@ -77,11 +77,8 @@ against them and evaluate the results. For example:
Each test script should end with:
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< HEAD
-================================
done_testing();
->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> REL_16_9
Test::Builder::Level controls how far up in the call stack a test will look
at when reporting a failure. This should be incremented by any subroutine
which directly or indirectly calls test routines from Test::More, such as
diff --git a/src/test/subscription/t/001_rep_changes.pl
b/src/test/subscription/t/001_rep_changes.pl
index 8f83aca39b3..857bcfb5cc2 100644
--- a/src/test/subscription/t/001_rep_changes.pl
+++ b/src/test/subscription/t/001_rep_changes.pl
@@ -424,11 +424,7 @@ is( $result, qq(11.11|baz|1
# application_name to ensure that the walsender is (re)started.
#
# Not all of these are registered as tests as we need to poll for a change
-<<<<<<< HEAD
-# but the test suite will fail none the less when something goes wrong.
-=======
# but the test suite will fail nonetheless when something goes wrong.
->>>>>>> REL_16_9
my $oldpid = $node_publisher->safe_psql('postgres',
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub'
AND state = 'streaming';"
);
@@ -437,13 +433,9 @@ $node_subscriber->safe_psql('postgres',
);
$node_publisher->poll_query_until('postgres',
"SELECT pid != $oldpid FROM pg_stat_replication WHERE application_name
= 'tap_sub' AND state = 'streaming';"
-<<<<<<< HEAD
-) or die "Timed out while waiting for apply to restart after changing
CONNECTION";
-=======
)
or die
"Timed out while waiting for apply to restart after changing CONNECTION";
->>>>>>> REL_16_9
$oldpid = $node_publisher->safe_psql('postgres',
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub'
AND state = 'streaming';"
@@ -453,13 +445,9 @@ $node_subscriber->safe_psql('postgres',
);
$node_publisher->poll_query_until('postgres',
"SELECT pid != $oldpid FROM pg_stat_replication WHERE application_name
= 'tap_sub' AND state = 'streaming';"
-<<<<<<< HEAD
-) or die "Timed out while waiting for apply to restart after changing
PUBLICATION";
-=======
)
or die
"Timed out while waiting for apply to restart after changing PUBLICATION";
->>>>>>> REL_16_9
$node_publisher->safe_psql('postgres',
"INSERT INTO tab_ins SELECT generate_series(1001,1100)");
@@ -539,13 +527,9 @@ $node_subscriber->safe_psql('postgres',
"ALTER SUBSCRIPTION tap_sub RENAME TO tap_sub_renamed");
$node_publisher->poll_query_until('postgres',
"SELECT pid != $oldpid FROM pg_stat_replication WHERE application_name
= 'tap_sub_renamed' AND state = 'streaming';"
-<<<<<<< HEAD
-) or die "Timed out while waiting for apply to restart after renaming
SUBSCRIPTION";
-=======
)
or die
"Timed out while waiting for apply to restart after renaming SUBSCRIPTION";
->>>>>>> REL_16_9
# check all the cleanup
$node_subscriber->safe_psql('postgres', "DROP SUBSCRIPTION tap_sub_renamed");
diff --git a/src/test/subscription/t/013_partition.pl
b/src/test/subscription/t/013_partition.pl
index 708d2f77459..275fb3b5257 100644
--- a/src/test/subscription/t/013_partition.pl
+++ b/src/test/subscription/t/013_partition.pl
@@ -4,15 +4,9 @@
# Test logical replication with partitioned tables
use strict;
use warnings;
-<<<<<<< HEAD
-use PostgresNode;
-use TestLib;
-use Test::More tests => 69;
-=======
use PostgreSQL::Test::Cluster;
use PostgreSQL::Test::Utils;
use Test::More;
->>>>>>> REL_16_9
# setup
@@ -420,12 +414,6 @@ $node_publisher->safe_psql('postgres',
$node_publisher->safe_psql('postgres',
"CREATE TABLE tab4_1_1 PARTITION OF tab4_1 FOR VALUES IN (-1, 0, 1)");
-$node_publisher->safe_psql('postgres',
- "CREATE TABLE tab4 (a int PRIMARY KEY) PARTITION BY LIST (a)");
-$node_publisher->safe_psql('postgres',
- "CREATE TABLE tab4_1 PARTITION OF tab4 FOR VALUES IN (0, 1) PARTITION
BY LIST (a)");
-$node_publisher->safe_psql('postgres',
- "CREATE TABLE tab4_1_1 PARTITION OF tab4_1 FOR VALUES IN (0, 1)");
$node_publisher->safe_psql('postgres',
"ALTER PUBLICATION pub_all SET (publish_via_partition_root = true)");
# Note: tab3_1's parent is not in the publication, in which case its
@@ -435,12 +423,6 @@ $node_publisher->safe_psql('postgres',
$node_publisher->safe_psql('postgres',
"CREATE PUBLICATION pub_viaroot FOR TABLE tab2, tab2_1, tab3_1 WITH
(publish_via_partition_root = true)"
);
-$node_publisher->safe_psql('postgres',
- "CREATE PUBLICATION pub_lower_level FOR TABLE tab4_1 WITH
(publish_via_partition_root = true)"
-);
-
-# prepare data for the initial sync
-$node_publisher->safe_psql('postgres', "INSERT INTO tab2 VALUES (1)");
$node_publisher->safe_psql('postgres',
"CREATE PUBLICATION pub_lower_level FOR TABLE tab4_1 WITH
(publish_via_partition_root = true)"
@@ -490,17 +472,6 @@ $node_subscriber2->safe_psql('postgres',
$node_subscriber2->safe_psql('postgres',
"CREATE TABLE tab3_1 (a int PRIMARY KEY, c text DEFAULT 'sub2_tab3_1',
b text)"
);
-<<<<<<< HEAD
-$node_subscriber2->safe_psql('postgres',
- "CREATE TABLE tab4 (a int PRIMARY KEY)"
-);
-$node_subscriber2->safe_psql('postgres',
- "CREATE TABLE tab4_1 (a int PRIMARY KEY)"
-);
-# Publication that sub2 points to now publishes via root, so must update
-# subscription target relations.
-$node_subscriber2->safe_psql('postgres',
-=======
# Note: We create two separate tables, not a partitioned one, so that we can
# easily identity through which relation were the changes replicated.
@@ -513,7 +484,6 @@ $node_subscriber2->safe_psql('postgres',
# schema. We set the list of publications so that the FOR ALL TABLES
# publication is second (the list order matters).
$node_subscriber2->safe_psql('postgres',
->>>>>>> REL_16_9
"ALTER SUBSCRIPTION sub2 SET PUBLICATION pub_lower_level, pub_all");
# Wait for initial sync of all subscriptions
@@ -530,11 +500,6 @@ $result =
$node_subscriber2->safe_psql('postgres', "SELECT a FROM tab4_1 ORDER BY 1");
is($result, qq(), 'initial data synced for pub_lower_level and pub_all');
-# check that data is synced correctly
-$result = $node_subscriber1->safe_psql('postgres',
- "SELECT c, a FROM tab2");
-is( $result, qq(sub1_tab2|1), 'initial data synced for pub_viaroot');
-
# insert
$node_publisher->safe_psql('postgres', "INSERT INTO tab1 VALUES (1), (0)");
$node_publisher->safe_psql('postgres', "INSERT INTO tab1_1 (a) VALUES (3)");
@@ -543,8 +508,6 @@ $node_publisher->safe_psql('postgres',
"INSERT INTO tab2 VALUES (0), (3), (5)");
$node_publisher->safe_psql('postgres',
"INSERT INTO tab3 VALUES (1), (0), (3), (5)");
-$node_publisher->safe_psql('postgres',
- "INSERT INTO tab4 VALUES (0)");
# Insert a row into the leaf partition, should be replicated through the
# partition root (thanks to the FOR ALL TABLES partition).
@@ -588,18 +551,6 @@ sub2_tab3|1
sub2_tab3|3
sub2_tab3|5), 'inserts into tab3 replicated');
-<<<<<<< HEAD
-$result = $node_subscriber2->safe_psql('postgres',
- "SELECT a FROM tab4 ORDER BY 1");
-is( $result, qq(0), 'inserts into tab4 replicated');
-
-$result = $node_subscriber2->safe_psql('postgres',
- "SELECT a FROM tab4_1 ORDER BY 1");
-is( $result, qq(), 'inserts into tab4_1 replicated');
-
-# now switch the order of publications in the list, try again, the result
-# should be the same (no dependence on order of pulications)
-=======
# tab4 change should be replicated through the root partition, which
# maps to the tab4 relation on subscriber.
$result =
@@ -614,42 +565,21 @@ is($result, qq(), 'inserts into tab4_1 replicated');
# now switch the order of publications in the list, try again, the result
# should be the same (no dependence on order of publications)
->>>>>>> REL_16_9
$node_subscriber2->safe_psql('postgres',
"ALTER SUBSCRIPTION sub2 SET PUBLICATION pub_all, pub_lower_level");
# make sure the subscription on the second subscriber is synced, before
# continuing
-<<<<<<< HEAD
-$node_subscriber2->poll_query_until('postgres', $synced_query)
- or die "Timed out while waiting for subscriber to synchronize data";
-
-# Insert a change into the leaf partition, should be replicated through
-# the partition root (thanks to the FOR ALL TABLES partition).
-$node_publisher->safe_psql('postgres',
- "INSERT INTO tab4 VALUES (1)");
-=======
$node_subscriber2->wait_for_subscription_sync;
# Insert a change into the leaf partition, should be replicated through
# the partition root (thanks to the FOR ALL TABLES partition).
$node_publisher->safe_psql('postgres', "INSERT INTO tab4 VALUES (1)");
->>>>>>> REL_16_9
$node_publisher->wait_for_catchup('sub2');
# tab4 change should be replicated through the root partition, which
# maps to the tab4 relation on subscriber.
-<<<<<<< HEAD
-$result = $node_subscriber2->safe_psql('postgres',
- "SELECT a FROM tab4 ORDER BY 1");
-is( $result, qq(0
-1), 'inserts into tab4 replicated');
-
-$result = $node_subscriber2->safe_psql('postgres',
- "SELECT a FROM tab4_1 ORDER BY 1");
-is( $result, qq(), 'inserts into tab4_1 replicated');
-=======
$result =
$node_subscriber2->safe_psql('postgres', "SELECT a FROM tab4 ORDER BY 1");
is( $result, qq(-1
@@ -660,7 +590,6 @@ $result =
$node_subscriber2->safe_psql('postgres', "SELECT a FROM tab4_1 ORDER BY 1");
is($result, qq(), 'inserts into tab4_1 replicated');
->>>>>>> REL_16_9
# update (replicated as update)
$node_publisher->safe_psql('postgres', "UPDATE tab1 SET a = 6 WHERE a = 5");
@@ -897,12 +826,7 @@ $node_subscriber2->safe_psql(
$node_subscriber2->safe_psql('postgres',
"ALTER SUBSCRIPTION sub2 REFRESH PUBLICATION");
-<<<<<<< HEAD
-$node_subscriber2->poll_query_until('postgres', $synced_query)
- or die "Timed out while waiting for subscriber to synchronize data";
-=======
$node_subscriber2->wait_for_subscription_sync;
->>>>>>> REL_16_9
# Make partition map cache
$node_publisher->safe_psql('postgres', "INSERT INTO tab5 VALUES (1, 1)");
@@ -928,9 +852,6 @@ $node_publisher->wait_for_catchup('sub2');
$result = $node_subscriber2->safe_psql('postgres',
"SELECT a, b, c FROM tab5 ORDER BY 1");
-<<<<<<< HEAD
-is($result, qq(3|1|), 'updates of tab5 replicated correctly after altering
table on subscriber');
-=======
is($result, qq(3|1|),
'updates of tab5 replicated correctly after altering table on
subscriber'
);
@@ -966,4 +887,3 @@ $result = $node_subscriber2->safe_psql('postgres',
is($result, qq(4||1), 'updates of tab5 replicated correctly');
done_testing();
->>>>>>> REL_16_9
diff --git a/src/test/subscription/t/015_stream.pl
b/src/test/subscription/t/015_stream.pl
index 4f2ca907527..be70b869466 100644
--- a/src/test/subscription/t/015_stream.pl
+++ b/src/test/subscription/t/015_stream.pl
@@ -213,12 +213,8 @@ $node_subscriber->safe_psql('postgres', q{SELECT 1});
# Interleave a pair of transactions, each exceeding the 64kB limit.
my $h = $node_publisher->background_psql('postgres', on_error_stop => 0);
-<<<<<<< HEAD
-my $timer = IPC::Run::timeout($TestLib::timeout_default);
-=======
# Confirm if a deadlock between the leader apply worker and the parallel apply
# worker can be detected.
->>>>>>> REL_16_9
my $offset = -s $node_subscriber->logfile;
diff --git a/src/test/subscription/t/100_bugs.pl
b/src/test/subscription/t/100_bugs.pl
index 6b568ac7f9b..6744998b620 100644
--- a/src/test/subscription/t/100_bugs.pl
+++ b/src/test/subscription/t/100_bugs.pl
@@ -4,15 +4,9 @@
# Tests for various bugs found over time
use strict;
use warnings;
-<<<<<<< HEAD
-use PostgresNode;
-use TestLib;
-use Test::More tests => 7;
-=======
use PostgreSQL::Test::Cluster;
use PostgreSQL::Test::Utils;
use Test::More;
->>>>>>> REL_16_9
# Bug #15114
@@ -245,22 +239,12 @@ $node_sub->stop('fast');
# target table's relcache was not being invalidated. This leads to skipping
# UPDATE/DELETE operations during apply on the subscriber side as the columns
# required to search corresponding rows won't get logged.
-<<<<<<< HEAD
-$node_publisher = get_new_node('publisher3');
-$node_publisher->init(allows_streaming => 'logical');
-$node_publisher->start;
-
-$node_subscriber = get_new_node('subscriber3');
-$node_subscriber->init(allows_streaming => 'logical');
-$node_subscriber->start;
-=======
$node_publisher->rotate_logfile();
$node_publisher->start();
$node_subscriber->rotate_logfile();
$node_subscriber->start();
->>>>>>> REL_16_9
$node_publisher->safe_psql('postgres',
"CREATE TABLE tab_replidentity_index(a int not null, b int not null)");
@@ -301,16 +285,8 @@ $node_subscriber->safe_psql('postgres',
"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr'
PUBLICATION tap_pub"
);
-<<<<<<< HEAD
-$node_publisher->wait_for_catchup('tap_sub');
-
-# Also wait for initial table sync to finish
-$node_subscriber->poll_query_until('postgres', $synced_query)
- or die "Timed out while waiting for subscriber to synchronize data";
-=======
# Wait for initial table sync to finish
$node_subscriber->wait_for_subscription_sync($node_publisher, 'tap_sub');
->>>>>>> REL_16_9
is( $node_subscriber->safe_psql(
'postgres', "SELECT * FROM tab_replidentity_index"),
@@ -332,10 +308,6 @@ is( $node_subscriber->safe_psql(
qq(-1|1),
"update works with REPLICA IDENTITY");
-<<<<<<< HEAD
-$node_publisher->stop('fast');
-$node_subscriber->stop('fast');
-=======
# Clean up
$node_subscriber->safe_psql('postgres', "DROP SUBSCRIPTION tap_sub");
$node_publisher->safe_psql('postgres', "DROP PUBLICATION tap_pub");
@@ -597,4 +569,3 @@ $node_publisher->stop('fast');
$node_subscriber->stop('fast');
done_testing();
->>>>>>> REL_16_9
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
