From 9d34fda5313ff92b248c9fcd3fb66041a347d767 Mon Sep 17 00:00:00 2001 From: pavel-zotov Date: Tue, 24 Sep 2024 00:01:37 +0300 Subject: [PATCH] Added/Updated tests\functional\arno\optimizer\test_opt_inner_join_05.py: Changed substitutions: one need to suppress '(keys: N, total key length: M)' in FB 6.x after commit c50b0aa6 ('Add key info to the hash join plan output'). --- .../arno/optimizer/test_opt_inner_join_05.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_05.py b/tests/functional/arno/optimizer/test_opt_inner_join_05.py index f08ea254..4abba726 100644 --- a/tests/functional/arno/optimizer/test_opt_inner_join_05.py +++ b/tests/functional/arno/optimizer/test_opt_inner_join_05.py @@ -13,6 +13,14 @@ NOTES: https://github.com/FirebirdSQL/firebird/commit/ae427762d5a3e740b69c7239acb9e2383bc9ca83 // FB 5.x ("More realistic cardinality adjustments for unmatchable booleans, this should also fix #7904: FB5 bad plan for query") Letter from dimitr, 15.12.2023 10:05. + + [24.09.2024] pzotov + Changed substitutions: one need to suppress '(keys: N, total key length: M)' in FB 6.x (and ONLY there), + otherwise actual and expected output become differ. + Commit: https://github.com/FirebirdSQL/firebird/commit/c50b0aa652014ce3610a1890017c9dd436388c43 + ("Add key info to the hash join plan output", 23.09.2024 18:26) + Discussed with dimitr. + Checked on 6.0.0.467-cc183f5, 5.0.2.1513 """ import pytest @@ -308,7 +316,12 @@ init_script = """ db = db_factory(init=init_script) -substitutions = [('record length:\\s+\\d+', 'record length'), ('key length:\\s+\\d+', 'key length') ] +substitutions = \ + [ + ( r'\(record length: \d+, key length: \d+\)', '' ) # (record length: 132, key length: 16) + ,( r'\(keys: \d+, total key length: \d+\)', '' ) # (keys: 1, total key length: 2) + ] + act = python_act('db', substitutions = substitutions) #----------------------------------------------------------