Skip to content

Commit 10f46ec

Browse files
zverevgenyzverevgeny
authored
Merge 190b207 into bc52487 
2 parents bc52487 + 190b207 commit 10f46ec

File tree

12 files changed

+180
-118
lines changed

12 files changed

+180
-118
lines changed

‎ydb/core/tx/columnshard/engines/scheme/versions/abstract_scheme.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ TConclusion<NArrow::TContainerWithIndexes<arrow::RecordBatch>> ISnapshotSchema::
118118
case NEvWrite::EModificationType::Update:
119119
break;
120120
}
121-
}
122121
if (pkFieldIdx) {
123122
AFL_VERIFY(*pkFieldIdx < (i32)pkColumns.size());
124123
AFL_VERIFY(!pkColumns[*pkFieldIdx]);

‎ydb/tests/functional/suite_tests/postgres/create_table.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ CREATE TABLE person (
8888
PRIMARY KEY (name)
8989
);
9090

91-
statement error Unexpected token 'INHERITS'
91+
statement error
9292
CREATE TABLE emp (
9393
salary int32,
9494
manager name
9595
) INHERITS (person) WITH OIDS;
9696

97-
statement error Unexpected token 'WITH'
97+
statement error
9898
CREATE TABLE emp (
9999
salary int32,
100100
manager name
@@ -166,15 +166,15 @@ CREATE TABLE road (
166166
thepath path
167167
);
168168

169-
statement error Unexpected token
169+
statement error
170170
CREATE TABLE ihighway () INHERITS (road);
171171

172172
statement error
173173
CREATE TABLE shighway (
174174
surface text
175175
) INHERITS (road);
176176

177-
statement error Unknown type: 'Path'
177+
statement error
178178
CREATE TABLE real_city (
179179
pop int32,
180180
cname string,

‎ydb/tests/functional/suite_tests/postgres/jointest/join1.test‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ INSERT INTO J1_TBL (i, j, t) VALUES (0, NULL, 'zero');
4343
statement ok
4444
INSERT INTO J1_TBL (i, j, t) VALUES (NULL, NULL, 'null');
4545

46-
statement ok
46+
statement skipped_cs ok
4747
INSERT INTO J1_TBL (i, j, t) VALUES (NULL, 0, 'zero');
4848

4949
statement ok
@@ -67,10 +67,10 @@ INSERT INTO J2_TBL (i, k) VALUES (5, -5);
6767
statement ok
6868
INSERT INTO J2_TBL (i, k) VALUES (0, NULL);
6969

70-
statement ok
70+
statement skipped_cs ok
7171
INSERT INTO J2_TBL (i, k) VALUES (NULL, NULL);
7272

73-
statement ok
73+
statement skipped_cs ok
7474
INSERT INTO J2_TBL (i, k) VALUES (NULL, 0);
7575

7676

@@ -104,7 +104,7 @@ SELECT J1_TBL.i as i, j, t, k
104104
FROM J1_TBL JOIN J2_TBL USING (i)
105105
ORDER BY i, j, t, k
106106

107-
statement query
107+
statement skipped_cs query
108108
SELECT t1.b as b, t1.a as a, c, t2.a as a2 FROM (
109109
select i as a, j as b, t as c from J1_TBL) as t1
110110
JOIN (select i as a, k as b from J2_TBL) as t2 USING (b)
@@ -179,15 +179,11 @@ SELECT J1_TBL.i as i, j, t, k
179179
FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i = J2_TBL.i)
180180
ORDER BY i, j, t, k;
181181

182-
statement query
182+
statement skipped_cs query
183183
SELECT J1_TBL.i as i, j, t, k
184184
FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i = J2_TBL.k)
185185
ORDER BY i;
186186

187-
--
188-
-- Non-equi-joins
189-
--
190-
191187
statement error JOIN ON expression must be a conjunction of equality predicates
192188
SELECT J1_TBL.i as i1, J2_TBL.i as i2, j, t, k
193189
FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i <= J2_TBL.k);
@@ -197,32 +193,32 @@ SELECT J1_TBL.i as i1, J2_TBL.i as i2, j, t, k
197193
-- Note that OUTER is a noise word
198194
--
199195

200-
statement query
196+
statement skipped_cs query
201197
SELECT J1_TBL.i as i, j, t, k
202198
FROM J1_TBL LEFT OUTER JOIN J2_TBL USING (i)
203199
ORDER BY i, j, k, t;
204200

