Skip to content

Commit 3787d78

Browse files
committed
roachtest/pg_regress: update diffs
Release note: None
1 parent 48b1345 commit 3787d78

File tree

10 files changed

+394
-604
lines changed

10 files changed

+394
-604
lines changed

pkg/cmd/roachtest/testdata/pg_regress/alter_table.diffs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/alter_table.out -
16301630
-ERROR: column "test" is in a primary key
16311631
+ERROR: column "test" is in a primary index
16321632
alter table atacc1 drop constraint "atacc1_pkey";
1633-
+ERROR: relation "atacc1" (1956): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
1633+
+ERROR: relation "atacc1" (1984): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
16341634
+HINT: You have attempted to use a feature that is not yet implemented.
16351635
+See: https://go.crdb.dev/issue-v/48026/_version_
16361636
alter table atacc1 alter column test drop not null;
@@ -5216,13 +5216,13 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/alter_table.out -
52165216
+ERROR: index with name "tt9_c_key" already exists
52175217
ALTER TABLE tt9 ADD CONSTRAINT foo UNIQUE(c); -- fail, dup name
52185218
-ERROR: constraint "foo" for relation "tt9" already exists
5219-
+ERROR: error executing StatementPhase stage 1 of 1 with 7 MutationType ops: relation "tt9" (2051): duplicate constraint name: "foo"
5219+
+ERROR: error executing StatementPhase stage 1 of 1 with 7 MutationType ops: relation "tt9" (2079): duplicate constraint name: "foo"
52205220
ALTER TABLE tt9 ADD CONSTRAINT tt9_c_key CHECK(c > 5); -- fail, dup name
52215221
-ERROR: constraint "tt9_c_key" for relation "tt9" already exists
5222-
+ERROR: error executing StatementPhase stage 1 of 1 with 2 MutationType ops: relation "tt9" (2051): duplicate constraint name: "tt9_c_key"
5222+
+ERROR: error executing StatementPhase stage 1 of 1 with 2 MutationType ops: relation "tt9" (2079): duplicate constraint name: "tt9_c_key"
52235223
ALTER TABLE tt9 ADD CONSTRAINT tt9_c_key2 CHECK(c > 6);
52245224
ALTER TABLE tt9 ADD UNIQUE(c); -- picks nonconflicting name
5225-
+ERROR: error executing StatementPhase stage 1 of 1 with 7 MutationType ops: relation "tt9" (2051): duplicate constraint name: "tt9_c_key2"
5225+
+ERROR: error executing StatementPhase stage 1 of 1 with 7 MutationType ops: relation "tt9" (2079): duplicate constraint name: "tt9_c_key2"
52265226
\d tt9
52275227
- Table "public.tt9"
52285228
- Column | Type | Collation | Nullable | Default
@@ -5404,7 +5404,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/alter_table.out -
54045404
DELETE FROM old_system_table WHERE othercol = 'somedata';
54055405
TRUNCATE old_system_table;
54065406
ALTER TABLE old_system_table DROP CONSTRAINT new_system_table_pkey;
5407-
+ERROR: relation "old_system_table" (2054): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
5407+
+ERROR: relation "old_system_table" (2082): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
54085408
+HINT: You have attempted to use a feature that is not yet implemented.
54095409
+See: https://go.crdb.dev/issue-v/48026/_version_
54105410
ALTER TABLE old_system_table DROP COLUMN othercol;

pkg/cmd/roachtest/testdata/pg_regress/create_table_like.diffs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_table_like
5454

5555
CREATE TABLE inhf (LIKE inhx, LIKE inhx); /* Throw error */
5656
-ERROR: column "xx" specified more than once
57-
+ERROR: relation "inhf" (1332): duplicate column name: "xx"
57+
+ERROR: relation "inhf" (1360): duplicate column name: "xx"
5858
CREATE TABLE inhf (LIKE inhx INCLUDING DEFAULTS INCLUDING CONSTRAINTS);
5959
INSERT INTO inhf DEFAULT VALUES;
6060
SELECT * FROM inhf; /* Single entry with value 'text' */

