From a8258bf784a1270d8ea80238a30d17da3716b2bc Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Sat, 25 May 2024 15:04:11 +0300 Subject: [PATCH] PR-471 - Support adding explain output for slow query in JSON report as well - Removed paths from my laptop from tests --- t/pt-query-digest/explain.t | 2 ++ t/pt-query-digest/samples/slow007_explain_json_1-57.txt | 2 +- t/pt-query-digest/samples/slow007_explain_json_1-80.txt | 2 +- t/pt-query-digest/samples/slow007_explain_json_2-57.txt | 2 +- t/pt-query-digest/samples/slow007_explain_json_2-80.txt | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/t/pt-query-digest/explain.t b/t/pt-query-digest/explain.t index ca52eb29..3f861efe 100644 --- a/t/pt-query-digest/explain.t +++ b/t/pt-query-digest/explain.t @@ -61,6 +61,7 @@ SKIP: { ( $sandbox_version ge '8.0' ? "t/pt-query-digest/samples/slow007_explain_json_1-80.txt" : "t/pt-query-digest/samples/slow007_explain_json_1-57.txt"), post_pipe => 'jq -S .', + sed => [ q/'s!"name": ".*slow007.txt"!"name": "slow007.txt"!'/ ], ), 'Analysis for slow007 with --explain and --output=json, no rows', ); @@ -96,6 +97,7 @@ SKIP: { ( $sandbox_version ge '8.0' ? "t/pt-query-digest/samples/slow007_explain_json_2-80.txt" : "t/pt-query-digest/samples/slow007_explain_json_2-57.txt"), post_pipe => 'jq -S .', + sed => [ q/'s!"name": ".*slow007.txt"!"name": "slow007.txt"!'/ ], ), 'Analysis for slow007 with --explain and --output=json', ); diff --git a/t/pt-query-digest/samples/slow007_explain_json_1-57.txt b/t/pt-query-digest/samples/slow007_explain_json_1-57.txt index 154d8436..c3bd2615 100644 --- a/t/pt-query-digest/samples/slow007_explain_json_1-57.txt +++ b/t/pt-query-digest/samples/slow007_explain_json_1-57.txt @@ -129,7 +129,7 @@ "global": { "files": [ { - "name": "/home/sveta/src/percona/percona-toolkit/t/lib/samples/slowlogs/slow007.txt", + "name": "slow007.txt", "size": 368 } ], diff --git a/t/pt-query-digest/samples/slow007_explain_json_1-80.txt b/t/pt-query-digest/samples/slow007_explain_json_1-80.txt index 40f18082..0323994e 100644 --- a/t/pt-query-digest/samples/slow007_explain_json_1-80.txt +++ b/t/pt-query-digest/samples/slow007_explain_json_1-80.txt @@ -129,7 +129,7 @@ "global": { "files": [ { - "name": "/home/sveta/src/percona/percona-toolkit/t/lib/samples/slowlogs/slow007.txt", + "name": "slow007.txt", "size": 368 } ], diff --git a/t/pt-query-digest/samples/slow007_explain_json_2-57.txt b/t/pt-query-digest/samples/slow007_explain_json_2-57.txt index bbcf32b4..390f5164 100644 --- a/t/pt-query-digest/samples/slow007_explain_json_2-57.txt +++ b/t/pt-query-digest/samples/slow007_explain_json_2-57.txt @@ -129,7 +129,7 @@ "global": { "files": [ { - "name": "/home/sveta/src/percona/percona-toolkit/t/lib/samples/slowlogs/slow007.txt", + "name": "slow007.txt", "size": 368 } ], diff --git a/t/pt-query-digest/samples/slow007_explain_json_2-80.txt b/t/pt-query-digest/samples/slow007_explain_json_2-80.txt index e744b740..87a1cc22 100644 --- a/t/pt-query-digest/samples/slow007_explain_json_2-80.txt +++ b/t/pt-query-digest/samples/slow007_explain_json_2-80.txt @@ -129,7 +129,7 @@ "global": { "files": [ { - "name": "/home/sveta/src/percona/percona-toolkit/t/lib/samples/slowlogs/slow007.txt", + "name": "slow007.txt", "size": 368 } ],