git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31ae2aa)
Stabilize just-added regression test cases.
author Tom Lane <tgl@sss.pgh.pa.us>
Thu, 6 Apr 2023 22:13:49 +0000 (18:13 -0400)
committer Tom Lane <tgl@sss.pgh.pa.us>
Thu, 6 Apr 2023 22:13:49 +0000 (18:13 -0400)
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 patch | blob | blame | history
src/test/regress/sql/tsearch.sql patch | blob | blame | history

diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out
index 6b3ad38f39689d5fec91368ce290a9f121f2adfb..cfa391ac5127c655bd1654f10320bf05c1c5197f 100644 (file)
--- 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 f6f5fb5c2704971850ff2a18a4fbbb74f331475e..db2e09be94c87d3cee1f4513949d16983c26137f 100644 (file)
--- 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
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /