diff options
author | Peter Eisentraut | 2023-07-04 12:31:57 +0000 |
---|---|---|
committer | Peter Eisentraut | 2023-07-04 12:31:57 +0000 |
commit | 657f5f223e8fd9aa12d8d9fc473faecc267b9b7a (patch) | |
tree | 14e8d6ed4e9be2b368b584c007ce2defce953fc0 /contrib/test_decoding | |
parent | 625d5b3ca0968c1d8c080d5210f7209184c0d134 (diff) |
Remove incidental md5() function uses from several tests
This removes md5() function calls from these test suites:
- bloom
- test_decoding
- isolation
- recovery
- subscription
This covers all remaining test suites where md5() calls were just used
to generate some random data and can be replaced by appropriately
adapted sha256() calls. This will eventually allow these tests to
pass in OpenSSL FIPS mode (which does not allow MD5 use). See also
208bf364a9. Unlike for the main regression tests, I didn't write a
fipshash() wrapper here, because that would have been too repetitive
and wouldn't really save much here. In some cases it was easier to
remove one layer of indirection by changing column types from text to
bytea.
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Discussion: https://www.postgresql.org/message-id/flat/f9b480b5-e473-d2d1-223a-4b9db30a229a@eisentraut.org
Diffstat (limited to 'contrib/test_decoding')
-rw-r--r-- | contrib/test_decoding/expected/concurrent_stream.out | 6 | ||||
-rw-r--r-- | contrib/test_decoding/specs/concurrent_stream.spec | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/test_decoding/expected/concurrent_stream.out b/contrib/test_decoding/expected/concurrent_stream.out index bf1e1326c61..1e5e2d1b111 100644 --- a/contrib/test_decoding/expected/concurrent_stream.out +++ b/contrib/test_decoding/expected/concurrent_stream.out @@ -2,11 +2,11 @@ Parsed test spec with 3 sessions starting permutation: s0_begin s0_ddl s1_ddl s1_begin s1_toast_insert s2_ddl s1_commit s1_get_stream_changes step s0_begin: BEGIN; -step s0_ddl: CREATE TABLE stream_test1(data text); -step s1_ddl: CREATE TABLE stream_test(data text); +step s0_ddl: CREATE TABLE stream_test1(data bytea); +step s1_ddl: CREATE TABLE stream_test(data bytea); step s1_begin: BEGIN; step s1_toast_insert: INSERT INTO stream_test SELECT large_val(); -step s2_ddl: CREATE TABLE stream_test2(data text); +step s2_ddl: CREATE TABLE stream_test2(data bytea); step s1_commit: COMMIT; step s1_get_stream_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL,NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'stream-changes', '1'); data diff --git a/contrib/test_decoding/specs/concurrent_stream.spec b/contrib/test_decoding/specs/concurrent_stream.spec index 54218a4b3f6..7b5c3ec79d8 100644 --- a/contrib/test_decoding/specs/concurrent_stream.spec +++ b/contrib/test_decoding/specs/concurrent_stream.spec @@ -8,7 +8,7 @@ setup -- consume DDL SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1'); - CREATE OR REPLACE FUNCTION large_val() RETURNS TEXT LANGUAGE SQL AS 'select array_agg(md5(g::text))::text from generate_series(1, 80000) g'; + CREATE OR REPLACE FUNCTION large_val() RETURNS bytea LANGUAGE SQL AS $$ select string_agg(sha256(g::text::bytea), '') from generate_series(1, 83000) g $$; } teardown @@ -21,11 +21,11 @@ teardown session "s0" setup { SET synchronous_commit=on; } step "s0_begin" { BEGIN; } -step "s0_ddl" {CREATE TABLE stream_test1(data text);} +step "s0_ddl" {CREATE TABLE stream_test1(data bytea);} session "s2" setup { SET synchronous_commit=on; } -step "s2_ddl" {CREATE TABLE stream_test2(data text);} +step "s2_ddl" {CREATE TABLE stream_test2(data bytea);} # The transaction commit for s1_ddl will add the INTERNAL_SNAPSHOT change to # the currently running s0_ddl and we want to test that s0_ddl should not get @@ -34,7 +34,7 @@ step "s2_ddl" {CREATE TABLE stream_test2(data text);} # what gets streamed. session "s1" setup { SET synchronous_commit=on; } -step "s1_ddl" { CREATE TABLE stream_test(data text); } +step "s1_ddl" { CREATE TABLE stream_test(data bytea); } step "s1_begin" { BEGIN; } step "s1_toast_insert" {INSERT INTO stream_test SELECT large_val();} step "s1_commit" { COMMIT; } |