external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes constr to conninfo

connection-string-tests-9.2-include
Halil Ozan Akgul 2020-03-24 17:35:36 +03:00
parent 51d857516a
commit 7ae7c42775
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/regress/Makefile
View File

@ -125,11 +125,11 @@ check-multi-non-adaptive: all
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_schedule $(EXTRA_TESTS) -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_schedule $(EXTRA_TESTS)
check-multi-hyperscale: all check-multi-hyperscale: all
$(pg_regress_multi_check) --constr="$(constr)" --hoststr="$(hoststr)" --load-extension=citus \ $(pg_regress_multi_check) --conninfo="$(conninfo)" --hoststr="$(hoststr)" --load-extension=citus \
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_schedule_hyperscale $(EXTRA_TESTS) -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_schedule_hyperscale $(EXTRA_TESTS)
check-multi-hyperscale-superuser: all check-multi-hyperscale-superuser: all
$(pg_regress_multi_check) --constr="$(constr)" --hoststr="$(hoststr)" --load-extension=citus \ $(pg_regress_multi_check) --conninfo="$(conninfo)" --hoststr="$(hoststr)" --load-extension=citus \
-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_schedule_hyperscale_superuser $(EXTRA_TESTS) -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_schedule_hyperscale_superuser $(EXTRA_TESTS)
check-failure-non-adaptive: all check-failure-non-adaptive: all

28
src/test/regress/pg_regress_multi.pl
View File

@ -80,7 +80,7 @@ my $pgCtlTimeout = undef;
my $connectionTimeout = 5000; my $connectionTimeout = 5000;
my $useMitmproxy = 0; my $useMitmproxy = 0;
my $mitmFifoPath = catfile($TMP_CHECKDIR, "mitmproxy.fifo"); my $mitmFifoPath = catfile($TMP_CHECKDIR, "mitmproxy.fifo");
my $constr = ""; my $conninfo = "";
my $hoststr = ""; my $hoststr = "";
my $serversAreShutdown = "TRUE"; my $serversAreShutdown = "TRUE";
@ -110,7 +110,7 @@ GetOptions(
'pg_ctl-timeout=s' => \$pgCtlTimeout, 'pg_ctl-timeout=s' => \$pgCtlTimeout,
'connection-timeout=s' => \$connectionTimeout, 'connection-timeout=s' => \$connectionTimeout,
'mitmproxy' => \$useMitmproxy, 'mitmproxy' => \$useMitmproxy,
'constr=s' => \$constr, 'conninfo=s' => \$conninfo,
'hoststr=s' => \$hoststr, 'hoststr=s' => \$hoststr,
'help' => sub { Usage() }); 'help' => sub { Usage() });
@ -285,9 +285,9 @@ my $workerCount = 2;
my @workerHosts = (); my @workerHosts = ();
my @workerPorts = (); my @workerPorts = ();
if ( $constr ) if ( $conninfo )
{ {
my %convals = split /=|\s/, $constr; my %convals = split /=|\s/, $conninfo;
if (exists $convals{user}) if (exists $convals{user})
{ {
$user = $convals{user}; $user = $convals{user};
@ -322,10 +322,10 @@ if ( $constr )
print $out "s/$host/<host>/g\n"; print $out "s/$host/<host>/g\n";
print $out "s/", substr("$masterPort", 0, length("$masterPort")-2), "[0-9][0-9]/xxxxx/g\n"; print $out "s/", substr("$masterPort", 0, length("$masterPort")-2), "[0-9][0-9]/xxxxx/g\n";
my $worker1host = `psql "$constr" -t -c "SELECT nodename FROM pg_dist_node ORDER BY nodeid LIMIT 1;"`; my $worker1host = `psql "$conninfo" -t -c "SELECT nodename FROM pg_dist_node ORDER BY nodeid LIMIT 1;"`;
my $worker1port = `psql "$constr" -t -c "SELECT nodeport FROM pg_dist_node ORDER BY nodeid LIMIT 1;"`; my $worker1port = `psql "$conninfo" -t -c "SELECT nodeport FROM pg_dist_node ORDER BY nodeid LIMIT 1;"`;
my $worker2host = `psql "$constr" -t -c "SELECT nodename FROM pg_dist_node ORDER BY nodeid OFFSET 1 LIMIT 1;"`; my $worker2host = `psql "$conninfo" -t -c "SELECT nodename FROM pg_dist_node ORDER BY nodeid OFFSET 1 LIMIT 1;"`;
my $worker2port = `psql "$constr" -t -c "SELECT nodeport FROM pg_dist_node ORDER BY nodeid OFFSET 1 LIMIT 1;"`; my $worker2port = `psql "$conninfo" -t -c "SELECT nodeport FROM pg_dist_node ORDER BY nodeid OFFSET 1 LIMIT 1;"`;
$worker1host =~ s/^\s+|\s+$//g; $worker1host =~ s/^\s+|\s+$//g;
$worker1port =~ s/^\s+|\s+$//g; $worker1port =~ s/^\s+|\s+$//g;
@ -475,7 +475,7 @@ for my $option (@userPgOptions)
# define functions as signature->definition # define functions as signature->definition
%functions = (); %functions = ();
if (!$constr) if (!$conninfo)
{ {
%functions = ('fake_fdw_handler()', 'fdw_handler AS \'citus\' LANGUAGE C STRICT;'); %functions = ('fake_fdw_handler()', 'fdw_handler AS \'citus\' LANGUAGE C STRICT;');
} }
@ -589,7 +589,7 @@ else
close $fh; close $fh;
if (!$constr) if (!$conninfo)
{ {
make_path(catfile($TMP_CHECKDIR, $MASTERDIR, 'log')) or die "Could not create $MASTERDIR directory"; make_path(catfile($TMP_CHECKDIR, $MASTERDIR, 'log')) or die "Could not create $MASTERDIR directory";
for my $port (@workerPorts) for my $port (@workerPorts)
@ -633,7 +633,7 @@ if (!$constr)
# Routine to shutdown servers at failure/exit # Routine to shutdown servers at failure/exit
sub ShutdownServers() sub ShutdownServers()
{ {
if (!$constr && $serversAreShutdown eq "FALSE") if (!$conninfo && $serversAreShutdown eq "FALSE")
{ {
system(catfile("$bindir", "pg_ctl"), system(catfile("$bindir", "pg_ctl"),
('stop', '-w', '-D', catfile($TMP_CHECKDIR, $MASTERDIR, 'data'))) == 0 ('stop', '-w', '-D', catfile($TMP_CHECKDIR, $MASTERDIR, 'data'))) == 0
@ -760,7 +760,7 @@ if ($followercluster)
} }
# Start servers # Start servers
if (!$constr) if (!$conninfo)
{ {
if(system(catfile("$bindir", "pg_ctl"), if(system(catfile("$bindir", "pg_ctl"),
('start', '-w', ('start', '-w',
@ -830,7 +830,7 @@ if ($followercluster)
# Create database, extensions, types, functions and fdws on the workers, # Create database, extensions, types, functions and fdws on the workers,
# pg_regress won't know to create them for us. # pg_regress won't know to create them for us.
### ###
if (!$constr) if (!$conninfo)
{ {
for my $port (@workerPorts) for my $port (@workerPorts)
{ {
@ -956,7 +956,7 @@ elsif ($isolationtester)
} }
else else
{ {
if ($constr) if ($conninfo)
{ {
push(@arguments, "--dbname=$dbname"); push(@arguments, "--dbname=$dbname");
push(@arguments, "--use-existing"); push(@arguments, "--use-existing");