Changeset: 032cf55ffeab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=032cf55ffeab
Modified Files:
monetdb5/modules/mal/Tests/imprints.malC
sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.sql
sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.err
sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.out
Branch: typing
Log Message:
Convert to the right type and approved output
diffs (78 lines):
diff --git a/monetdb5/modules/mal/Tests/imprints.malC
b/monetdb5/modules/mal/Tests/imprints.malC
--- a/monetdb5/modules/mal/Tests/imprints.malC
+++ b/monetdb5/modules/mal/Tests/imprints.malC
@@ -20,6 +20,7 @@ mdb.setDebug(dbgmsk_restore);
io.printf("#imprint tuples 1000000\n");
sz := 1000000* 8.0;
+szf:= calc.flt(sz);
t0:= alarm.usec();
bat.imprints(b);
t1:= alarm.usec();
@@ -29,7 +30,7 @@ io.printf("#imprint create %d\n",d0);
l:= bat.imprintsize(b);
lf:= calc.flt(l);
io.printf("#imprint size %d\n",l);
-f:= sz/100.0;
+f:= szf/100.0;
f := lf/f;
io.printf("#imprint percentage overhead %4.2f\n",f);
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.sql
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.sql
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.sql
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.sql
@@ -14,6 +14,8 @@ SELECT INTERVAL '1' HOUR / INTERVAL '180
SELECT INTERVAL '3' MONTH * INTERVAL '3' MONTH; --error on typing branch,
cannot multiply intervals
select mya + interval '2' second from (select interval '3' second * 1.2) as
mya(mya); -- 5.600
+SELECT 1 / INTERVAL '2' MONTH; --error on typing branch, cannot divide an
integer by an interval
+
SELECT INTERVAL '5' MONTH * cast(2.44 as double); -- 12
SELECT INTERVAL '5' MONTH * cast(2.29 as real); -- 11
SELECT INTERVAL '1' MONTH * cast(1.0 as double); -- 1
@@ -21,6 +23,9 @@ SELECT INTERVAL '1' SECOND * cast(2.44 a
SELECT INTERVAL '5' SECOND * cast(2.29 as real); -- 11.450
SELECT INTERVAL '5' SECOND * cast(1.0 as double); -- 5.000
+SELECT cast(2.56 as double) * INTERVAL '5' MONTH; -- 13
+SELECT cast(3.1 as real) * INTERVAL '3' SECOND; -- 9.300
+
SELECT INTERVAL '1' MONTH / cast(2.0 as double); -- 0
SELECT INTERVAL '1' MONTH / cast(1.5 as double); -- 0
SELECT INTERVAL '1' MONTH / cast(1.0 as double); -- 1
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.err
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.err
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.err
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.err
@@ -13,6 +13,10 @@ MAPI = (monetdb) /var/tmp/mtest-452588/
QUERY = SELECT INTERVAL '3' MONTH * INTERVAL '3' MONTH; --error on typing
branch, cannot multiply intervals
ERROR = !SELECT: no such binary operator
'sql_mul(month_interval,month_interval)'
CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-37742/.s.monetdb.31621
+QUERY = SELECT 1 / INTERVAL '2' MONTH; --error on typing branch, cannot
divide an integer by an interval
+ERROR = !SELECT: no such binary operator 'sql_div(smallint,month_interval)'
+CODE = 42000
# 12:56:20 >
# 12:56:20 > "Done."
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.out
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.out
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.out
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.stable.out
@@ -119,6 +119,18 @@ stdout of test 'interval-math.Bug-6935`
% sec_interval # type
% 5 # length
[ 5.000 ]
+#SELECT cast(2.56 as double) * INTERVAL '5' MONTH; -- 13
+% .%2 # table_name
+% %2 # name
+% month_interval # type
+% 2 # length
+[ 13 ]
+#SELECT cast(3.1 as real) * INTERVAL '3' SECOND; -- 9.300
+% .%2 # table_name
+% %2 # name
+% sec_interval # type
+% 5 # length
+[ 9.300 ]
#SELECT INTERVAL '1' SECOND / cast(2.0 as double); -- 0.500
% .%2 # table_name
% %2 # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
