NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit96e7e1b

committed

Fix random regression failure in test case "collate.icu.utf8"

This is a fix similar to2d7d67c, where slight plan alteration cancause a random failure of this regression test because of an incorecttuple ordering, except that this one involves lookups of pg_type.Similarly to the other case, add ORDER BY clauses to ensure the outputorder.The failure has been seen at least once on buildfarm member skink.Reported-by: Thomas MunroDiscussion:https://postgr.es/m/CA+hUKGLjR9ZBvhXcr9b-NSBHPw9aRgbjyzGE+kqLsT4vwX+nkQ@mail.gmail.comBackpatch-through: 12

1 parent68ef887 commit96e7e1bCopy full SHA for 96e7e1b

File tree

2 files changed

-4

lines changed

src/test/regress
- expected
  - collate.icu.utf8.out
- sql
  - collate.icu.utf8.sql

2 files changed

-4

lines changed

`‎src/test/regress/expected/collate.icu.utf8.out`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1651,14 +1651,16 @@ SELECT relname FROM pg_class WHERE 'PG_CLASS'::text = relname COLLATE case_insen`
`1651`	`1651`	`pg_class`
`1652`	`1652`	`(1 row)`
`1653`	`1653`
`1654`		`-SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND typname <> 'INT2'::text COLLATE case_insensitive;`
	`1654`	`+SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND typname <> 'INT2'::text`
	`1655`	`+ COLLATE case_insensitive ORDER BY typname;`
`1655`	`1656`	`typname`
`1656`	`1657`	`---------`
`1657`	`1658`	`int4`
`1658`	`1659`	`int8`
`1659`	`1660`	`(2 rows)`
`1660`	`1661`
`1661`		`-SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND 'INT2'::text <> typname COLLATE case_insensitive;;`
	`1662`	`+SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND 'INT2'::text <> typname`
	`1663`	`+ COLLATE case_insensitive ORDER BY typname;`
`1662`	`1664`	`typname`
`1663`	`1665`	`---------`
`1664`	`1666`	`int4`

`‎src/test/regress/sql/collate.icu.utf8.sql`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -603,8 +603,10 @@ SELECT 'ὀδυσσεύς' = 'ὈΔΥΣΣΕΎΣ' COLLATE case_insensitive;`
`603`	`603`	`SELECT relnameFROM pg_classWHERE relname='PG_CLASS'::text COLLATE case_insensitive;`
`604`	`604`	`SELECT relnameFROM pg_classWHERE'PG_CLASS'::text= relname COLLATE case_insensitive;`
`605`	`605`
`606`		`-SELECT typnameFROM pg_typeWHERE typnameLIKE'int_'AND typname<>'INT2'::text COLLATE case_insensitive;`
`607`		`-SELECT typnameFROM pg_typeWHERE typnameLIKE'int_'AND'INT2'::text<> typname COLLATE case_insensitive;;`
	`606`	`+SELECT typnameFROM pg_typeWHERE typnameLIKE'int_'AND typname<>'INT2'::text`
	`607`	`+ COLLATE case_insensitiveORDER BY typname;`
	`608`	`+SELECT typnameFROM pg_typeWHERE typnameLIKE'int_'AND'INT2'::text<> typname`
	`609`	`+ COLLATE case_insensitiveORDER BY typname;`
`608`	`610`
`609`	`611`	`-- test case adapted from subselect.sql`
`610`	`612`	`CREATE TEMP TABLE outer_text (f1text COLLATE case_insensitive, f2text);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit96e7e1b

File tree

2 files changed

2 files changed

`‎src/test/regress/expected/collate.icu.utf8.out`

`‎src/test/regress/sql/collate.icu.utf8.sql`

0 commit comments