Skip to content

Commit 65efe66

Browse files
mgreemgree
committed
more test fixes
1 parent fd39961 commit 65efe66

File tree

8 files changed

+2785
-869
lines changed

8 files changed

+2785
-869
lines changed

‎src/environmentd/tests/testdata/http/ws‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎test/sqllogictest/distinct_arrangements.slt‎

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ SELECT mz_unsafe.mz_sleep(4)
8282
query T
8383
SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_introspection.mz_dataflow_operators mdo ON mash.operator_id = mdo.id ORDER BY mdo.name;
8484
----
85-
ArrangeBy[[Column(0), Column(1)]]
86-
ArrangeBy[[Column(0)]]
87-
ArrangeBy[[Column(0)]]
85+
ArrangeBy[[Column(0, None), Column(1, None)]]
86+
ArrangeBy[[Column(0, None)]]
87+
ArrangeBy[[Column(0, None)]]
8888
Arranged DistinctBy
8989
Arranged DistinctBy
9090
DistinctBy
@@ -121,8 +121,8 @@ SELECT mz_unsafe.mz_sleep(4)
121121
query T
122122
SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_introspection.mz_dataflow_operators mdo ON mash.operator_id = mdo.id ORDER BY mdo.name;
123123
----
124-
ArrangeBy[[Column(0), Column(1)]]
125-
ArrangeBy[[Column(0), Column(1)]]-errors
124+
ArrangeBy[[Column(0, None), Column(1, None)]]
125+
ArrangeBy[[Column(0, None), Column(1, None)]]-errors
126126
Arranged TopK input
127127
Arranged TopK input
128128
Arranged TopK input
@@ -159,8 +159,8 @@ SELECT mz_unsafe.mz_sleep(4)
159159
query T
160160
SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_introspection.mz_dataflow_operators mdo ON mash.operator_id = mdo.id ORDER BY mdo.name;
161161
----
162-
ArrangeBy[[Column(0), Column(1), Column(2), Column(3), Column(4), Column(5), Column(6), Column(7), Column(8), Column(9), Column(10)]]
163-
ArrangeBy[[Column(0), Column(1), Column(2), Column(3), Column(4), Column(5), Column(6), Column(7), Column(8), Column(9), Column(10)]]-errors
162+
ArrangeBy[[Column(0, None), Column(1, None), Column(2, None), Column(3, None), Column(4, None), Column(5, None), Column(6, None), Column(7, None), Column(8, None), Column(9, None), Column(10, None)]]
163+
ArrangeBy[[Column(0, None), Column(1, None), Column(2, None), Column(3, None), Column(4, None), Column(5, None), Column(6, None), Column(7, None), Column(8, None), Column(9, None), Column(10, None)]]-errors
164164

165165
statement ok
166166
DROP TABLE t3 CASCADE
@@ -381,10 +381,10 @@ Arrange ReduceMinsMaxes
381381
Arrange recursive err
382382
Arrange recursive err
383383
ArrangeAccumulable [val: empty]
384-
ArrangeBy[[Column(0)]]
385-
ArrangeBy[[Column(0)]]
386-
ArrangeBy[[Column(0)]]
387-
ArrangeBy[[Column(2)]]
384+
ArrangeBy[[Column(0, None)]]
385+
ArrangeBy[[Column(0, None)]]
386+
ArrangeBy[[Column(0, None)]]
387+
ArrangeBy[[Column(2, None)]]
388388
Arranged DistinctBy
389389
Arranged MinsMaxesHierarchical input
390390
Arranged MinsMaxesHierarchical input
@@ -525,8 +525,8 @@ SELECT mz_unsafe.mz_sleep(4)
525525
query T
526526
SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_introspection.mz_dataflow_operators mdo ON mash.operator_id = mdo.id ORDER BY mdo.name;
527527
----
528-
ArrangeBy[[Column(0)]]
529-
ArrangeBy[[Column(0)]]-errors
528+
ArrangeBy[[Column(0, None)]]
529+
ArrangeBy[[Column(0, None)]]-errors
530530

