Skip to content

Add custom session parameters option #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgornikov wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add custom session parameters option #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f59bb4a
Added optional initial parameters --session-param for setting other v…
mgornikov Apr 20, 2016
8df4c6d
fatpack
mgornikov Apr 20, 2016
a30afa8
Refactor variable's name
mgornikov Apr 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions fatpack/pgcompact
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4811,6 +4811,16 @@ $fatpacked{"PgToolkit/Registry/Compactor.pm"} = '#line '.(1+__LINE__).' "'.__FIL
user => $options->get(name => 'user'),
dbname => $arg_hash{'dbname'});

my $hard_session_params = {
'lc_messages' => '\'C\'',
'synchronous_commit' => 'off',
'session_replication_role' => 'replica',
'statement_timeout' => '\'0\''
};

my $custom_session_params = $options->get(name => 'custom-session-param');
my $session_params = { %$custom_session_params, %$hard_session_params };

my %param_hash = (
password => (
$options->get(name => 'password') or
Expand All @@ -4822,11 +4832,7 @@ $fatpacked{"PgToolkit/Registry/Compactor.pm"} = '#line '.(1+__LINE__).' "'.__FIL
($ENV{'HOME'} and -r $ENV{'HOME'}.'/.pgpass') ?
$ENV{'HOME'}.'/.pgpass' : undef),
%hpud_hash)),
set_hash => {
'lc_messages' => '\'C\'',
'synchronous_commit' => 'off',
'session_replication_role' => 'replica',
'statement_timeout' => '\'0\''},
set_hash => $session_params,
%hpud_hash);

my $constructor_list = [
Expand Down Expand Up @@ -4909,6 +4915,7 @@ $fatpacked{"PgToolkit/Registry/Compactor.pm"} = '#line '.(1+__LINE__).' "'.__FIL
'min-page-count|x:i' => 10,
'min-free-percent|y:i' => 20,
'progress-report-period|z:i' => 60,
'custom-session-param|b:s%' => {},
# misc
'quiet|q' => 0,
'verbosity|v:s' => 'notice'},
Expand Down Expand Up @@ -5242,15 +5249,17 @@ no strict 'refs';

if ($] < 5.008) {
*{"${class}::INC"} = sub {
if (my $fat = $_[0]{$_[1]}) {
return sub {
return 0 unless length $fat;
$fat =~ s/^([^\n]*\n?)//;
$_ = $1;
return 1;
};
}
return;
if (my $fat = $_[0]{$_[1]}) {
my $pos = 0;
my $last = length $fat;
return (sub {
return 0 if $pos == $last;
my $next = (1 + index $fat, "\n", $pos) || $last;
$_ .= substr $fat, $pos, $next - $pos;
$pos = $next;
return 1;
});
}
};
}

Expand Down
17 changes: 12 additions & 5 deletions lib/PgToolkit/Registry/Compactor.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,16 @@ sub get_database_adapter {
user => $options->get(name => 'user'),
dbname => $arg_hash{'dbname'});

my $hard_session_params = {
'lc_messages' => '\'C\'',
'synchronous_commit' => 'off',
'session_replication_role' => 'replica',
'statement_timeout' => '\'0\''
};

my $custom_session_params = $options->get(name => 'custom-session-param');
my $session_params = { %$custom_session_params, %$hard_session_params };

my %param_hash = (
password => (
$options->get(name => 'password') or
Expand All @@ -167,11 +177,7 @@ sub get_database_adapter {
($ENV{'HOME'} and -r $ENV{'HOME'}.'/.pgpass') ?
$ENV{'HOME'}.'/.pgpass' : undef),
%hpud_hash)),
set_hash => {
'lc_messages' => '\'C\'',
'synchronous_commit' => 'off',
'session_replication_role' => 'replica',
'statement_timeout' => '\'0\''},
set_hash => $session_params,
%hpud_hash);

my $constructor_list = [
Expand Down Expand Up @@ -254,6 +260,7 @@ sub get_options {
'min-page-count|x:i' => 10,
'min-free-percent|y:i' => 20,
'progress-report-period|z:i' => 60,
'custom-session-param|b:s%' => {},
# misc
'quiet|q' => 0,
'verbosity|v:s' => 'notice'},
Expand Down