pkg/cmd/roachtest/testdata/pg_regress/float8.diffs

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
191191
SELECT power(float8 '-inf', float8 'inf');
192192
power
193193
----------
194-
@@ -631,29 +592,60 @@
194+
@@ -631,9 +592,25 @@
195195
SET f1 = FLOAT8_TBL.f1 * '-1'
196196
WHERE FLOAT8_TBL.f1 > '0.0';
197197
SELECT f.f1 * '1e200' from FLOAT8_TBL f;
@@ -207,20 +207,21 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
207207
+
208208
SELECT f.f1 ^ '1e200' from FLOAT8_TBL f;
209209
-ERROR: value out of range: overflow
210-
-SELECT 0 ^ 0 + 0 ^ 1 + 0 ^ 0.0 + 0 ^ 0.5;
211-
?column?
212-
----------
213-
- 2
214-
-(1 row)
210+
+ ?column?
211+
+----------
215212
+ 0
216213
+ Infinity
217214
+ Infinity
218215
+ Infinity
219216
+ 0
220217
+(5 rows)
218+
+
219+
SELECT 0 ^ 0 + 0 ^ 1 + 0 ^ 0.0 + 0 ^ 0.5;
220+
?column?
221+
----------
222+
@@ -641,19 +618,38 @@
223+
(1 row)
221224

222-
+SELECT 0 ^ 0 + 0 ^ 1 + 0 ^ 0.0 + 0 ^ 0.5;
223-
+ERROR: integer out of range
224225
SELECT ln(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
225226
-ERROR: cannot take logarithm of zero
226227
+ ln
@@ -261,7 +262,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
261262
-1.2345678901234e+200
262263
-1.2345678901234e-200
263264
(5 rows)
264-
@@ -773,7 +765,11 @@
265+
@@ -773,7 +769,11 @@
265266
-- acosh(Inf) should be Inf, but some mingw versions produce NaN, so skip test
266267
-- SELECT acosh(float8 'infinity');
267268
SELECT acosh(float8 '-infinity');
@@ -274,7 +275,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
274275
SELECT acosh(float8 'nan');
275276
acosh
276277
-------
277-
@@ -781,9 +777,17 @@
278+
@@ -781,9 +781,17 @@
278279
(1 row)
279280

280281
SELECT atanh(float8 'infinity');
@@ -294,7 +295,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
294295
SELECT atanh(float8 'nan');
295296
atanh
296297
-------
297-
@@ -803,50 +807,15 @@
298+
@@ -803,50 +811,15 @@
298299
(1.2e-17), (2.3e-13), (1.2e-9),
299300
(0.45), (1.1), (2.1), (3.4), (6), (28),
300301
(float8 'infinity'), (float8 'nan')) AS t(x);
@@ -348,7 +349,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
348349
DROP TABLE FLOAT8_TBL;
349350
-- Check the float8 values exported for use by other tests
350351
SELECT * FROM FLOAT8_TBL;
351-
@@ -867,7 +836,7 @@
352+
@@ -867,7 +840,7 @@
352353
(1 row)
353354

354355
SELECT '32767.6'::float8::int2;
@@ -357,7 +358,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
357358
SELECT '-32768.4'::float8::int2;
358359
int2
359360
--------
360-
@@ -875,7 +844,7 @@
361+
@@ -875,7 +848,7 @@
361362
(1 row)
362363

363364
SELECT '-32768.6'::float8::int2;
@@ -366,7 +367,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
366367
SELECT '2147483647.4'::float8::int4;
367368
int4
368369
------------
369-
@@ -883,7 +852,7 @@
370+
@@ -883,7 +856,7 @@
370371
(1 row)
371372

372373
SELECT '2147483647.6'::float8::int4;
@@ -375,7 +376,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
375376
SELECT '-2147483648.4'::float8::int4;
376377
int4
377378
-------------
378-
@@ -891,7 +860,7 @@
379+
@@ -891,7 +864,7 @@
379380
(1 row)
380381

381382
SELECT '-2147483648.6'::float8::int4;
@@ -384,7 +385,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
384385
SELECT '9223372036854773760'::float8::int8;
385386
int8
386387
---------------------
387-
@@ -899,52 +868,26 @@
388+
@@ -899,52 +872,26 @@
388389
(1 row)
389390

