Changeset: 07aff7097565 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/07aff7097565 Modified Files: sql/test/SQLancer/Tests/sqlancer01.test sql/test/SQLancer/Tests/sqlancer02.test sql/test/SQLancer/Tests/sqlancer04.test sql/test/SQLancer/Tests/sqlancer05.test sql/test/SQLancer/Tests/sqlancer08.test sql/test/SQLancer/Tests/sqlancer09.test sql/test/SQLancer/Tests/sqlancer11.test sql/test/miscellaneous/Tests/simple_selects.test sql/test/prepare/Tests/sqlancer_prepare.sql sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128 sql/test/prepare/Tests/sqlancer_prepare.stable.out sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128 sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test sql/test/sys-schema/Tests/webExamplesLogicalFunctionsOperators.test sql/test/sys-schema/Tests/webExamplesMathematicalFunctionsOperators.test Branch: privfuncs Log Message:
Approved output for new private function changes diffs (truncated from 723 to 300 lines): diff --git a/sql/test/SQLancer/Tests/sqlancer01.test b/sql/test/SQLancer/Tests/sqlancer01.test --- a/sql/test/SQLancer/Tests/sqlancer01.test +++ b/sql/test/SQLancer/Tests/sqlancer01.test @@ -442,13 +442,12 @@ 0.5721433567835664 1.58919798e+09 0.10009920106256454 -statement error 42000!Argument 2 to round function must be positive -select max(agg0) from (select max(all cast(0.18525435 as string)) as agg0 from t0 where cast(scale_down(- (greatest(greatest(631218936, -562663513), cast(-265902058 as int))), cast(0.41370374 as int)) as boolean) -union all select all max(all cast(0.18525435 as string)) as agg0 from t0 where not (cast(scale_down(- (greatest(greatest(631218936, -562663513), cast(-265902058 as int))), cast(0.41370374 as int)) as boolean)) -union all select all max(all cast(0.18525435 as string)) as agg0 from t0 where (cast(scale_down(- (greatest(greatest(631218936, -562663513), cast(-265902058 as int))), cast(0.41370374 as int)) as boolean)) is null) as asdf - -statement error 25005!Current transaction is aborted (please ROLLBACK) -select scale_down(-631218936, cast(0.41370374 as int)) +query T rowsort +select max(agg0) from (select max(all cast(0.18525435 as string)) as agg0 from t0 where cast(- (greatest(greatest(631218936, -562663513), cast(-265902058 as int))) as boolean) +union all select all max(all cast(0.18525435 as string)) as agg0 from t0 where not (cast(- (greatest(greatest(631218936, -562663513), cast(-265902058 as int))) as boolean)) +union all select all max(all cast(0.18525435 as string)) as agg0 from t0 where (cast(- (greatest(greatest(631218936, -562663513), cast(-265902058 as int))) as boolean)) is null) as asdf +---- +0.18525435 statement ok ROLLBACK diff --git a/sql/test/SQLancer/Tests/sqlancer02.test b/sql/test/SQLancer/Tests/sqlancer02.test --- a/sql/test/SQLancer/Tests/sqlancer02.test +++ b/sql/test/SQLancer/Tests/sqlancer02.test @@ -233,14 +233,6 @@ UPDATE t0 SET c2 = '' WHERE (((length('- statement ok ROLLBACK -statement error 42000!types real(24,0) and boolean(1,0) are not equal -SELECT 1 WHERE scale_up(CAST(0.89767724 AS REAL), 1) - -query R rowsort -SELECT scale_up(0.2928163, 3) ----- -8784489.000 - statement ok START TRANSACTION @@ -446,9 +438,8 @@ 0 0.3672199296718357 -1.7976931348623157e+308 -statement error 22003!Overflow in round -update t2 set c1 = (scale_down(t2.c1, 0.39861114390109142480156378951505757868289947509765625)) -where (scale_up(-1155480997, 0.5434124050282382)) is not null +statement error 22003!overflow in calculation -1.7976931348623157e+308*10. +update t2 set c1 = t2.c1 * 10 where 2 is not null statement ok ROLLBACK diff --git a/sql/test/SQLancer/Tests/sqlancer04.test b/sql/test/SQLancer/Tests/sqlancer04.test --- a/sql/test/SQLancer/Tests/sqlancer04.test +++ b/sql/test/SQLancer/Tests/sqlancer04.test @@ -642,7 +642,7 @@ create view v40(vc0) as (values ((true) statement error 42000!SELECT: cannot use non GROUP BY column 'v20.vc0' in query results without an aggregate function select cast(sum(count) as bigint) from (select cast(greatest(false, true) as int) as count from v37 full outer join -(select all ((((1074663557)%(0.8367095941704169)))%(scale_up(v20.vc0, 0.25281408194923194))), 0.573499282341099 +(select all ((((1074663557)%(0.8367095941704169)))%(v20.vc0 * 0.25281408194923194)), 0.573499282341099 from v20 where ((((true)or(true)))or(true)) group by 2) as sub0 on ((case 0.28276833606549456323620006514829583466053009033203125 when 1 then v37.vc0 when 1436332976 then 'FALSE' when 0.4573545 then v37.vc0 else 'G1hw7' end)not ilike(sql_min('46', v37.vc0))) inner join (select (case v3.vc0 @@ -750,7 +750,7 @@ cast(-1695180722 as bigint))) query I rowsort SELECT v3.vc0 FROM v3, v6 CROSS JOIN (SELECT ALL ((sign(0.9241489178039545))* -(scale_down(0.74460343372682225027148206208948977291584014892578125, 0.33816958610011738084466514919768087565898895263671875))) +(2)) FROM t0 LEFT OUTER JOIN (SELECT DISTINCT upper('bŀ') WHERE FALSE) AS sub0 ON TRUE WHERE greatest(t0.c0, TRUE)) AS sub0 LEFT OUTER JOIN (SELECT DISTINCT 5688 FROM v4 WHERE (v4.vc0) IN (-2081865947, 30436)) AS sub1 ON least(FALSE, TRUE) RIGHT OUTER JOIN (VALUES (CAST(greatest('77', 0.10216334194461484941029993933625519275665283203125) AS STRING(478)))) AS sub2 @@ -761,8 +761,7 @@ ON ((greatest('', '32228'))NOT ILIKE(CAS query I rowsort SELECT CAST(SUM(count) AS BIGINT) FROM (SELECT ALL CAST((((v6.vc1)-(v6.vc1))) IS NOT NULL AS INT) as count FROM v3, v6 CROSS JOIN -(SELECT ((sign(0.9241489178039545))*(scale_down(0.74460343372682225027148206208948977291584014892578125, -0.33816958610011738084466514919768087565898895263671875))) FROM t0 LEFT OUTER JOIN (SELECT DISTINCT upper('bŀ') WHERE FALSE) +(SELECT ((sign(0.9241489178039545))*(3)) FROM t0 LEFT OUTER JOIN (SELECT DISTINCT upper('bŀ') WHERE FALSE) AS sub0 ON TRUE WHERE greatest(t0.c0, TRUE)) AS sub0 LEFT OUTER JOIN (SELECT DISTINCT 5688 FROM v4 WHERE (v4.vc0) IN (-2081865947, 30436)) AS sub1 ON least(FALSE, TRUE) RIGHT OUTER JOIN (VALUES (CAST(greatest('77', 0.10216334194461484941029993933625519275665283203125) AS STRING(478)))) AS sub2 ON ((greatest('', '32228'))NOT diff --git a/sql/test/SQLancer/Tests/sqlancer05.test b/sql/test/SQLancer/Tests/sqlancer05.test --- a/sql/test/SQLancer/Tests/sqlancer05.test +++ b/sql/test/SQLancer/Tests/sqlancer05.test @@ -693,8 +693,7 @@ select t2.c1 from v0, t2 right outer join (values (least(ifthenelse(false, '', '47940718'), sql_max('栩', 'U*>Kz0')), case cast(interval '-165227345' month as string) when "insert"('f3', 0.57506007, -1550051844, '0.06527867754732408') then 'u' when '2033856974' then case when true then '' when false then '-1543387917' when true then '0.4055556886118663' when false then 'c' else 'E\n' end end)) as sub0 on nullif(not (false), (t2.c1) not between asymmetric (t2.c1) and (t2.c1)) -where case ((50)*(1836147184)) when least(5110, 1303739364) then (false) = false when scale_down(0.07871449894764926, -0.26471586054989171277185278086108155548572540283203125) then least(true, true) when +where case ((50)*(1836147184)) when least(5110, 1303739364) then (false) = false when 3 then least(true, true) when cast(0.92609287116711858089956876938231289386749267578125 as double) then greatest(true, false) end ---- diff --git a/sql/test/SQLancer/Tests/sqlancer08.test b/sql/test/SQLancer/Tests/sqlancer08.test --- a/sql/test/SQLancer/Tests/sqlancer08.test +++ b/sql/test/SQLancer/Tests/sqlancer08.test @@ -121,8 +121,13 @@ 0 -803413833 921740890 -statement error 42000!Argument 2 to round function must be positive -select t2.tc0, scale_down(0.87735366430185102171179778451914899051189422607421875, t2.tc0) from t2 +query I nosort +select 1 from t2 +---- +1 +1 +1 +1 statement ok ROLLBACK @@ -247,7 +252,7 @@ statement ok rowcount 9 INSERT INTO "salesmart" VALUES ('pT펈*1.{'),('1870507234'),('27825'),('/aF⯗u'),('10545346022400.000'),(''),('-1533465369'),(''),('29781') statement ok -create view v2(vc0, vc1) as (select all sign(((820356984)*(scale_down(0.53676551856816223651236441583023406565189361572265625, 0.5695062)))), cast(null as clob)) +create view v2(vc0, vc1) as (select all sign(((820356984)*(0.53))), cast(null as clob)) query I rowsort select cast(sum(count) as bigint) from (select all cast(true as int) as count from v2 join salesmart on not ((salesmart.city) between asymmetric (trim(salesmart.city, v2.vc1)) and ('0.43353835334391844'))) as res @@ -359,7 +364,7 @@ statement ok create view v7(vc0, vc1) as (select all 56, replace('0.0074401190660642325', "insert"('0.9471086251830542', null, 1872651914, '(Ga_'), '2]vK') where not (not (false))) with check option query I rowsort -select 1 from v7 where not (((cast(scale_up(4751, -1823537248) as string(86)))not like(v7.vc1))) +select 1 from v7 where not (((cast(4751 as string(86)))not like(v7.vc1))) ---- statement ok diff --git a/sql/test/SQLancer/Tests/sqlancer09.test b/sql/test/SQLancer/Tests/sqlancer09.test --- a/sql/test/SQLancer/Tests/sqlancer09.test +++ b/sql/test/SQLancer/Tests/sqlancer09.test @@ -47,7 +47,7 @@ statement ok rowcount 0 update t0 set tc2 = 119, tc0 = cast(t0.tc0 as bigint) statement ok rowcount 0 -update t0 set tc2 = 119, tc0 = (least(+ (cast(least(0, t0.tc0) as bigint)), sign(scale_down(100, 1)))) where true +update t0 set tc2 = 119, tc0 = (least(+ (cast(least(0, t0.tc0) as bigint)), sign(10))) where true statement ok ROLLBACK @@ -94,7 +94,7 @@ statement ok rowcount 0 merge into t0 using (select * from v0) as v0 on true when not matched then insert (c1, c0) values ((select 1 from t1), timestamp '1970-01-20 08:57:27') statement ok rowcount 0 -merge into t0 using (select * from v0) as v0 on (('>\nAH')not like(cast(scale_up(99, 0.1) as string(278)))) +merge into t0 using (select * from v0) as v0 on (('>\nAH')not like(cast(99 as string(278)))) when not matched then insert (c1, c0) values (((((abs(-5))%((select -3 from t1 as l3t1, t2 as l3t2 where true)))) >>((((values (1), (1)))>>((select distinct 2 from t1 as l3t1 where false))))), >>ifthenelse(abs(0.3) = all(values ((select all 0.1 where true)), (case -1 when -3 then 0.1 @@ -187,12 +187,12 @@ case when (('ꠔJ''6H*')=('\_fhsQh1?')) then case when true then -32 else 77 end else + (-1) end, (least(33.0, 0.34670544)) not between symmetric (cast(-2 as smallint)) and (((0.33)/(48))))) statement ok -create view v2(vc0) as (select scale_down(- (-1.2), greatest(0.54, 5)) where ((((((false)or(true))) +create view v2(vc0) as (select 1.2 where ((((((false)or(true))) and(false)))and(false))) statement ok create view v5(vc0, vc1) as (select distinct ifthenelse(case when false then false when false then false end, 'YK隆', '᳖g# .&'), -round(+ (-5), scale_down(0.4, 5)) where "isauuid"('')) with check option +round(+ (-5), 0.1) where "isauuid"('')) with check option statement ok create view v6(vc0) as (values (- (((61)-(2))))) with check option @@ -207,8 +207,7 @@ symmetric (v7.vc0) and (v7.vc0))) as int ((nullif(v7.vc0, v7.vc0))not ilike(cast(v0.vc0 as string(804)))) join (values (greatest(110, -2)), (((least(2, 9942))%(cast('1' as int)))), (case true when "isauuid"('H}m0YfN') then 0.3 else sign(0.4) end)) -as sub0 on v0.vc2 full outer join (select scale_up(least(0.4, -3), -scale_down(v2.vc0, 0.4)), 0.4, 0.4 +as sub0 on v0.vc2 full outer join (select 0.5, 0.4, 0.4 from v2, v5, v6 where greatest(true, true)) as sub1 on true right outer join (select '-1216996046' from t1 where (true) is null) as sub2 on (v0.vc2) not in (v0.vc2, v0.vc2, false, v0.vc2)) as res ---- @@ -307,15 +306,14 @@ NULL 1 0.07074437 239480113 NULL NULL statement ok -create view v2(vc0, vc1, vc2) as (values (((((+ (2))&(-2)))+(scale_down(least(31552, -0.3), cast(1500294098 as int)))), -((- (((44257622)-(0.6))))>=(least(-3, -4))), case - (sql_min(0.632858, -0.3)) when ((((5)^(4)))+(((0.4)/(5)))) -then sql_max(cast(5293 as decimal), ((0.5)- -(0.5))) end),(charindex('934079707', '35305325'), not (false), -sql_max(((+ (102))|(case 0.028362095 when 458003921 then 28118 end)), cast(least(0.3, -0.79115176) as double))), (least(((((0.5)%(0.40122834)))||(2)), -0.5667308), false, 45)) +create view v2(vc0, vc1, vc2) as (values (((((+ (2))&(-2)))+(13)), +((- (((44257622)-(6))))>=(least(-3, -4))), case - (sql_min(3, +3)) when ((((5)^(4)))+(((0.4)/(5)))) +then sql_max(cast(5293 as int), ((5)- +(5))) end),(charindex('934079707', '35305325'), not (false), +sql_max(((+ (102))|(case 3 when 458003921 then 28118 end)), cast(least(3, +3) as double))), (least(((((5)%(4)))||(2)), +5), false, 45)) statement ok create view v3(vc0) as (values (least(least(0.3, 0.9), 0.5))) @@ -354,7 +352,7 @@ sql_max('f)6_', '.u'), cast(true as stri group by substr('FALSE', 2)) query T nosort -select sum(all abs(interval '-27135172' second)) from v27 full outer join (select all scale_up(0.131, 12375.0) +select sum(all abs(interval '-27135172' second)) from v27 full outer join (select all 131.2 from v32 cross join (values (round(0.23, 10))) as sub0 where ((v32.vc0)=(0.32))) as sub0 on case 3 when case 21 when 12524 then -3 when '1092027064' then 3692 else 18 end then case when true then true else true end @@ -402,7 +400,7 @@ statement ok create or replace view v84(vc0, vc1) as (values (cast(not (least(false, false)) as int), case when nullif(((-763905586)=(0.8063365267447331)), "isauuid"('87')) then case ((-1573098947)%(0.22336472349933323)) when nullif(7159, 26015) then ((-1216247830)*(-580027885)) when - (0.17724898013816237) then -1847868202 else - (-7.96515311E8) end else 0.854441498295166 end), (cast(not (false) as int), -greatest(scale_up(+ (48), 0.9562314161003085), ((- (85))+(- (-1290129393)))))) with check option +greatest(48, ((- (85))+(- (-1290129393)))))) with check option statement error 22003!overflow in calculation 1XOR-9223372036854775807. select all count(all least(((null)*(v74.vc1)), cast(0.7407841 as bigint))) from v74 cross join v84 join (values @@ -544,15 +542,17 @@ create view v21(vc0) as (values (greates statement ok create view v24(vc0) as (values (0.22)) with check option -statement error 42000!Argument 2 to round function cannot be null -select ((sum(all least(((((0.32)-(0.33))) -(0.43)), -(cast(3 as bigint)))))>>(least(cast(26 as bigint), -cast(-507871984 as bigint)))), 1 from v21 -join v18 on ((scale_down(v18.vc0, null))>(cast(((0.33) +query TI nosort +select ((sum(all least(((((0.32)-(0.33))) -(0.43)), -(cast(3 as bigint)))))>>2), 1 from v21 +join v18 on ((v18.vc0)>(cast(((0.33) -(0.222)) as double))) inner join (select distinct replace(sql_min(rtrim('便竼E*P'), "concat"('?X', '沈pJqd')), replace('w', '95', '580488485'), cast(((0.33827385)/(24413.0)) as string)) from v24) as sub0 on ((least(342, v18.vc0))<>(1)) group by greatest(-432, ((24)|(32))), least((((('RJᦈ4[[h\340\272\246')like('9804')))and(not (false))), "isauuid"(cast(v18.vc0 as string(979)))) +---- +-1 +1 statement ok ROLLBACK @@ -683,14 +683,14 @@ cast(case '17841' when '155' then 2909 w query I nosort SELECT CAST(SUM(agg0) as BIGINT) FROM ( - SELECT count(ALL 1) as agg0 FROM v23, v13, v11 CROSS JOIN (VALUES (scale_down(CAST(0.31366895126242933 AS BIGINT), - NULLIF(0.6018914, 0.947574)), "isauuid"(''))) AS sub0 WHERE ((greatest(v11.vc0, v11.vc0))NOT LIKE(CAST('' AS STRING(299)))) + SELECT count(ALL 1) as agg0 FROM v23, v13, v11 CROSS JOIN (VALUES (CAST(0.31366895126242933 AS BIGINT), + "isauuid"(''))) AS sub0 WHERE ((greatest(v11.vc0, v11.vc0))NOT LIKE(CAST('' AS STRING(299)))) UNION ALL - SELECT count(ALL 1) as agg0 FROM v23, v13, v11 CROSS JOIN (VALUES (scale_down(CAST(0.31366895126242933 AS BIGINT), - NULLIF(0.6018914, 0.947574)), "isauuid"(''))) AS sub0 WHERE NOT (((greatest(v11.vc0, v11.vc0))NOT LIKE(CAST('' AS STRING(299))))) + SELECT count(ALL 1) as agg0 FROM v23, v13, v11 CROSS JOIN (VALUES (CAST(0.31366895126242933 AS BIGINT), + "isauuid"(''))) AS sub0 WHERE NOT (((greatest(v11.vc0, v11.vc0))NOT LIKE(CAST('' AS STRING(299))))) UNION ALL - SELECT count(ALL 1) as agg0 FROM v23, v13, v11 CROSS JOIN (VALUES (scale_down(CAST(0.31366895126242933 AS BIGINT), - NULLIF(0.6018914, 0.947574)), "isauuid"(''))) AS sub0 WHERE (((greatest(v11.vc0, v11.vc0))NOT LIKE(CAST('' AS STRING(299))))) IS NULL + SELECT count(ALL 1) as agg0 FROM v23, v13, v11 CROSS JOIN (VALUES (CAST(0.31366895126242933 AS BIGINT), + "isauuid"(''))) AS sub0 WHERE (((greatest(v11.vc0, v11.vc0))NOT LIKE(CAST('' AS STRING(299))))) IS NULL ) as asdf ---- 6 diff --git a/sql/test/SQLancer/Tests/sqlancer11.test b/sql/test/SQLancer/Tests/sqlancer11.test --- a/sql/test/SQLancer/Tests/sqlancer11.test +++ b/sql/test/SQLancer/Tests/sqlancer11.test @@ -840,7 +840,7 @@ 1 1 query T rowsort -SELECT t1.c2 FROM t1, t2 RIGHT OUTER JOIN (VALUES (UUID '131b9167-efFa-92FE-523A-5EF2Ca7963a8', ((scale_down(4, 3))&(sql_max(1220354535, -236857972))))) AS sub0 ON ((((NOT (FALSE))AND("isauuid"('*O'))))AND((('h')NOT LIKE('N')))) +SELECT t1.c2 FROM t1, t2 RIGHT OUTER JOIN (VALUES (UUID '131b9167-efFa-92FE-523A-5EF2Ca7963a8', ((4)&(sql_max(1220354535, -236857972))))) AS sub0 ON ((((NOT (FALSE))AND("isauuid"('*O'))))AND((('h')NOT LIKE('N')))) WHERE (((SELECT DISTINCT BLOB '' FROM t0 AS l2t0, t2 AS l2t2 WHERE TRUE) EXCEPT ALL (SELECT BLOB 'afd907d0A0' FROM t0 AS l2t0 WHERE TRUE))) IS NULL ---- 7982 @@ -864,7 +864,7 @@ 7982 query I rowsort SELECT CAST(SUM(count) AS BIGINT) FROM (SELECT CAST((((SELECT DISTINCT BLOB '' FROM t0 AS l2t0, t2 AS l2t2 WHERE TRUE) EXCEPT ALL (SELECT BLOB 'afd907d0A0' FROM t0 AS l2t0 WHERE TRUE))) IS NULL AS INT) as count FROM t1, t2 -RIGHT OUTER JOIN (VALUES (UUID '131b9167-efFa-92FE-523A-5EF2Ca7963a8', ((scale_down(4, 3))&(sql_max(1220354535, -236857972))))) AS sub0 ON ((((NOT (FALSE))AND("isauuid"('*O'))))AND((('h')NOT LIKE('N'))))) as res +RIGHT OUTER JOIN (VALUES (UUID '131b9167-efFa-92FE-523A-5EF2Ca7963a8', ((4)&(sql_max(1220354535, -236857972))))) AS sub0 ON ((((NOT (FALSE))AND("isauuid"('*O'))))AND((('h')NOT LIKE('N'))))) as res ---- 18 @@ -937,7 +937,7 @@ query TI nosort select interval '4' month, count(*) from t2, t0, t1 cross join (select t2.c0, case when least(false, true) then 2 when (date '1970-01-01') is not null then 3.2 when (values (true), (true)) then sql_max(0.54, 0.15) end from t1, t2, t0 full outer join (select (select 0.16 from t1 as l2t1, t2 as l2t2 where true) from t0 as l1t0, t1 as l1t1, t2 as l1t2 where false) as sub0 on case blob '' when blob '14' then false when blob '15' then false end where ((t2.c2)ilike(t2.c2))) as sub0 where ((nullif(t2.c2, t2.c2))ilike((select l2t2.c2 from t2 as l2t2, t1 as l2t1 where true))) group by 5 -having (scale_up(min(case when ((t2.c2)ilike(t2.c2)) then t0.c0 end), 2)) between asymmetric (cast(0.42 as smallint)) and (least(-3, 0.31)) order by null asc nulls last, lower('0.4') desc nulls last +having (min(case when ((t2.c2)ilike(t2.c2)) then t0.c0 end)) between asymmetric (cast(0.42 as smallint)) and (least(-3, 0.31)) order by null asc nulls last, lower('0.4') desc nulls last ---- statement ok diff --git a/sql/test/miscellaneous/Tests/simple_selects.test b/sql/test/miscellaneous/Tests/simple_selects.test --- a/sql/test/miscellaneous/Tests/simple_selects.test +++ b/sql/test/miscellaneous/Tests/simple_selects.test @@ -238,10 +238,9 @@ NULL NULL _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org