From 78dbf3a7e15beb34f229e7012b2329a937986384 Mon Sep 17 00:00:00 2001 From: Gagan Goel Date: Thu, 8 Jul 2021 08:49:26 +0000 Subject: [PATCH] MCOL-641 Move MTR tests from future/ to basic/ --- .../r}/mcol641-aggregate.result | 0 .../r}/mcol641-arithmetic.result | 0 .../{future => basic/r}/mcol641-create.result | 0 .../{future => basic/r}/mcol641-delete.result | 0 .../r}/mcol641-functions.result | 30 +++++++++---------- .../{future => basic/r}/mcol641-insert.result | 0 .../{future => basic/r}/mcol641-joins.result | 0 .../r}/mcol641-skewed-joins.result | 0 .../r}/mcol641-sorting.result | 0 .../{future => basic/r}/mcol641-union.result | 0 .../{future => basic/r}/mcol641-update.result | 0 .../t}/mcol641-aggregate.test | 0 .../t}/mcol641-arithmetic.test | 0 .../{future => basic/t}/mcol641-create.test | 0 .../{future => basic/t}/mcol641-delete.test | 0 .../t}/mcol641-functions.test | 6 ++-- .../{future => basic/t}/mcol641-insert.test | 0 .../{future => basic/t}/mcol641-joins.test | 0 .../t}/mcol641-skewed-joins.test | 0 .../{future => basic/t}/mcol641-sorting.test | 0 .../{future => basic/t}/mcol641-union.test | 0 .../{future => basic/t}/mcol641-update.test | 0 22 files changed, 19 insertions(+), 17 deletions(-) rename mysql-test/columnstore/{future => basic/r}/mcol641-aggregate.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-arithmetic.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-create.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-delete.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-functions.result (98%) rename mysql-test/columnstore/{future => basic/r}/mcol641-insert.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-joins.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-skewed-joins.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-sorting.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-union.result (100%) rename mysql-test/columnstore/{future => basic/r}/mcol641-update.result (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-aggregate.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-arithmetic.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-create.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-delete.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-functions.test (99%) rename mysql-test/columnstore/{future => basic/t}/mcol641-insert.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-joins.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-skewed-joins.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-sorting.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-union.test (100%) rename mysql-test/columnstore/{future => basic/t}/mcol641-update.test (100%) diff --git a/mysql-test/columnstore/future/mcol641-aggregate.result b/mysql-test/columnstore/basic/r/mcol641-aggregate.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-aggregate.result rename to mysql-test/columnstore/basic/r/mcol641-aggregate.result diff --git a/mysql-test/columnstore/future/mcol641-arithmetic.result b/mysql-test/columnstore/basic/r/mcol641-arithmetic.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-arithmetic.result rename to mysql-test/columnstore/basic/r/mcol641-arithmetic.result diff --git a/mysql-test/columnstore/future/mcol641-create.result b/mysql-test/columnstore/basic/r/mcol641-create.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-create.result rename to mysql-test/columnstore/basic/r/mcol641-create.result diff --git a/mysql-test/columnstore/future/mcol641-delete.result b/mysql-test/columnstore/basic/r/mcol641-delete.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-delete.result rename to mysql-test/columnstore/basic/r/mcol641-delete.result diff --git a/mysql-test/columnstore/future/mcol641-functions.result b/mysql-test/columnstore/basic/r/mcol641-functions.result similarity index 98% rename from mysql-test/columnstore/future/mcol641-functions.result rename to mysql-test/columnstore/basic/r/mcol641-functions.result index 653c4be97..6a0e27209 100644 --- a/mysql-test/columnstore/future/mcol641-functions.result +++ b/mysql-test/columnstore/basic/r/mcol641-functions.result @@ -962,16 +962,16 @@ atan_test 0 0 0 atan_test 1.5707882267430564 1.5626964520979927 0.12283446061629792 atan_test 1.5707963267948966 1.5707963267948966 0.12283523778346472 atan_test 1.5707963267948966 1.5707963267948966 0.7853981633974483 -SELECT "cos_test", COS(d1), COS(d2), COS(d3) FROM cs1; -cos_test COS(d1) COS(d2) COS(d3) +SELECT "cos_test", TRUNCATE(COS(d1), 15), COS(d2), COS(d3) FROM cs1; +cos_test TRUNCATE(COS(d1), 15) COS(d2) COS(d3) cos_test NULL NULL NULL -cos_test 1 1 1 -cos_test -0.19261922801680903 0.8518103524718695 0.5403023058681398 -cos_test 0.8546200927985496 -0.9857846013208577 0.992388885112192 -cos_test -0.6722948816565845 -0.5947139710921574 0.9923889822735581 -cos_test -0.6722948816565845 -0.5947139710921574 0.9923889822735581 -cos_test 0.8546200927985496 -0.9857846013208577 0.992388885112192 -cos_test -0.19261922801680903 -0.3850065443966674 0.5403023058681398 +cos_test 1.000000000000000 1 1 +cos_test -0.192619228016809 0.8518103524718695 0.5403023058681398 +cos_test 0.854620092798549 -0.9857846013208577 0.992388885112192 +cos_test -0.672294881656584 -0.5947139710921574 0.9923889822735581 +cos_test -0.672294881656584 -0.5947139710921574 0.9923889822735581 +cos_test 0.854620092798549 -0.9857846013208577 0.992388885112192 +cos_test -0.192619228016809 -0.3850065443966674 0.5403023058681398 SELECT "sin_test", SIN(d1), SIN(d2), SIN(d3) FROM cs1; sin_test SIN(d1) SIN(d2) SIN(d3) sin_test NULL NULL NULL @@ -992,13 +992,13 @@ tan_test -1.1011290939216198 -1.3518050821917635 -0.12408706100839918 tan_test 1.1011290939216198 1.3518050821917635 0.12408706100839918 tan_test 0.6075843441836666 0.17043687455407822 0.12408786216971879 tan_test -5.0943697944581485 2.397138064229512 1.5574077246549023 -SELECT "cos_test", COS(d1), COS(d2), COS(d3) FROM cs2; -cos_test COS(d1) COS(d2) COS(d3) +SELECT "cos_test", TRUNCATE(COS(d1), 15), COS(d2), COS(d3) FROM cs2; +cos_test TRUNCATE(COS(d1), 15) COS(d2) COS(d3) cos_test NULL NULL NULL -cos_test 1 1 1 -cos_test -0.6722948816565845 -0.5947139710921574 0.9923889822735581 -cos_test 0.8546200927985496 -0.9857846013208577 0.992388885112192 -cos_test -0.19261922801680903 -0.3850065443966674 0.5403023058681398 +cos_test 1.000000000000000 1 1 +cos_test -0.672294881656584 -0.5947139710921574 0.9923889822735581 +cos_test 0.854620092798549 -0.9857846013208577 0.992388885112192 +cos_test -0.192619228016809 -0.3850065443966674 0.5403023058681398 SELECT "sin_test", SIN(d1), SIN(d2), SIN(d3) FROM cs2; sin_test SIN(d1) SIN(d2) SIN(d3) sin_test NULL NULL NULL diff --git a/mysql-test/columnstore/future/mcol641-insert.result b/mysql-test/columnstore/basic/r/mcol641-insert.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-insert.result rename to mysql-test/columnstore/basic/r/mcol641-insert.result diff --git a/mysql-test/columnstore/future/mcol641-joins.result b/mysql-test/columnstore/basic/r/mcol641-joins.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-joins.result rename to mysql-test/columnstore/basic/r/mcol641-joins.result diff --git a/mysql-test/columnstore/future/mcol641-skewed-joins.result b/mysql-test/columnstore/basic/r/mcol641-skewed-joins.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-skewed-joins.result rename to mysql-test/columnstore/basic/r/mcol641-skewed-joins.result diff --git a/mysql-test/columnstore/future/mcol641-sorting.result b/mysql-test/columnstore/basic/r/mcol641-sorting.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-sorting.result rename to mysql-test/columnstore/basic/r/mcol641-sorting.result diff --git a/mysql-test/columnstore/future/mcol641-union.result b/mysql-test/columnstore/basic/r/mcol641-union.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-union.result rename to mysql-test/columnstore/basic/r/mcol641-union.result diff --git a/mysql-test/columnstore/future/mcol641-update.result b/mysql-test/columnstore/basic/r/mcol641-update.result similarity index 100% rename from mysql-test/columnstore/future/mcol641-update.result rename to mysql-test/columnstore/basic/r/mcol641-update.result diff --git a/mysql-test/columnstore/future/mcol641-aggregate.test b/mysql-test/columnstore/basic/t/mcol641-aggregate.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-aggregate.test rename to mysql-test/columnstore/basic/t/mcol641-aggregate.test diff --git a/mysql-test/columnstore/future/mcol641-arithmetic.test b/mysql-test/columnstore/basic/t/mcol641-arithmetic.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-arithmetic.test rename to mysql-test/columnstore/basic/t/mcol641-arithmetic.test diff --git a/mysql-test/columnstore/future/mcol641-create.test b/mysql-test/columnstore/basic/t/mcol641-create.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-create.test rename to mysql-test/columnstore/basic/t/mcol641-create.test diff --git a/mysql-test/columnstore/future/mcol641-delete.test b/mysql-test/columnstore/basic/t/mcol641-delete.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-delete.test rename to mysql-test/columnstore/basic/t/mcol641-delete.test diff --git a/mysql-test/columnstore/future/mcol641-functions.test b/mysql-test/columnstore/basic/t/mcol641-functions.test similarity index 99% rename from mysql-test/columnstore/future/mcol641-functions.test rename to mysql-test/columnstore/basic/t/mcol641-functions.test index e91b4cbf5..760e548db 100644 --- a/mysql-test/columnstore/future/mcol641-functions.test +++ b/mysql-test/columnstore/basic/t/mcol641-functions.test @@ -542,11 +542,13 @@ SELECT "atan_test", ATAN(d1), ATAN(d2), ATAN(d3) FROM cs2; # SIN(), COS(), COT(), TAN() # signed -SELECT "cos_test", COS(d1), COS(d2), COS(d3) FROM cs1; +# Remove the TRUNCATE() wrapper from the below once MCOL-4811 is fixed. +SELECT "cos_test", TRUNCATE(COS(d1), 15), COS(d2), COS(d3) FROM cs1; SELECT "sin_test", SIN(d1), SIN(d2), SIN(d3) FROM cs1; SELECT "tan_test", TAN(d1), TAN(d2), TAN(d3) FROM cs1; # unsigned -SELECT "cos_test", COS(d1), COS(d2), COS(d3) FROM cs2; +# Remove the TRUNCATE() wrapper from the below once MCOL-4811 is fixed. +SELECT "cos_test", TRUNCATE(COS(d1), 15), COS(d2), COS(d3) FROM cs2; SELECT "sin_test", SIN(d1), SIN(d2), SIN(d3) FROM cs2; SELECT "tan_test", TAN(d1), TAN(d2), TAN(d3) FROM cs2; diff --git a/mysql-test/columnstore/future/mcol641-insert.test b/mysql-test/columnstore/basic/t/mcol641-insert.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-insert.test rename to mysql-test/columnstore/basic/t/mcol641-insert.test diff --git a/mysql-test/columnstore/future/mcol641-joins.test b/mysql-test/columnstore/basic/t/mcol641-joins.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-joins.test rename to mysql-test/columnstore/basic/t/mcol641-joins.test diff --git a/mysql-test/columnstore/future/mcol641-skewed-joins.test b/mysql-test/columnstore/basic/t/mcol641-skewed-joins.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-skewed-joins.test rename to mysql-test/columnstore/basic/t/mcol641-skewed-joins.test diff --git a/mysql-test/columnstore/future/mcol641-sorting.test b/mysql-test/columnstore/basic/t/mcol641-sorting.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-sorting.test rename to mysql-test/columnstore/basic/t/mcol641-sorting.test diff --git a/mysql-test/columnstore/future/mcol641-union.test b/mysql-test/columnstore/basic/t/mcol641-union.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-union.test rename to mysql-test/columnstore/basic/t/mcol641-union.test diff --git a/mysql-test/columnstore/future/mcol641-update.test b/mysql-test/columnstore/basic/t/mcol641-update.test similarity index 100% rename from mysql-test/columnstore/future/mcol641-update.test rename to mysql-test/columnstore/basic/t/mcol641-update.test