531531
statement ok
532532
DROP TABLE t1 CASCADE
@@ -567,7 +567,7 @@ SELECT mz_unsafe.mz_sleep(4)
567567
query T
568568
SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_introspection.mz_dataflow_operators mdo ON mash.operator_id = mdo.id ORDER BY mdo.name;
569569
----
570-
ArrangeBy[[Column(0)]]
570+
ArrangeBy[[Column(0, None)]]
571571
Threshold local
572572

573573
statement ok
@@ -635,18 +635,18 @@ AccumulableErrorCheck
635635
AccumulableErrorCheck
636636
ArrangeAccumulable [val: empty]
637637
ArrangeAccumulable [val: empty]
638-
ArrangeBy[[Column(0), Column(1)]]
639-
ArrangeBy[[Column(0), Column(1)]]-errors
640-
ArrangeBy[[Column(0)]]
641-
ArrangeBy[[Column(0)]]
642-
ArrangeBy[[Column(0)]]
643-
ArrangeBy[[Column(0)]]
644-
ArrangeBy[[Column(0)]]
645-
ArrangeBy[[Column(0)]]
646-
ArrangeBy[[Column(0)]]
647-
ArrangeBy[[Column(0)]]-errors
648-
ArrangeBy[[Column(0)]]-errors
649-
ArrangeBy[[Column(0)]]-errors
638+
ArrangeBy[[Column(0, None), Column(1, None)]]
639+
ArrangeBy[[Column(0, None), Column(1, None)]]-errors
640+
ArrangeBy[[Column(0, None)]]
641+
ArrangeBy[[Column(0, None)]]
642+
ArrangeBy[[Column(0, None)]]
643+
ArrangeBy[[Column(0, None)]]
644+
ArrangeBy[[Column(0, None)]]
645+
ArrangeBy[[Column(0, None)]]
646+
ArrangeBy[[Column(0, None)]]
647+
ArrangeBy[[Column(0, None)]]-errors
648+
ArrangeBy[[Column(0, None)]]-errors
649+
ArrangeBy[[Column(0, None)]]-errors
650650
ArrangeBy[[]]
651651
ArrangeBy[[]]
652652
ReduceAccumulable
@@ -734,24 +734,24 @@ SELECT mz_unsafe.mz_sleep(4)
734734
query T
735735
SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_introspection.mz_dataflow_operators mdo ON mash.operator_id = mdo.id ORDER BY mdo.name;
736736
----
737-
ArrangeBy[[Column(0)]]
738-
ArrangeBy[[Column(0)]]
739-
ArrangeBy[[Column(0)]]
740-
ArrangeBy[[Column(0)]]
741-
ArrangeBy[[Column(0)]]
742-
ArrangeBy[[Column(0)]]
743-
ArrangeBy[[Column(0)]]
744-
ArrangeBy[[Column(0)]]
745-
ArrangeBy[[Column(0)]]
746-
ArrangeBy[[Column(0)]]
747-
ArrangeBy[[Column(0)]]
748-
ArrangeBy[[Column(0)]]
749-
ArrangeBy[[Column(0)]]
750-
ArrangeBy[[Column(0)]]
751-
ArrangeBy[[Column(0)]]
752-
ArrangeBy[[Column(0)]]
753-
ArrangeBy[[Column(0)]]
754-
ArrangeBy[[Column(0)]]
737+
ArrangeBy[[Column(0, None)]]
738+
ArrangeBy[[Column(0, None)]]
739+
ArrangeBy[[Column(0, None)]]
740+
ArrangeBy[[Column(0, None)]]
741+
ArrangeBy[[Column(0, None)]]
742+
ArrangeBy[[Column(0, None)]]
743+
ArrangeBy[[Column(0, None)]]
744+
ArrangeBy[[Column(0, None)]]
745+
ArrangeBy[[Column(0, None)]]
746+
ArrangeBy[[Column(0, None)]]
747+
ArrangeBy[[Column(0, None)]]
748+
ArrangeBy[[Column(0, None)]]
749+
ArrangeBy[[Column(0, None)]]
750+
ArrangeBy[[Column(0, None)]]
751+
ArrangeBy[[Column(0, None)]]
752+
ArrangeBy[[Column(0, None)]]
753+
ArrangeBy[[Column(0, None)]]
754+
ArrangeBy[[Column(0, None)]]
755755
ArrangeBy[[]]
756756
ArrangeBy[[]]
757757
ArrangeBy[[]]
@@ -794,8 +794,8 @@ SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_intros
794794
----
795795
AccumulableErrorCheck
796796
ArrangeAccumulable [val: empty]
797-
ArrangeBy[[Column(0)]]
798-
ArrangeBy[[Column(0)]]-errors
797+
ArrangeBy[[Column(0, None)]]
798+
ArrangeBy[[Column(0, None)]]-errors
799799
ArrangeBy[[]]
800800
ReduceAccumulable
801801

