This is an automated email from the ASF dual-hosted git repository.
reshke 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 b998bae9d22 Fix TAP tests for initdb.
b998bae9d22 is described below
commit b998bae9d22d8859ef34786ad8f0daab961b500e
Author: reshke <[email protected]>
AuthorDate: Tue Dec 23 19:44:50 2025 +0000
Fix TAP tests for initdb.
Resolve rebase issues with respect to b235d41d9646.
Leave few rebase merge issues, namely about default
max_connection and shared buffers selection
in intidb. Also lower "gp_role forced to 'utility' in single-user mode"
message severity to DEBUG1 to remove it from regression log.
---
src/backend/cdb/cdbvars.c | 2 +-
src/bin/initdb/t/001_initdb.pl | 30 ++++++++++++++++++--
src/test/perl/PostgreSQL/Test/Cluster.pm | 48 +-------------------------------
src/test/perl/PostgreSQL/Test/Utils.pm | 31 ---------------------
4 files changed, 29 insertions(+), 82 deletions(-)
diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c
index b1c5d60cf0c..3d708952d39 100644
--- a/src/backend/cdb/cdbvars.c
+++ b/src/backend/cdb/cdbvars.c
@@ -427,7 +427,7 @@ check_gp_role(char **newval, void **extra, GucSource source)
/* Force utility mode in a stand-alone backend. */
if (!IsPostmasterEnvironment && newrole != GP_ROLE_UTILITY)
{
- elog(LOG, "gp_role forced to 'utility' in single-user mode");
+ elog(DEBUG1, "gp_role forced to 'utility' in single-user mode");
*newval = guc_strdup(ERROR, "utility");
return true;
}
diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl
index ca9c8b10066..9733c6d28ca 100644
--- a/src/bin/initdb/t/001_initdb.pl
+++ b/src/bin/initdb/t/001_initdb.pl
@@ -53,6 +53,8 @@ mkdir $datadir;
[
'initdb', '-N', '-T', 'german', '-c',
'default_text_search_config=german',
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',
'-X', $xlogdir, $datadir
],
'successful creation');
@@ -92,7 +94,10 @@ SKIP:
my $datadir_group = "$tempdir/data_group";
command_ok(
- [ 'initdb', '-g', $datadir_group ],
+ [ 'initdb', '-g', $datadir_group,
+
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',],
'successful creation with group access');
ok(check_mode_recursive($datadir_group, 0750, 0640),
@@ -112,6 +117,9 @@ if ($ENV{with_icu} eq 'yes')
[
'initdb', '--no-sync',
'--locale-provider=icu', '--icu-locale=en',
+
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',
"$tempdir/data3"
],
'option --icu-locale');
@@ -124,6 +132,9 @@ if ($ENV{with_icu} eq 'yes')
'--lc-collate=C', '--lc-ctype=C',
'--lc-messages=C', '--lc-numeric=C',
'--lc-monetary=C', '--lc-time=C',
+
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',
"$tempdir/data4"
],
qr/^\s+ICU locale:\s+und\n/ms,
@@ -133,6 +144,9 @@ if ($ENV{with_icu} eq 'yes')
[
'initdb', '--no-sync',
'--locale-provider=icu',
'--icu-locale=@colNumeric=lower',
+
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',
"$tempdir/dataX"
],
qr/could not open collator for locale/,
@@ -142,6 +156,9 @@ if ($ENV{with_icu} eq 'yes')
[
'initdb', '--no-sync',
'--locale-provider=icu', '--encoding=SQL_ASCII',
+
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',
'--icu-locale=en', "$tempdir/dataX"
],
qr/error: encoding mismatch/,
@@ -160,9 +177,12 @@ if ($ENV{with_icu} eq 'yes')
[
'initdb', '--no-sync',
'--locale-provider=icu',
'--icu-locale=@colNumeric=lower',
+
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',
"$tempdir/dataX"
],
- qr/could not open collator for locale "und-u-kn-lower":
U_ILLEGAL_ARGUMENT_ERROR/,
+ qr/could not open collator for locale ""und-u-kn-lower"":
U_ILLEGAL_ARGUMENT_ERROR/,
'fails for invalid collation argument');
}
else
@@ -184,7 +204,9 @@ command_fails(
],
'fails for invalid option combination');
-command_fails([ 'initdb', '--no-sync', '--set', 'foo=bar', "$tempdir/dataX" ],
+command_fails([ 'initdb', '--no-sync', '--set', 'foo=bar', "$tempdir/dataX",
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',],
'fails for invalid --set option');
# Make sure multiple invocations of -c parameters are added case insensitive
@@ -192,6 +214,8 @@ command_ok(
[
'initdb', '-cwork_mem=128',
'-cWork_Mem=256', '-cWORK_MEM=512',
+ # CBDB_MERGE_16_FIXME: fix initdb defaults selection
+ '--shared_buffers=128000kB', '--max_connections=150',
"$tempdir/dataY"
],
'multiple -c options with different case');
diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm
b/src/test/perl/PostgreSQL/Test/Cluster.pm
index 745a674237e..bfa2196c7d5 100644
--- a/src/test/perl/PostgreSQL/Test/Cluster.pm
+++ b/src/test/perl/PostgreSQL/Test/Cluster.pm
@@ -169,7 +169,7 @@ INIT
$ENV{PGDATABASE} = 'postgres';
# Tracking of last port value assigned to accelerate free port lookup.
- $last_dbid = 0
+ $last_dbid = 0;
my $num_ports = $port_upper_bound - $port_lower_bound;
$last_port_assigned = int(rand() * $num_ports) + $port_lower_bound;
@@ -2258,52 +2258,6 @@ Further raw options or arguments.
=cut
-sub pgbench
-{
- local $Test::Builder::Level = $Test::Builder::Level + 1;
-
- my ($self, $opts, $stat, $out, $err, $name, $files, @args) = @_;
- my @cmd = (
- 'pgbench',
- split(/\s+/, $opts),
- $self->_pgbench_make_files($files), @args);
-
- $self->command_checks_all(\@cmd, $stat, $out, $err, $name);
-}
-
-# Common sub of pgbench-invoking interfaces. Makes any requested script files
-# and returns pgbench command-line options causing use of those files.
-sub _pgbench_make_files
-{
- my ($self, $files) = @_;
- my @file_opts;
-
- if (defined $files)
- {
-
- # note: files are ordered for determinism
- for my $fn (sort keys %$files)
- {
- my $filename = $self->basedir . '/' . $fn;
- push @file_opts, '-f', $filename;
-
- # cleanup file weight
- $filename =~ s/\@\d+$//;
-
- #push @filenames, $filename;
- # filenames are expected to be unique on a test
- if (-e $filename)
- {
- ok(0, "$filename must not already exist");
- unlink $filename or die "cannot unlink
$filename: $!";
- }
- TestLib::append_to_file($filename, $$files{$fn});
- }
- }
-
- return @file_opts;
-}
-
# Test SQL in specific role
sub role_psql
{
diff --git a/src/test/perl/PostgreSQL/Test/Utils.pm
b/src/test/perl/PostgreSQL/Test/Utils.pm
index ec1ac2b0e4e..3d3f9b866d5 100644
--- a/src/test/perl/PostgreSQL/Test/Utils.pm
+++ b/src/test/perl/PostgreSQL/Test/Utils.pm
@@ -1081,35 +1081,4 @@ package PostgreSQL::Test::Utils; ## no critic
(ProhibitMultiplePackages)
no warnings qw(once);
-*generate_ascii_string = *TestLib::generate_ascii_string;
-*slurp_dir = *TestLib::slurp_dir;
-*slurp_file = *TestLib::slurp_file;
-*append_to_file = *TestLib::append_to_file;
-*check_mode_recursive = *TestLib::check_mode_recursive;
-*chmod_recursive = *TestLib::chmod_recursive;
-*check_pg_config = *TestLib::check_pg_config;
-*dir_symlink = *TestLib::dir_symlink;
-*system_or_bail = *TestLib::system_or_bail;
-*system_log = *TestLib::system_log;
-*run_log = *TestLib::run_log;
-*run_command = *TestLib::run_command;
-*command_ok = *TestLib::command_ok;
-*command_fails = *TestLib::command_fails;
-*command_exit_is = *TestLib::command_exit_is;
-*program_help_ok = *TestLib::program_help_ok;
-*program_version_ok = *TestLib::program_version_ok;
-*program_options_handling_ok = *TestLib::program_options_handling_ok;
-*command_like = *TestLib::command_like;
-*command_like_safe = *TestLib::command_like_safe;
-*command_fails_like = *TestLib::command_fails_like;
-*command_checks_all = *TestLib::command_checks_all;
-
-*windows_os = *TestLib::windows_os;
-*is_msys2 = *TestLib::is_msys2;
-*use_unix_sockets = *TestLib::use_unix_sockets;
-*timeout_default = *TestLib::timeout_default;
-*tmp_check = *TestLib::tmp_check;
-*log_path = *TestLib::log_path;
-*test_logfile = *TestLib::test_log_file;
-
1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
