mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-21 11:30:24 +00:00
Merged fix-937234-pqa-wrong-res.001
This commit is contained in:
@@ -3816,9 +3816,14 @@ sub get_rules {
|
||||
grep { $_->{column} }
|
||||
@$groupby;
|
||||
return unless scalar %groupby_col;
|
||||
my $cols = $event->{query_struct}->{columns};
|
||||
my $cols = [
|
||||
grep { _looks_like_column($_->{col}) }
|
||||
grep { ! exists $_->{func} }
|
||||
@{$event->{query_struct}->{columns}}
|
||||
];
|
||||
foreach my $col ( @$cols ) {
|
||||
return 0 unless $groupby_col{ $col->{col} };
|
||||
return 0 unless $groupby_col{ $col->{col} }
|
||||
|| ($col->{alias} && $groupby_col{ $col->{alias} });
|
||||
}
|
||||
return;
|
||||
},
|
||||
@@ -4052,6 +4057,13 @@ sub determine_table_for_column {
|
||||
return;
|
||||
}
|
||||
|
||||
sub _looks_like_column {
|
||||
my $col = shift;
|
||||
return if $col eq '*' || uc($col) eq 'NULL';
|
||||
return if $col =~ /\A(?:\b[0-9]+\b|\@{1,2}.+)/;
|
||||
return $col;
|
||||
}
|
||||
|
||||
sub _d {
|
||||
my ($package, undef, $line) = caller 0;
|
||||
@_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
|
||||
|
Reference in New Issue
Block a user