390391
SELECT '9223372036854775807'::float8::int8;
@@ -444,7 +445,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
444445
SELECT x,
445446
tand(x),
446447
tand(x) IN ('-Infinity'::float8,-1,0,
447-
@@ -954,79 +897,117 @@
448+
@@ -954,79 +901,117 @@
448449
1,'Infinity'::float8) AS cotd_exact
449450
FROM (VALUES (0), (45), (90), (135), (180),
450451
(225), (270), (315), (360)) AS t(x);
@@ -604,7 +605,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
604605
-- float8: seeeeeee eeeeeeee eeeeeeee mmmmmmmm mmmmmmmm(x4)
605606
-- we don't care to assume the platform's strtod() handles subnormals
606607
-- correctly; those are "use at your own risk". However we do test
607-
@@ -1051,28 +1032,7 @@
608+
@@ -1051,28 +1036,7 @@
608609
from (select bits::bigint::xfloat8::float8 as flt
609610
from testdata
610611
offset 0) s;
@@ -634,7 +635,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/float8.out --labe
634635
-- round-trip tests
635636
with testdata(bits) as (values
636637
(x'0000000000000000'),
637-
@@ -1220,225 +1180,9 @@
638+
@@ -1220,225 +1184,9 @@
638639
from (select bits::bigint::xfloat8::float8 as flt
639640
from testdata
640641
offset 0) s;

pkg/cmd/roachtest/testdata/pg_regress/functional_deps.diffs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/functional_deps.o
112112
-ERROR: cannot drop constraint articles_pkey on table articles because other objects depend on it
113113
-DETAIL: view fdv1 depends on constraint articles_pkey on table articles
114114
-HINT: Use DROP ... CASCADE to drop the dependent objects too.
115-
+ERROR: relation "articles" (1585): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
115+
+ERROR: relation "articles" (1613): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
116116
+HINT: You have attempted to use a feature that is not yet implemented.
117117
+See: https://go.crdb.dev/issue-v/48026/_version_
118118
DROP VIEW fdv1;
@@ -125,14 +125,14 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/functional_deps.o
125125
-ERROR: cannot drop constraint articles_pkey on table articles because other objects depend on it
126126
-DETAIL: view fdv2 depends on constraint articles_pkey on table articles
127127
-HINT: Use DROP ... CASCADE to drop the dependent objects too.
128-
+ERROR: relation "articles" (1585): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
128+
+ERROR: relation "articles" (1613): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
129129
+HINT: You have attempted to use a feature that is not yet implemented.
130130
+See: https://go.crdb.dev/issue-v/48026/_version_
131131
ALTER TABLE articles_in_category DROP CONSTRAINT articles_in_category_pkey RESTRICT; --fail
132132
-ERROR: cannot drop constraint articles_in_category_pkey on table articles_in_category because other objects depend on it
133133
-DETAIL: view fdv2 depends on constraint articles_in_category_pkey on table articles_in_category
134134
-HINT: Use DROP ... CASCADE to drop the dependent objects too.
135-
+ERROR: relation "articles_in_category" (1586): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
135+
+ERROR: relation "articles_in_category" (1614): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
136136
+HINT: You have attempted to use a feature that is not yet implemented.
137137
+See: https://go.crdb.dev/issue-v/48026/_version_
138138
DROP VIEW fdv2;
@@ -145,7 +145,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/functional_deps.o
145145
-ERROR: cannot drop constraint articles_pkey on table articles because other objects depend on it
146146
-DETAIL: view fdv3 depends on constraint articles_pkey on table articles
147147
-HINT: Use DROP ... CASCADE to drop the dependent objects too.
148-
+ERROR: relation "articles" (1585): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
148+
+ERROR: relation "articles" (1613): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
149149
+HINT: You have attempted to use a feature that is not yet implemented.
150150
+See: https://go.crdb.dev/issue-v/48026/_version_
151151
DROP VIEW fdv3;
@@ -155,7 +155,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/functional_deps.o
155155
-ERROR: cannot drop constraint articles_pkey on table articles because other objects depend on it
156156
-DETAIL: view fdv4 depends on constraint articles_pkey on table articles
157157
-HINT: Use DROP ... CASCADE to drop the dependent objects too.
158-
+ERROR: relation "articles" (1585): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
158+
+ERROR: relation "articles" (1613): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
159159
+HINT: You have attempted to use a feature that is not yet implemented.
160160
+See: https://go.crdb.dev/issue-v/48026/_version_
161161
DROP VIEW fdv4;
@@ -165,7 +165,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/functional_deps.o
165165
(0 rows)
166166

167167
ALTER TABLE articles DROP CONSTRAINT articles_pkey RESTRICT;
168-
+ERROR: relation "articles" (1585): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
168+
+ERROR: relation "articles" (1613): unimplemented: primary key dropped without subsequent addition of new primary key in same transaction
169169
+HINT: You have attempted to use a feature that is not yet implemented.
170170
+See: https://go.crdb.dev/issue-v/48026/_version_
171171
EXECUTE foo; -- fail

0 commit comments

Comments
 (0)