Skip to content

Commit

Permalink
Rewrite test files with -rewrite-results-in-testfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@rampage644
rampage644 committed Jul 25, 2017
1 parent 1526875 commit cd7db95
Show file tree
Hide file tree
Showing 40 changed files with 2,021 additions and 2,021 deletions.
502 changes: 251 additions & 251 deletions pkg/sql/logictest/testdata/logic_test/aggregate
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions pkg/sql/logictest/testdata/logic_test/alter_table
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ FROM crdb_internal.jobs
ORDER BY created DESC
LIMIT 1
----
SCHEMA CHANGE ALTER TABLE t ADD CONSTRAINT foo UNIQUE (b) root succeeded 1
SCHEMA CHANGE ALTER TABLE t ADD CONSTRAINT foo UNIQUE (b) root succeeded 1 ·

statement error duplicate constraint name: "foo"
ALTER TABLE t ADD CONSTRAINT foo UNIQUE (b)
Expand Down Expand Up @@ -87,7 +87,7 @@ FROM crdb_internal.jobs
ORDER BY created DESC
LIMIT 2
----
SCHEMA CHANGE ROLL BACK ALTER TABLE t ADD CONSTRAINT bar UNIQUE (c) root succeeded 1.00
SCHEMA CHANGE ROLL BACK ALTER TABLE t ADD CONSTRAINT bar UNIQUE (c) root succeeded 1.00 ·
SCHEMA CHANGE ALTER TABLE t ADD CONSTRAINT bar UNIQUE (c) root failed 0.10 duplicate key value (c)=(1) violates unique constraint "bar"

query IIII colnames,rowsort
Expand Down Expand Up @@ -286,7 +286,7 @@ FROM crdb_internal.jobs
ORDER BY created DESC
LIMIT 1
----
SCHEMA CHANGE DROP INDEX t@t_f_idx root succeeded 1
SCHEMA CHANGE DROP INDEX t@t_f_idx root succeeded 1 ·

statement ok
ALTER TABLE t DROP COLUMN f
Expand Down Expand Up @@ -623,14 +623,14 @@ CREATE TABLE s (k1 INT, k2 INT, v INT, PRIMARY KEY (k1,k2))
query ITTTTT colnames
EXPLAIN (METADATA) ALTER TABLE s SPLIT AT SELECT k1,k2 FROM s ORDER BY k1 LIMIT 3
----
Level Type Field Description Columns Ordering
0 split (key, pretty)
1 limit (k1, k2) +k1
2 render (k1, k2) +k1
3 scan (k1, k2, v[omitted]) +k1
3 table s@primary
3 spans ALL
3 limit 3
Level Type Field Description Columns Ordering
0 split · · (key, pretty) ·
1 limit · · (k1, k2) +k1
2 render · · (k1, k2) +k1
3 scan · · (k1, k2, v[omitted]) +k1
3 · table s@primary · ·
3 · spans ALL · ·
3 · limit 3 · ·

# Verify that impure defaults are evaluated separately on each row
# (#14352)
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/logictest/testdata/logic_test/array
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SELECT ARRAY['a,', 'b{', 'c}', 'd', 'e f']
query TTTTTTT
SELECT '', 'NULL', 'Null', 'null', NULL, '"', e'\''
----
NULL Null null NULL " '
· NULL Null null NULL " '

query T
SELECT ARRAY['', 'NULL', 'Null', 'null', NULL, '"', e'\'']
Expand Down
48 changes: 24 additions & 24 deletions pkg/sql/logictest/testdata/logic_test/collatedstring_index1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ CREATE INDEX ON t (b, a) STORING (c)
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -95,10 +95,10 @@ x 5
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@t_b_a_idx
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_b_a_idx
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand Down Expand Up @@ -136,10 +136,10 @@ UPDATE t SET a = (a :: STRING || a :: STRING) COLLATE da
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -157,10 +157,10 @@ AA 2
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@t_b_a_idx
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_b_a_idx
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand All @@ -183,10 +183,10 @@ DELETE FROM t WHERE a > ('a' COLLATE da) AND a < ('c' COLLATE da)
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -202,10 +202,10 @@ AA 2
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@t_b_a_idx
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_b_a_idx
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand Down
48 changes: 24 additions & 24 deletions pkg/sql/logictest/testdata/logic_test/collatedstring_index2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ CREATE INDEX ON t (a, b) STORING (c)
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@t_a_b_idx
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_a_b_idx
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -95,10 +95,10 @@ x 5
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand Down Expand Up @@ -136,10 +136,10 @@ UPDATE t SET a = (a :: STRING || a :: STRING) COLLATE de
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@t_a_b_idx
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_a_b_idx
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -157,10 +157,10 @@ xx 5
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand All @@ -183,10 +183,10 @@ DELETE FROM t WHERE a > ('a' COLLATE de) AND a < ('c' COLLATE de)
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@t_a_b_idx
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_a_b_idx
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -198,10 +198,10 @@ xx 5
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand Down
48 changes: 24 additions & 24 deletions pkg/sql/logictest/testdata/logic_test/collatedstring_uniqueindex1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ CREATE UNIQUE INDEX ON t (b, a)
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -52,10 +52,10 @@ x 5
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@t_b_a_key
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_b_a_key
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand Down Expand Up @@ -93,10 +93,10 @@ UPDATE t SET a = (a :: STRING || a :: STRING) COLLATE da
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -114,10 +114,10 @@ AA 2
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@t_b_a_key
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_b_a_key
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand All @@ -140,10 +140,10 @@ DELETE FROM t WHERE a > ('a' COLLATE da) AND a < ('c' COLLATE da)
query ITTT
EXPLAIN SELECT a, b FROM t ORDER BY a, b
----
0 render
1 scan
1 table t@primary
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@primary
1 · spans ALL

query TI
SELECT a, b FROM t ORDER BY a, b
Expand All @@ -159,10 +159,10 @@ AA 2
query ITTT
EXPLAIN SELECT b, a FROM t ORDER BY b, a
----
0 render
1 scan
1 table t@t_b_a_key
1 spans ALL
0 render · ·
1 scan · ·
1 · table t@t_b_a_key
1 · spans ALL

query IT
SELECT b, a FROM t ORDER BY b, a
Expand Down
Loading

0 comments on commit cd7db95

Please sign in to comment.