205-
statement query
201+
statement skipped_cs query
206202
SELECT J1_TBL.i as i, j, t, k
207203
FROM J1_TBL LEFT JOIN J2_TBL USING (i)
208204
ORDER BY i, j, k, t;
209205

210-
statement query
206+
statement skipped_cs query
211207
SELECT J2_TBL.i as i, j, t, k
212208
FROM J1_TBL RIGHT OUTER JOIN J2_TBL USING (i)
213209
ORDER BY i, j, t, k
214210

215-
statement query
211+
statement skipped_cs query
216212
SELECT J2_TBL.i as i, j, t, k
217213
FROM J1_TBL RIGHT JOIN J2_TBL USING (i)
218214
ORDER BY i, j, t, k
219215

220-
statement query
216+
statement skipped_cs query
221217
SELECT J1_TBL.i as i, j, t, k
222218
FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i)
223219
ORDER BY i, k, t;
224220

225-
statement query
221+
statement skipped_cs query
226222
SELECT J1_TBL.i as i, j, t, k
227223
FROM J1_TBL FULL JOIN J2_TBL USING (i)
228224
ORDER BY i, k, t, j;

‎ydb/tests/functional/suite_tests/postgres/jointest/join2.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ INSERT INTO t3 (name, n) VALUES ( 'cc', 23 );
3333
statement ok
3434
INSERT INTO t3 (name, n) VALUES ( 'dd', 33 );
3535

36-
statement query
36+
statement skipped_cs query
3737
select IF(SQ.name is Null, t3.name, SQ.name) as name,
3838
SQ.n1 as n1, SQ.n2 as n2, t3.n as n3
3939
FROM t3 FULL JOIN
@@ -62,7 +62,7 @@ LEFT JOIN
6262
USING (name)
6363
order by name
6464

65-
statement query
65+
statement skipped_cs query
6666
SELECT IF(s3.name is not Null, s3.name, s2.name) as name, s2.n as n2, s3.n as n3 FROM
6767
(SELECT * FROM t2) as s2
6868
FULL JOIN

‎ydb/tests/functional/suite_tests/postgres/jointest/join4.test‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- nested nestloops can require nested PlaceHolderVars
33
--
44