@@ -868,15 +868,15 @@ Arrange ReduceMinsMaxes
868868
ArrangeAccumulable [val: empty]
869869
ArrangeAccumulable [val: empty]
870870
ArrangeAccumulable [val: empty]
871-
ArrangeBy[[CallBinary { func: ModInt64, expr1: Column(0), expr2: Literal(Ok(Row{[Int64(2)]}), ColumnType { scalar_type: Int64, nullable: false }) }]]
872-
ArrangeBy[[CallUnary { func: CastInt32ToInt64(CastInt32ToInt64), expr: Column(0) }]]
873-
ArrangeBy[[Column(0)]]
874-
ArrangeBy[[Column(0)]]
875-
ArrangeBy[[Column(0)]]
876-
ArrangeBy[[Column(0)]]
877-
ArrangeBy[[Column(0)]]-errors
878-
ArrangeBy[[Column(0)]]-errors
879-
ArrangeBy[[Column(0)]]-errors
871+
ArrangeBy[[CallBinary { func: ModInt64, expr1: Column(0, None), expr2: Literal(Ok(Row{[Int64(2)]}), ColumnType { scalar_type: Int64, nullable: false }) }]]
872+
ArrangeBy[[CallUnary { func: CastInt32ToInt64(CastInt32ToInt64), expr: Column(0, None) }]]
873+
ArrangeBy[[Column(0, None)]]
874+
ArrangeBy[[Column(0, None)]]
875+
ArrangeBy[[Column(0, None)]]
876+
ArrangeBy[[Column(0, None)]]
877+
ArrangeBy[[Column(0, None)]]-errors
878+
ArrangeBy[[Column(0, None)]]-errors
879+
ArrangeBy[[Column(0, None)]]-errors
880880
Arranged Accumulable Distinct [val: empty]
881881
Arranged MinsMaxesHierarchical input
882882
Arranged MinsMaxesHierarchical input
@@ -954,10 +954,10 @@ SELECT mz_unsafe.mz_sleep(4)
954954
query T
955955
SELECT mdo.name FROM mz_introspection.mz_arrangement_sharing mash JOIN mz_introspection.mz_dataflow_operators mdo ON mash.operator_id = mdo.id ORDER BY mdo.name;
956956
----
957-
ArrangeBy[[CallUnary { func: CastStringToVarChar(CastStringToVarChar { length: None, fail_on_len: false }), expr: Column(1) }, CallUnary { func: CastInt64ToString(CastInt64ToString), expr: Column(0) }]]
958-
ArrangeBy[[CallUnary { func: CastStringToVarChar(CastStringToVarChar { length: None, fail_on_len: false }), expr: Column(1) }, CallUnary { func: CastInt64ToString(CastInt64ToString), expr: Column(0) }]]-errors
959-
ArrangeBy[[Column(0), Column(1)]]
960-
ArrangeBy[[Column(0), Column(1)]]-errors
957+
ArrangeBy[[CallUnary { func: CastStringToVarChar(CastStringToVarChar { length: None, fail_on_len: false }), expr: Column(1, None) }, CallUnary { func: CastInt64ToString(CastInt64ToString), expr: Column(0, None) }]]
958+
ArrangeBy[[CallUnary { func: CastStringToVarChar(CastStringToVarChar { length: None, fail_on_len: false }), expr: Column(1, None) }, CallUnary { func: CastInt64ToString(CastInt64ToString), expr: Column(0, None) }]]-errors
959+
ArrangeBy[[Column(0, None), Column(1, None)]]
960+
ArrangeBy[[Column(0, None), Column(1, None)]]-errors
961961

