diff --git a/src/reports/abstract.py b/src/reports/abstract.py index 82b4e4cc..9bc9c74c 100644 --- a/src/reports/abstract.py +++ b/src/reports/abstract.py @@ -81,9 +81,9 @@ def _end_collapsible(self): self.report += """\n====\n\n""" @staticmethod - def _get_plan_diff(original, changed): + def _get_plan_diff(baseline, changed): return "\n".join( - text for text in difflib.unified_diff(original.split("\n"), changed.split("\n")) if + text for text in difflib.unified_diff(baseline.split("\n"), changed.split("\n")) if text[:3] not in ('+++', '---', '@@ ')) def publish_report(self, report_name): diff --git a/src/reports/adoc/comparison.py b/src/reports/adoc/comparison.py index 441be058..f1087a54 100644 --- a/src/reports/adoc/comparison.py +++ b/src/reports/adoc/comparison.py @@ -119,7 +119,10 @@ def __report_query(self, yb_query: Query, pg_query: Query): self._start_source(["diff"]) - diff = self._get_plan_diff(yb_query.execution_plan.full_str, pg_query.execution_plan.full_str) + diff = self._get_plan_diff( + pg_query.execution_plan.full_str, + yb_query.execution_plan.full_str, + ) if not diff: diff = yb_query.execution_plan.full_str diff --git a/src/reports/adoc/score.py b/src/reports/adoc/score.py index f208746f..a87db2c6 100644 --- a/src/reports/adoc/score.py +++ b/src/reports/adoc/score.py @@ -415,8 +415,8 @@ def __report_query(self, yb_query: Type[Query], pg_query: Type[Query], show_best self._start_source(["diff"]) # postgres plan should be red self.report += self._get_plan_diff( - yb_query.execution_plan.full_str, pg_query.execution_plan.full_str, + yb_query.execution_plan.full_str, ) self._end_source() self._end_collapsible() @@ -424,8 +424,8 @@ def __report_query(self, yb_query: Type[Query], pg_query: Type[Query], show_best self._start_collapsible(f"{best_yb_pg_equality}PG best vs YB best") self._start_source(["diff"]) self.report += self._get_plan_diff( - yb_best.execution_plan.full_str, pg_best.execution_plan.full_str, + yb_best.execution_plan.full_str, ) self._end_source() self._end_collapsible() @@ -447,8 +447,10 @@ def __report_query(self, yb_query: Type[Query], pg_query: Type[Query], show_best self.report += f"{default_yb_equality}YB default vs YB best\n" self._start_source(["diff"]) - diff = self._get_plan_diff(yb_query.execution_plan.full_str, - yb_best.execution_plan.full_str) + diff = self._get_plan_diff( + yb_query.execution_plan.full_str, + yb_best.execution_plan.full_str + ) if not diff: diff = yb_query.execution_plan.full_str diff --git a/src/reports/adoc/selectivity.py b/src/reports/adoc/selectivity.py index fdc32a3e..4499221d 100644 --- a/src/reports/adoc/selectivity.py +++ b/src/reports/adoc/selectivity.py @@ -177,8 +177,10 @@ def __report_query(self, self._start_source(["diff"]) - diff = self._get_plan_diff(default.execution_plan.full_str, - all_analyze.execution_plan.full_str) + diff = self._get_plan_diff( + default.execution_plan.full_str, + all_analyze.execution_plan.full_str + ) if not diff: diff = default.execution_plan.full_str diff --git a/src/reports/adoc/taqo.py b/src/reports/adoc/taqo.py index e5e1ef87..472a0b61 100644 --- a/src/reports/adoc/taqo.py +++ b/src/reports/adoc/taqo.py @@ -197,8 +197,8 @@ def __report_query(self, query: Query, pg_query: Query, show_best: bool): if self.config.compare_with_pg: self.report += \ f"!! Result hash|{query.result_hash}|{best_optimization.result_hash} (yb) != {pg_query.result_hash} (pg)" \ - if pg_query.result_hash != query.result_hash else \ - f"Result hash|`{query.result_hash}|{best_optimization.result_hash} (yb) != {pg_query.result_hash} (pg)" + if pg_query.result_hash != query.result_hash else \ + f"Result hash|`{query.result_hash}|{best_optimization.result_hash} (yb) != {pg_query.result_hash} (pg)" elif best_optimization.result_hash != query.result_hash: self.report += f"!! Result hash|{query.result_hash}|{best_optimization.result_hash}" else: @@ -244,15 +244,19 @@ def __report_query(self, query: Query, pg_query: Query, show_best: bool): self._start_collapsible("Best Postgres plan diff with YB default") self._start_source(["diff"]) - self.report += self._get_plan_diff(best_pg.execution_plan.full_str, - query.execution_plan.full_str, ) + self.report += self._get_plan_diff( + query.execution_plan.full_str, + best_pg.execution_plan.full_str, + ) self._end_source() self._end_collapsible() self._start_collapsible("Best Postgres plan diff with YB best") self._start_source(["diff"]) - self.report += self._get_plan_diff(best_pg.execution_plan.full_str, - best_optimization.execution_plan.full_str, ) + self.report += self._get_plan_diff( + best_pg.execution_plan.full_str, + best_optimization.execution_plan.full_str, + ) self._end_source() self._end_collapsible() @@ -273,8 +277,10 @@ def __report_query(self, query: Query, pg_query: Query, show_best: bool): self._start_source(["diff"]) - diff = self._get_plan_diff(query.execution_plan.full_str, - best_optimization.execution_plan.full_str) + diff = self._get_plan_diff( + query.execution_plan.full_str, + best_optimization.execution_plan.full_str + ) if not diff: diff = query.execution_plan.full_str