5-
statement ok
5+
statement skipped_cs ok
66
create table nt1 (
77
id int,
88
a1 bool,
@@ -23,34 +23,34 @@ create table nt3 (
2323
primary key(id)
2424
);
2525

26-
statement ok
26+
statement skipped_cs ok
2727
insert into nt1 (id, a1, a2) values (1,true,true);
2828

29-
statement ok
29+
statement skipped_cs ok
3030
insert into nt1 (id, a1, a2) values (2,true,false);
3131

32-
statement ok
32+
statement skipped_cs ok
3333
insert into nt1 (id, a1, a2) values (3,false,false);
3434

35-
statement ok
35+
statement skipped_cs ok
3636
insert into nt2 (id, nt1_id, b1, b2) values (1,1,true,true);
3737

38-
statement ok
38+
statement skipped_cs ok
3939
insert into nt2 (id, nt1_id, b1, b2) values (2,2,true,false);
4040

41-
statement ok
41+
statement skipped_cs ok
4242
insert into nt2 (id, nt1_id, b1, b2) values (3,3,false,false);
4343

44-
statement ok
44+
statement skipped_cs ok
4545
insert into nt3 (id, nt2_id, c1) values (1,1,true);
4646

47-
statement ok
47+
statement skipped_cs ok
4848
insert into nt3 (id, nt2_id, c1) values (2,2,false);
4949

50-
statement ok
50+
statement skipped_cs ok
5151
insert into nt3 (id, nt2_id, c1) values (3,3,true);
5252

53-
statement query
53+
statement skipped_cs query
5454
select nt3.id as id
5555
from nt3 as nt3
5656
left join

‎ydb/tests/functional/suite_tests/postgres/select_distinct.test‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
---
2-
--- statement skipped: IS (NOT) DISTINCT FROM
3-
--- https://wiki.postgresql.org/wiki/Is_distinct_from
4-
---
5-
61
statement ok
72
CREATE TABLE onek (
83
unique1 int32,
@@ -110,7 +105,7 @@ INSERT INTO disttable (f1) VALUES(3);
110105
statement ok
111106
INSERT INTO disttable (f1) VALUES(NULL);
112107

113-
statement skipped
108+
statement skipped query
114109
SELECT f1, f1 IS DISTINCT FROM 2 as "not 2" FROM disttable;
115110
------------
116111
f1 | not 2

‎ydb/tests/functional/suite_tests/postgres/window.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ SELECT count(*) OVER (PARTITION BY four) FROM (SELECT * FROM tenk1 WHERE FALSE)s
548548
count
549549
-------
550550

551-
statement query
551+
statement skipped_cs query
552552
SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
553553

554554
statement skipped query

‎ydb/tests/functional/suite_tests/sqllogictest/select2-1.test‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ select case a+1 when b then 111 when c then 222
405405
from t1
406406
order by col1,col2
407407

408-
statement query
408+
statement skipped_cs query
409409
select case when c>avg_c then a*2 else b*10 end as col1,
410410
abs(a) as col2,
411411
case a+1 when b then 111 when c then 222
@@ -545,7 +545,7 @@ from t1
545545
where (a>b-2 and a<b+2)
546546
or (e>a and e<b)
547547

548-
statement query
548+
statement skipped_cs query
549549
select b-c as col1,
550550
a+b*2+c*3 as col2,
551551
case when c>avg_c then a*2 else b*10 end as col3,
@@ -598,7 +598,7 @@ where (c<=d-2 or c>=d+2)
598598
or (e>c or e<d)
599599
order by col1,col2
600600

601-
statement query
601+
statement skipped_cs query
602602
select case a+1 when b then 111 when c then 222
603603
when d then 333 when e then 444 else 555 end as col1
604604
from t1
@@ -793,7 +793,7 @@ from t1
793793
where (a>b-2 and a<b+2)
794794
order by col2,col1,col3
795795

796-
statement query
796+
statement skipped_cs query
797797
select d-e as col1,
798798
case a+1 when b then 111 when c then 222
799799
when d then 333 when e then 444 else 555 end as col2,
@@ -1048,7 +1048,7 @@ from t1
10481048
where exists(select 1 from t1 as x where x.b<t1.b)
10491049
or e+d between a+b-10 and c+130
10501050

1051-
statement query
1051+
statement skipped_cs query
10521052
select b-c as col1
10531053
from t1
10541054
where a is null
@@ -1333,7 +1333,7 @@ where (c<=d-2 or c>=d+2)
13331333
or (e>c or e<d)
13341334
or c>d
13351335

1336-
statement query
1336+
statement skipped_cs query
13371337
select (a+b+c+d+e)/5 as col1,
13381338
c-d as col2,
13391339
case a+1 when b then 111 when c then 222
@@ -1346,7 +1346,7 @@ where a>b
13461346
and a is null
13471347
order by col5,col3,col2,col4,col1
13481348

1349-
statement query
1349+
statement skipped_cs query
13501350
select a+b*2+c*3 as col1,
13511351
a+b*2+c*3+d*4+e*5 as col2,
13521352
d as col3,
@@ -1434,7 +1434,7 @@ from t1
14341434
where c>d
14351435
order by col1,col3,col2
14361436

1437-
statement query
1437+
statement skipped_cs query
14381438
select abs(b-c) as col1,
14391439
(a+b+c+d+e)/5 as col2,
14401440
d as col3
@@ -1857,7 +1857,7 @@ select d-e as col1
18571857
from t1
18581858
order by col1
18591859

1860-
statement query
1860+
statement skipped_cs query
18611861
select b-c as col1,
18621862
case when c>avg_c then a*2 else b*10 end as col2,
18631863
case when a<b-3 then 111 when a<=b then 222
@@ -2080,7 +2080,7 @@ from t1
20802080
where c between b-2 and d+2
20812081
order by col1
20822082

2083-
statement query
2083+
statement skipped_cs query
20842084
select d as col1,
20852085
a-b as col2,
20862086
c-d as col3,
@@ -2224,7 +2224,7 @@ from t1
22242224
where b is not null
22252225
or d>e
22262226

2227-
statement query
2227+
statement skipped_cs query
22282228
select a+b*2+c*3+d*4+e*5 as col1,
22292229
case when a<b-3 then 111 when a<=b then 222
22302230
when a<b+3 then 333 else 444 end as col2,

0 commit comments

Comments
 (0)