From 5499706bdf60235f787eae9d2b541444ef0b31b3 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 6 Apr 2023 18:13:49 -0400 Subject: [PATCH] Stabilize just-added regression test cases. The tests added by commits 029dea882 et al turn out to produce different output under -DRANDOMIZE_ALLOCATED_MEMORY. This is not a bug exactly: that flag causes coerce_type() to invoke the input function twice when coercing an unknown-type literal to a specific type. So you get tsqueryin's bleat about an empty tsquery twice. Revise the test query to avoid that. Discussion: https://postgr.es/m/20230406213813.uep7plg6lvcywujo@awork3.anarazel.de --- src/test/regress/expected/tsearch.out | 8 ++------ src/test/regress/sql/tsearch.sql | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out index 6b3ad38f39..cfa391ac51 100644 --- a/src/test/regress/expected/tsearch.out +++ b/src/test/regress/expected/tsearch.out @@ -2129,20 +2129,16 @@ to_tsquery('english','Lorem') && phraseto_tsquery('english','ullamcorper urna'), -- Edge cases with empty query SELECT ts_headline('english', -'', ''::tsquery); +'', to_tsquery('english', '')); NOTICE: text-search query doesn't contain lexemes: "" -LINE 2: '', ''::tsquery); - ^ ts_headline ------------- (1 row) SELECT ts_headline('english', -'foo bar', ''::tsquery); +'foo bar', to_tsquery('english', '')); NOTICE: text-search query doesn't contain lexemes: "" -LINE 2: 'foo bar', ''::tsquery); - ^ ts_headline ------------- foo bar diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql index f6f5fb5c27..db2e09be94 100644 --- a/src/test/regress/sql/tsearch.sql +++ b/src/test/regress/sql/tsearch.sql @@ -642,9 +642,9 @@ to_tsquery('english','Lorem') && phraseto_tsquery('english','ullamcorper urna'), -- Edge cases with empty query SELECT ts_headline('english', -'', ''::tsquery); +'', to_tsquery('english', '')); SELECT ts_headline('english', -'foo bar', ''::tsquery); +'foo bar', to_tsquery('english', '')); --Rewrite sub system