diff --git a/src/test/regress/expected/columnar_index_concurrency.out b/src/test/regress/expected/columnar_index_concurrency.out index 8235588c0..1079f7c50 100644 --- a/src/test/regress/expected/columnar_index_concurrency.out +++ b/src/test/regress/expected/columnar_index_concurrency.out @@ -27,8 +27,10 @@ step s1-check-test-1-2: SELECT SUM(a)=30 FROM columnar_table WHERE a=5 OR a=25; ?column? - +--------------------------------------------------------------------- t +(1 row) + step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; @@ -60,8 +62,10 @@ step s1-check-test-1-2: SELECT SUM(a)=30 FROM columnar_table WHERE a=5 OR a=25; ?column? - +--------------------------------------------------------------------- t +(1 row) + step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; @@ -112,11 +116,15 @@ step s1-check-test-3: SELECT SUM(a)=55 FROM columnar_table WHERE a=5 OR a=15 OR a=35; ?column? - +--------------------------------------------------------------------- t +(1 row) + ?column? - +--------------------------------------------------------------------- t +(1 row) + step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; @@ -176,11 +184,15 @@ step s1-check-test-4: SELECT SUM(a)=225 FROM columnar_table WHERE a=25 OR a=35 OR a=45 OR a=55 OR a=65; ?column? - +--------------------------------------------------------------------- t +(1 row) + ?column? - +--------------------------------------------------------------------- t +(1 row) + step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; @@ -241,8 +253,10 @@ step s1-check-test-1-2: SELECT SUM(a)=30 FROM columnar_table WHERE a=5 OR a=25; ?column? - +--------------------------------------------------------------------- t +(1 row) + step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; @@ -296,11 +310,15 @@ step s1-check-test-3: SELECT SUM(a)=55 FROM columnar_table WHERE a=5 OR a=15 OR a=35; ?column? - +--------------------------------------------------------------------- t +(1 row) + ?column? - +--------------------------------------------------------------------- t +(1 row) + step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; @@ -363,11 +381,15 @@ step s1-check-test-4: SELECT SUM(a)=225 FROM columnar_table WHERE a=25 OR a=35 OR a=45 OR a=55 OR a=65; ?column? - +--------------------------------------------------------------------- t +(1 row) + ?column? - +--------------------------------------------------------------------- t +(1 row) + step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; @@ -392,7 +414,7 @@ step s1-commit: COMMIT; step s2-create-unique-index-concurrently: <... completed> -error in steps s1-commit s2-create-unique-index-concurrently: ERROR: could not create unique index "conc_unique_s2_idx" +ERROR: could not create unique index "conc_unique_s2_idx" step s1-reset-table: DROP INDEX IF EXISTS idx_s2, conc_s2_idx, conc_unique_s2_idx, unique_idx_s2, conc_partial_s2_idx; TRUNCATE columnar_table; diff --git a/src/test/regress/expected/columnar_vacuum_vs_insert.out b/src/test/regress/expected/columnar_vacuum_vs_insert.out index 169546e1e..f229c4c71 100644 --- a/src/test/regress/expected/columnar_vacuum_vs_insert.out +++ b/src/test/regress/expected/columnar_vacuum_vs_insert.out @@ -27,14 +27,16 @@ step s1-commit: step s2-select: SELECT * FROM test_vacuum_vs_insert; -a b +a|b +--------------------------------------------------------------------- +1|2 +2|4 +3|6 +1|2 +2|4 +3|6 +(6 rows) -1 2 -2 4 -3 6 -1 2 -2 4 -3 6 starting permutation: s1-insert s1-begin s1-insert s2-vacuum-full s1-commit s2-select step s1-insert: @@ -49,7 +51,7 @@ step s1-insert: step s2-vacuum-full: VACUUM FULL VERBOSE test_vacuum_vs_insert; -step s1-commit: +step s1-commit: COMMIT; s2: INFO: vacuuming "public.test_vacuum_vs_insert" @@ -59,11 +61,13 @@ step s2-vacuum-full: <... completed> step s2-select: SELECT * FROM test_vacuum_vs_insert; -a b +a|b +--------------------------------------------------------------------- +1|2 +2|4 +3|6 +1|2 +2|4 +3|6 +(6 rows) -1 2 -2 4 -3 6 -1 2 -2 4 -3 6 diff --git a/src/test/regress/expected/columnar_write_concurrency.out b/src/test/regress/expected/columnar_write_concurrency.out index 2be90b141..2d98674f7 100644 --- a/src/test/regress/expected/columnar_write_concurrency.out +++ b/src/test/regress/expected/columnar_write_concurrency.out @@ -16,19 +16,23 @@ step s2-insert: step s1-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b +a|b +--------------------------------------------------------------------- +1|2 +2|4 +3|6 +(3 rows) -1 2 -2 4 -3 6 step s2-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b +a| b +--------------------------------------------------------------------- +4| 8 +5|10 +6|12 +(3 rows) -4 8 -5 10 -6 12 step s1-commit: COMMIT; @@ -38,14 +42,16 @@ step s2-commit: step s1-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b +a| b +--------------------------------------------------------------------- +1| 2 +2| 4 +3| 6 +4| 8 +5|10 +6|12 +(6 rows) -1 2 -2 4 -3 6 -4 8 -5 10 -6 12 starting permutation: s1-begin s2-begin s1-copy s2-insert s1-select s2-select s1-commit s2-commit s1-select step s1-begin: @@ -63,19 +69,23 @@ step s2-insert: step s1-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b + a|b +--------------------------------------------------------------------- +11| +12| +13| +(3 rows) -11 -12 -13 step s2-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b +a| b +--------------------------------------------------------------------- +4| 8 +5|10 +6|12 +(3 rows) -4 8 -5 10 -6 12 step s1-commit: COMMIT; @@ -85,14 +95,16 @@ step s2-commit: step s1-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b + a| b +--------------------------------------------------------------------- + 4| 8 + 5|10 + 6|12 +11| +12| +13| +(6 rows) -4 8 -5 10 -6 12 -11 -12 -13 starting permutation: s1-begin s2-begin s2-insert s1-copy s1-select s2-select s1-commit s2-commit s1-select step s1-begin: @@ -110,19 +122,23 @@ step s1-copy: step s1-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b + a|b +--------------------------------------------------------------------- +11| +12| +13| +(3 rows) -11 -12 -13 step s2-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b +a| b +--------------------------------------------------------------------- +4| 8 +5|10 +6|12 +(3 rows) -4 8 -5 10 -6 12 step s1-commit: COMMIT; @@ -132,14 +148,16 @@ step s2-commit: step s1-select: SELECT * FROM test_insert_concurrency ORDER BY a; -a b + a| b +--------------------------------------------------------------------- + 4| 8 + 5|10 + 6|12 +11| +12| +13| +(6 rows) -4 8 -5 10 -6 12 -11 -12 -13 starting permutation: s1-truncate s1-begin s1-insert-10000-rows s2-begin s2-insert s2-commit s1-commit s1-verify-metadata step s1-truncate: @@ -180,5 +198,7 @@ step s1-verify-metadata: FROM test_insert_concurrency_stripes; stripe_metadata_for_test_insert_concurrency_ok - +--------------------------------------------------------------------- t +(1 row) +