percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-09 07:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed indirect object syntax from the modulino portion of pt-query-digest

Browse Source
This commit is contained in:
Brian Fraser
2011-12-26 11:09:33 -03:00
parent 451f25a932
commit c4f127092d
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
bin/pt-query-digest
View File

@@ -11803,7 +11803,7 @@ sub main {
# ########################################################################## # ##########################################################################
# Get configuration information. # Get configuration information.
# ########################################################################## # ##########################################################################
my $o = new OptionParser(); my $o = OptionParser->new();
$o->get_specs(); $o->get_specs();
$o->get_opts(); $o->get_opts();
@@ -11888,9 +11888,9 @@ sub main {
# ######################################################################## # ########################################################################
# Common modules. # Common modules.
# ####################################################################### # #######################################################################
my $q = new Quoter(); my $q = Quoter->new();
my $qp = new QueryParser(); my $qp = QueryParser->new();
my $qr = new QueryRewriter(QueryParser=>$qp); my $qr = QueryRewriter->new(QueryParser=>$qp);
my %common_modules = ( my %common_modules = (
OptionParser => $o, OptionParser => $o,
DSNParser => $dp, DSNParser => $dp,
@@ -11913,7 +11913,7 @@ sub main {
); );
$ep_dbh->{InactiveDestroy} = 1; # Don't die on fork(). $ep_dbh->{InactiveDestroy} = 1; # Don't die on fork().
$exa = new ExplainAnalyzer( $exa = ExplainAnalyzer->new(
QueryRewriter => $qr, QueryRewriter => $qr,
QueryParser => $qp, QueryParser => $qp,
); );
@@ -11926,8 +11926,8 @@ sub main {
my $qv_dbh; # For QueryReview my $qv_dbh; # For QueryReview
my $qv_dbh2; # For QueryReview and --review-history my $qv_dbh2; # For QueryReview and --review-history
if ( $review_dsn ) { if ( $review_dsn ) {
my $tp = new TableParser(Quoter => $q); my $tp = TableParser->new(Quoter => $q);
my $du = new MySQLDump(); my $du = MySQLDump->new();
$qv_dbh = get_cxn( $qv_dbh = get_cxn(
for => '--review', for => '--review',
dsn => $review_dsn, dsn => $review_dsn,
@@ -11962,7 +11962,7 @@ sub main {
# Set up the new QueryReview object. # Set up the new QueryReview object.
my $struct = $tp->parse($du->get_create_table($qv_dbh, $q, @db_tbl)); my $struct = $tp->parse($du->get_create_table($qv_dbh, $q, @db_tbl));
$qv = new QueryReview( $qv = QueryReview->new(
dbh => $qv_dbh, dbh => $qv_dbh,
db_tbl => $db_tbl, db_tbl => $db_tbl,
tbl_struct => $struct, tbl_struct => $struct,
@@ -12067,7 +12067,7 @@ sub main {
my $instrument = $o->get('pipeline-profile') || $o->get('execute-throttle'); my $instrument = $o->get('pipeline-profile') || $o->get('execute-throttle');
MKDEBUG && _d('Instrument:', $instrument); MKDEBUG && _d('Instrument:', $instrument);
my $pipeline = new Pipeline( my $pipeline = Pipeline->new(
instrument => $instrument, instrument => $instrument,
continue_on_error => $o->get('continue-on-error'), continue_on_error => $o->get('continue-on-error'),
); );
@@ -12096,7 +12096,7 @@ sub main {
} # prep } # prep
{ # input { # input
my $fi = new FileIterator(); my $fi = FileIterator->new();
my $next_file = $fi->get_file_itr(@ARGV); my $next_file = $fi->get_file_itr(@ARGV);
my $input_fh; # the current input fh my $input_fh; # the current input fh
my $pr; # Progress obj for ^ my $pr; # Progress obj for ^
@@ -12138,7 +12138,7 @@ sub main {
# Make a progress reporter, one per file. # Make a progress reporter, one per file.
if ( $o->get('progress') && $filename && -e $filename ) { if ( $o->get('progress') && $filename && -e $filename ) {
$pr = new Progress( $pr = Progress->new(
jobsize => $filesize, jobsize => $filesize,
spec => $o->get('progress'), spec => $o->get('progress'),
name => $filename, name => $filename,
@@ -12161,8 +12161,8 @@ sub main {
{ # event { # event
my $misc; my $misc;
if ( my $ps_dsn = $o->get('processlist') ) { if ( my $ps_dsn = $o->get('processlist') ) {
my $ms = new MasterSlave(); my $ms = MasterSlave->new();
my $pl = new Processlist( my $pl = Processlist->new(
interval => $o->get('interval') * 1_000_000, interval => $o->get('interval') * 1_000_000,
MasterSlave => $ms MasterSlave => $ms
); );
@@ -12321,7 +12321,7 @@ sub main {
else { else {
$now_callback = sub { return; }; $now_callback = sub { return; };
} }
$pipeline_data->{Runtime} = new Runtime( $pipeline_data->{Runtime} = Runtime->new(
now => $now_callback, now => $now_callback,
runtime => $o->get('run-time'), runtime => $o->get('run-time'),
); );
@@ -12537,7 +12537,7 @@ sub main {
if ( $o->get('statistics') ) { if ( $o->get('statistics') ) {
if ( keys %stats ) { if ( keys %stats ) {
my $report = new ReportFormatter( my $report = ReportFormatter->new(
line_width => 74, line_width => 74,
); );
$report->set_columns( $report->set_columns(
@@ -12858,7 +12858,7 @@ sub main {
); );
}; };
$et = new ExecutionThrottler( $et = ExecutionThrottler->new(
rate_max => $rate_max, rate_max => $rate_max,
get_rate => $get_rate, get_rate => $get_rate,
check_int => $int, check_int => $int,
@@ -12974,7 +12974,7 @@ sub main {
} # execute throttle and execute } # execute throttle and execute
if ( $o->get('print') ) { if ( $o->get('print') ) {
my $w = new SlowLogWriter(); my $w = SlowLogWriter->new();
$pipeline->add( $pipeline->add(
name => 'print', name => 'print',
process => sub { process => sub {
@@ -13017,7 +13017,7 @@ sub main {
Killed => 'bool', Killed => 'bool',
}; };
my $ea = new EventAggregator( my $ea = EventAggregator->new(
groupby => $groupby, groupby => $groupby,
attributes => { %attributes }, attributes => { %attributes },
worst => $orderby_attrib, worst => $orderby_attrib,
@@ -13040,7 +13040,7 @@ sub main {
# If user wants a timeline report, too, then create an EventTimeline # If user wants a timeline report, too, then create an EventTimeline
# aggregator for this groupby attrib and add it to the callbacks, too. # aggregator for this groupby attrib and add it to the callbacks, too.
if ( $o->get('timeline') ) { if ( $o->get('timeline') ) {
my $tl = new EventTimeline( my $tl = EventTimeline->new(
groupby => [$groupby], groupby => [$groupby],
attributes => [qw(Query_time ts)], attributes => [qw(Query_time ts)],
); );
@@ -13062,13 +13062,13 @@ sub main {
# ######################################################################## # ########################################################################
my $daemon; my $daemon;
if ( $o->get('daemonize') ) { if ( $o->get('daemonize') ) {
$daemon = new Daemon(o=>$o); $daemon = Daemon->new(o=>$o);
$daemon->daemonize(); $daemon->daemonize();
MKDEBUG && _d('I am a daemon now'); MKDEBUG && _d('I am a daemon now');
} }
elsif ( $o->get('pid') ) { elsif ( $o->get('pid') ) {
# We're not daemoninzing, it just handles PID stuff. # We're not daemoninzing, it just handles PID stuff.
$daemon = new Daemon(o=>$o); $daemon = Daemon->new(o=>$o);
$daemon->make_PID_file(); $daemon->make_PID_file();
} }
@@ -13159,14 +13159,14 @@ sub print_reports {
$print_header = 1; $print_header = 1;
} }
my $qrf = new QueryReportFormatter( my $qrf = QueryReportFormatter->new(
dbh => $ep_dbh, dbh => $ep_dbh,
%args, %args,
); );
# http://code.google.com/p/maatkit/issues/detail?id=1141 # http://code.google.com/p/maatkit/issues/detail?id=1141
$qrf->set_report_formatter( $qrf->set_report_formatter(
report => 'profile', report => 'profile',
formatter => new ReportFormatter ( formatter => ReportFormatter->new(
line_width => $o->get('explain') ? 82 : 74, line_width => $o->get('explain') ? 82 : 74,
long_last_column => 1, long_last_column => 1,
extend_right => 1, extend_right => 1,
@@ -13221,7 +13221,7 @@ sub print_reports {
} # Each groupby } # Each groupby
if ( $o->get('pipeline-profile') ) { if ( $o->get('pipeline-profile') ) {
my $report = new ReportFormatter( my $report = ReportFormatter->new(
line_width => 74, line_width => 74,
); );
$report->set_columns( $report->set_columns(