962962
statement ok
963963
DROP TABLE t CASCADE
@@ -986,46 +986,46 @@ Arrange␠export␠iterative 2
986986
Arrange␠export␠iterative␠err 2
987987
Arrange␠recursive␠err 4
988988
ArrangeAccumulable␠[val:␠empty] 10
989-
ArrangeBy[[CallBinary␠{␠func:␠JsonbGetString␠{␠stringify:␠true␠},␠expr1:␠Column(1),␠expr2:␠Literal(Ok(Row{[String("id")]}),␠ColumnType␠{␠scalar_type:␠String,␠nullable:␠false␠})␠}]] 2
990-
ArrangeBy[[CallBinary␠{␠func:␠JsonbGetString␠{␠stringify:␠true␠},␠expr1:␠Column(2),␠expr2:␠Literal(Ok(Row{[String("id")]}),␠ColumnType␠{␠scalar_type:␠String,␠nullable:␠false␠})␠}]] 1
991-
ArrangeBy[[CallVariadic␠{␠func:␠Coalesce,␠exprs:␠[Column(2),␠Column(3)]␠}]] 2
992-
ArrangeBy[[Column(0),␠CallUnary␠{␠func:␠CastInt32ToNumeric(CastInt32ToNumeric(None)),␠expr:␠Column(1)␠}]] 1
993-
ArrangeBy[[Column(0),␠CallUnary␠{␠func:␠CastUint64ToNumeric(CastUint64ToNumeric(None)),␠expr:␠Column(2)␠}]] 1
994-
ArrangeBy[[Column(0),␠CallUnary␠{␠func:␠Lower(Lower),␠expr:␠Column(1)␠}]] 1
995-
ArrangeBy[[Column(0),␠CallUnary␠{␠func:␠Lower(Lower),␠expr:␠Column(2)␠}]] 1
996-
ArrangeBy[[Column(0),␠Column(1),␠Column(2),␠Column(3),␠Column(4),␠Column(5),␠Column(6),␠Column(7),␠Column(8),␠Column(9),␠Column(10),␠Column(11),␠Column(12),␠Column(13),␠Column(14),␠Column(15),␠Column(16),␠Column(17),␠Column(18),␠Column(19),␠Column(20),␠Column(21),␠Column(22),␠Column(23),␠Column(24),␠Column(25),␠Column(26),␠Column(27)]] 2
997-
ArrangeBy[[Column(0),␠Column(1),␠Column(2),␠Column(3),␠Column(4),␠Column(5),␠Column(6),␠Column(7),␠Column(8),␠Column(9),␠Column(10),␠Column(11),␠Column(12),␠Column(13)]] 1
998-
ArrangeBy[[Column(0),␠Column(1),␠Column(2),␠Column(3),␠Column(4),␠Column(5),␠Column(6),␠Column(7),␠Column(8),␠Column(9),␠Column(10),␠Column(11),␠Column(12),␠Column(13)]]-errors 1
999-
ArrangeBy[[Column(0),␠Column(1),␠Column(2),␠Column(3),␠Column(4),␠Column(5)]] 1
1000-
ArrangeBy[[Column(0),␠Column(1),␠Column(2),␠Column(3),␠Column(4),␠Column(5)]]-errors 1
1001-
ArrangeBy[[Column(0),␠Column(1),␠Column(2),␠Column(3),␠Column(4)]] 1
1002-
ArrangeBy[[Column(0),␠Column(1),␠Column(2),␠Column(3),␠Column(4)]]-errors 1
1003-
ArrangeBy[[Column(0),␠Column(1)]] 2
1004-
ArrangeBy[[Column(0),␠Column(2)]] 4
1005-
ArrangeBy[[Column(0),␠Column(3)]] 4
1006-
ArrangeBy[[Column(0),␠Column(4)]] 1
1007-
ArrangeBy[[Column(0)]] 155
1008-
ArrangeBy[[Column(0)]]-errors 44
1009-
ArrangeBy[[Column(1),␠Column(0)]] 1
1010-
ArrangeBy[[Column(1),␠Column(2)]] 2
1011-
ArrangeBy[[Column(1),␠Column(3)]] 1
1012-
ArrangeBy[[Column(1)]] 26
1013-
ArrangeBy[[Column(1)]]-errors 7
1014-
ArrangeBy[[Column(13)]] 1
1015-
ArrangeBy[[Column(15)]] 1
1016-
ArrangeBy[[Column(15)]]-errors 1
1017-
ArrangeBy[[Column(2)]] 20
1018-
ArrangeBy[[Column(2)]]-errors 7
1019-
ArrangeBy[[Column(21)]] 1
1020-
ArrangeBy[[Column(21)]]-errors 1
1021-
ArrangeBy[[Column(3)]] 6
1022-
ArrangeBy[[Column(3)]]-errors 2
1023-
ArrangeBy[[Column(4)]] 5
1024-
ArrangeBy[[Column(4)]]-errors 2
1025-
ArrangeBy[[Column(5)]] 2
1026-
ArrangeBy[[Column(6)]] 3
1027-
ArrangeBy[[Column(6)]]-errors 2
1028-
ArrangeBy[[Column(9)]] 1
989+
ArrangeBy[[CallBinary␠{␠func:␠JsonbGetString␠{␠stringify:␠true␠},␠expr1:␠Column(1,␠None),␠expr2:␠Literal(Ok(Row{[String("id")]}),␠ColumnType␠{␠scalar_type:␠String,␠nullable:␠false␠})␠}]] 2
990+
ArrangeBy[[CallBinary␠{␠func:␠JsonbGetString␠{␠stringify:␠true␠},␠expr1:␠Column(2,␠None),␠expr2:␠Literal(Ok(Row{[String("id")]}),␠ColumnType␠{␠scalar_type:␠String,␠nullable:␠false␠})␠}]] 1
991+
ArrangeBy[[CallVariadic␠{␠func:␠Coalesce,␠exprs:␠[Column(2,␠None),␠Column(3,␠None)]␠}]] 2
992+
ArrangeBy[[Column(0,␠None),␠CallUnary␠{␠func:␠CastInt32ToNumeric(CastInt32ToNumeric(None)),␠expr:␠Column(1,␠None)␠}]] 1
993+
ArrangeBy[[Column(0,␠None),␠CallUnary␠{␠func:␠CastUint64ToNumeric(CastUint64ToNumeric(None)),␠expr:␠Column(2,␠None)␠}]] 1
994+
ArrangeBy[[Column(0,␠None),␠CallUnary␠{␠func:␠Lower(Lower),␠expr:␠Column(1,␠None)␠}]] 1
995+
ArrangeBy[[Column(0,␠None),␠CallUnary␠{␠func:␠Lower(Lower),␠expr:␠Column(2,␠None)␠}]] 1
996+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None),␠Column(2,␠None),␠Column(3,␠None),␠Column(4,␠None),␠Column(5,␠None),␠Column(6,␠None),␠Column(7,␠None),␠Column(8,␠None),␠Column(9,␠None),␠Column(10,␠None),␠Column(11,␠None),␠Column(12,␠None),␠Column(13,␠None),␠Column(14,␠None),␠Column(15,␠None),␠Column(16,␠None),␠Column(17,␠None),␠Column(18,␠None),␠Column(19,␠None),␠Column(20,␠None),␠Column(21,␠None),␠Column(22,␠None),␠Column(23,␠None),␠Column(24,␠None),␠Column(25,␠None),␠Column(26,␠None),␠Column(27,␠None)]] 2
997+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None),␠Column(2,␠None),␠Column(3,␠None),␠Column(4,␠None),␠Column(5,␠None),␠Column(6,␠None),␠Column(7,␠None),␠Column(8,␠None),␠Column(9,␠None),␠Column(10,␠None),␠Column(11,␠None),␠Column(12,␠None),␠Column(13,␠None)]] 1
998+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None),␠Column(2,␠None),␠Column(3,␠None),␠Column(4,␠None),␠Column(5,␠None),␠Column(6,␠None),␠Column(7,␠None),␠Column(8,␠None),␠Column(9,␠None),␠Column(10,␠None),␠Column(11,␠None),␠Column(12,␠None),␠Column(13,␠None)]]-errors 1
999+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None),␠Column(2,␠None),␠Column(3,␠None),␠Column(4,␠None),␠Column(5,␠None)]] 1
1000+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None),␠Column(2,␠None),␠Column(3,␠None),␠Column(4,␠None),␠Column(5,␠None)]]-errors 1
1001+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None),␠Column(2,␠None),␠Column(3,␠None),␠Column(4,␠None)]] 1
1002+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None),␠Column(2,␠None),␠Column(3,␠None),␠Column(4,␠None)]]-errors 1
1003+
ArrangeBy[[Column(0,␠None),␠Column(1,␠None)]] 2
1004+
ArrangeBy[[Column(0,␠None),␠Column(2,␠None)]] 4
1005+
ArrangeBy[[Column(0,␠None),␠Column(3,␠None)]] 4
1006+
ArrangeBy[[Column(0,␠None),␠Column(4,␠None)]] 1
1007+
ArrangeBy[[Column(0,␠None)]] 155
1008+
ArrangeBy[[Column(0,␠None)]]-errors 44
1009+
ArrangeBy[[Column(1,␠None),␠Column(0,␠None)]] 1
1010+
ArrangeBy[[Column(1,␠None),␠Column(2,␠None)]] 2
1011+
ArrangeBy[[Column(1,␠None),␠Column(3,␠None)]] 1
1012+
ArrangeBy[[Column(1,␠None)]] 26
1013+
ArrangeBy[[Column(1,␠None)]]-errors 7
1014+
ArrangeBy[[Column(13,␠None)]] 1
1015+
ArrangeBy[[Column(15,␠None)]] 1
1016+
ArrangeBy[[Column(15,␠None)]]-errors 1
1017+
ArrangeBy[[Column(2,␠None)]] 20
1018+
ArrangeBy[[Column(2,␠None)]]-errors 7
1019+
ArrangeBy[[Column(21,␠None)]] 1
1020+
ArrangeBy[[Column(21,␠None)]]-errors 1
1021+
ArrangeBy[[Column(3,␠None)]] 6
1022+
ArrangeBy[[Column(3,␠None)]]-errors 2
1023+
ArrangeBy[[Column(4,␠None)]] 5
1024+
ArrangeBy[[Column(4,␠None)]]-errors 2
1025+
ArrangeBy[[Column(5,␠None)]] 2
1026+
ArrangeBy[[Column(6,␠None)]] 3
1027+
ArrangeBy[[Column(6,␠None)]]-errors 2
1028+
ArrangeBy[[Column(9,␠None)]] 1
10291029
ArrangeBy[[]] 11
10301030
Arranged␠DistinctBy 47
10311031
Arranged␠MinsMaxesHierarchical␠input 14

0 commit comments

Comments
 (0)