You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tl...@apache.org on 2021/04/28 11:56:56 UTC

[ignite] branch sql-calcite updated: IGNITE-14623 Calcite. Sort out test scripts at: sql/aggregate/aggregates/*

This is an automated email from the ASF dual-hosted git repository.

tledkov pushed a commit to branch sql-calcite
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/sql-calcite by this push:
     new 5a19f9c  IGNITE-14623 Calcite. Sort out test scripts at: sql/aggregate/aggregates/*
5a19f9c is described below

commit 5a19f9cbf0cfcf8f8727ac7a65758f6d305f06c5
Author: tledkov <tl...@gridgain.com>
AuthorDate: Wed Apr 28 14:56:32 2021 +0300

    IGNITE-14623 Calcite. Sort out test scripts at: sql/aggregate/aggregates/*
---
 .../aggregate/aggregates/test_aggregate_types.test | 61 ++------------
 ...types.test => test_aggregate_types.test_ignore} | 19 +++--
 .../aggregates/test_aggregate_types_scalar.test    | 47 -----------
 ...est => test_aggregate_types_scalar.test_ignore} |  5 +-
 ...ntile.test => test_approx_quantile.test_ignore} |  5 +-
 ...=> test_approximate_distinct_count.test_ignore} |  3 +
 ...g_min_max.test => test_arg_min_max.test_ignore} |  1 +
 .../test/sql/aggregate/aggregates/test_avg.test    | 25 +-----
 .../{test_avg.test => test_avg.test_ignore}        | 16 +---
 ...{test_bit_and.test => test_bit_and.test_ignore} |  1 +
 .../{test_bit_or.test => test_bit_or.test_ignore}  |  1 +
 ...{test_bit_xor.test => test_bit_xor.test_ignore} |  1 +
 .../test/sql/aggregate/aggregates/test_bool.test   | 95 ----------------------
 .../test/sql/aggregate/aggregates/test_corr.test   | 51 ------------
 ...t_count.test_ignored => test_count.test_ignore} |  0
 .../{test_covar.test => test_covar.test_ignore}    |  2 +
 ...ct_aggr.test => test_distinct_aggr.test_ignore} |  1 +
 ...g.test => test_distinct_string_agg.test_ignore} |  2 +
 .../aggregate/aggregates/test_empty_aggregate.test |  6 +-
 ...egate.test => test_empty_aggregate.test_ignore} |  6 +-
 .../sql/aggregate/aggregates/test_entropy.test     | 94 ---------------------
 .../aggregates/test_first_noninlined.test          | 38 ---------
 ... => test_group_by_many_groups.test_slow_ignore} |  1 +
 ...t_histogram.test => test_histogram.test_ignore} |  1 +
 .../aggregates/test_incorrect_aggregate.test       | 55 -------------
 .../sql/aggregate/aggregates/test_kurtosis.test    | 82 -------------------
 .../{test_mode.test => test_mode.test_ignore}      |  1 +
 .../aggregate/aggregates/test_null_aggregates.test |  2 +-
 ...ht.test_ignored => test_perfect_ht.test_ignore} |  0
 .../sql/aggregate/aggregates/test_product.test     | 68 ----------------
 ...est_quantile.test => test_quantile.test_ignore} |  0
 ...le_list.test => test_quantile_list.test_ignore} |  1 +
 ...regression.test => test_regression.test_ignore} |  1 +
 .../sql/aggregate/aggregates/test_scalar_aggr.test | 46 +----------
 ...alar_aggr.test => test_scalar_aggr.test_ignore} | 17 ++--
 .../sql/aggregate/aggregates/test_skewness.test    | 82 -------------------
 .../{test_stddev.test => test_stddev.test_ignore}  |  1 +
 ...string_agg.test => test_string_agg.test_ignore} |  1 +
 ...gg_big.test => test_string_agg_big.test_ignore} |  1 +
 ...> test_string_agg_many_groups.test_slow_ignore} |  2 +
 .../{test_sum.test => test_sum.test_ignore}        |  1 +
 ...n.test_ignored => test_distinct_on.test_ignore} |  0
 ...d => test_corel_subquery_in_having.test_ignore} |  0
 ...test_ignored => test_scalar_having.test_ignore} |  0
 44 files changed, 68 insertions(+), 775 deletions(-)

diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test
index 3dfe6d6..f36e825 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test
@@ -3,7 +3,7 @@
 # group: [aggregates]
 
 statement ok
-CREATE TABLE strings(s STRING, g INTEGER)
+CREATE TABLE strings(s VARCHAR, g INTEGER)
 
 statement ok
 INSERT INTO strings VALUES ('hello', 0), ('world', 1), (NULL, 0), ('r', 1)
@@ -25,49 +25,6 @@ SELECT COUNT(*), COUNT(s), MIN(s), MAX(s) FROM strings WHERE s IS NULL
 NULL
 NULL
 
-# add string agg
-query TTTT
-SELECT STRING_AGG(s, ' '), STRING_AGG(s, ''), STRING_AGG('', ''), STRING_AGG('hello', ' ') FROM strings
-----
-hello world r
-helloworldr
-(empty)
-hello hello hello hello
-
-# more complex agg (groups)
-query IIITTT
-SELECT g, COUNT(*), COUNT(s), MIN(s), MAX(s), STRING_AGG(s, ' ') FROM strings GROUP BY g ORDER BY g
-----
-0
-2
-1
-hello
-hello
-hello
-1
-2
-2
-r
-world
-world r
-
-# empty group
-query IIITTT
-SELECT g, COUNT(*), COUNT(s), MIN(s), MAX(s), STRING_AGG(s, ' ') FROM strings WHERE s IS NULL OR s <> 'hello' GROUP BY g ORDER BY g
-----
-0
-1
-0
-NULL
-NULL
-NULL
-1
-2
-2
-r
-world
-world r
-
 # unsupported aggregates
 statement error
 SELECT SUM(s) FROM strings GROUP BY g ORDER BY g
@@ -87,8 +44,8 @@ SELECT COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans
 ----
 4
 3
-0
-1
+false
+true
 
 query IITT
 SELECT COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans WHERE b IS NULL
@@ -104,13 +61,13 @@ SELECT g, COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans GROUP BY g ORDER BY g
 0
 2
 1
-0
-0
+false
+false
 1
 2
 2
-0
-1
+false
+true
 
 query IIITT
 SELECT g, COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans WHERE b IS NULL OR b=true GROUP BY g ORDER BY g
@@ -123,8 +80,8 @@ NULL
 1
 1
 1
-1
-1
+true
+true
 
 statement error
 SELECT SUM(b) FROM booleans GROUP BY g ORDER BY g
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test_ignore
similarity index 94%
copy from modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test
copy to modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test_ignore
index 3dfe6d6..65153d6 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types.test_ignore
@@ -1,9 +1,10 @@
 # name: test/sql/aggregate/aggregates/test_aggregate_types.test
 # description: Test aggregates with many different types
 # group: [aggregates]
+# Ignore: https://issues.apache.org/jira/browse/IGNITE-14636
 
 statement ok
-CREATE TABLE strings(s STRING, g INTEGER)
+CREATE TABLE strings(s VARCHAR, g INTEGER)
 
 statement ok
 INSERT INTO strings VALUES ('hello', 0), ('world', 1), (NULL, 0), ('r', 1)
@@ -87,8 +88,8 @@ SELECT COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans
 ----
 4
 3
-0
-1
+false
+true
 
 query IITT
 SELECT COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans WHERE b IS NULL
@@ -104,13 +105,13 @@ SELECT g, COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans GROUP BY g ORDER BY g
 0
 2
 1
-0
-0
+false
+false
 1
 2
 2
-0
-1
+false
+true
 
 query IIITT
 SELECT g, COUNT(*), COUNT(b), MIN(b), MAX(b) FROM booleans WHERE b IS NULL OR b=true GROUP BY g ORDER BY g
@@ -123,8 +124,8 @@ NULL
 1
 1
 1
-1
-1
+true
+true
 
 statement error
 SELECT SUM(b) FROM booleans GROUP BY g ORDER BY g
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
index 205b848..9d9015b 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
@@ -2,26 +2,9 @@
 # description: Test scalar aggregates with many different types
 # group: [aggregates]
 
-query IIIIII
-SELECT COUNT(), COUNT(1), COUNT(*), COUNT(NULL), COUNT('hello'), COUNT(DATE '1992-02-02')
-----
-1
-1
-1
-0
-1
-1
-
 statement error
 SELECT COUNT(1, 2)
 
-query RRR
-SELECT SUM(1), SUM(NULL), SUM(33.3)
-----
-1.000000
-NULL
-33.300000
-
 statement error
 SELECT SUM(True)
 
@@ -37,44 +20,24 @@ SELECT SUM()
 statement error
 SELECT SUM(1, 2)
 
-query IIRTTTT
-SELECT MIN(1), MIN(NULL), MIN(33.3), MIN('hello'), MIN(True), MIN(DATE '1992-02-02'), MIN(TIMESTAMP '2008-01-01 00:00:01')
-----
-1	NULL	33.300000	hello	1	1992-02-02	2008-01-01 00:00:01
-
 statement error
 SELECT MIN()
 
 statement error
 SELECT MIN(1, 2)
 
-query IIRTTTT
-SELECT MAX(1), MAX(NULL), MAX(33.3), MAX('hello'), MAX(True), MAX(DATE '1992-02-02'), MAX(TIMESTAMP '2008-01-01 00:00:01')
-----
-1	NULL	33.300000	hello	1	1992-02-02	2008-01-01 00:00:01
-
 statement error
 SELECT MAX()
 
 statement error
 SELECT MAX(1, 2)
 
-query IIRTTTT
-SELECT FIRST(1), FIRST(NULL), FIRST(33.3), FIRST('hello'), FIRST(True), FIRST(DATE '1992-02-02'), FIRST(TIMESTAMP '2008-01-01 00:00:01')
-----
-1	NULL	33.300000	hello	1	1992-02-02	2008-01-01 00:00:01
-
 statement error
 SELECT FIRST()
 
 statement error
 SELECT FIRST(1, 2)
 
-query RRR
-SELECT AVG(1), AVG(NULL), AVG(33.3)
-----
-1.000000	NULL	33.300000
-
 statement error
 SELECT AVG(True)
 
@@ -90,16 +53,6 @@ SELECT AVG()
 statement error
 SELECT AVG(1, 2)
 
-query T
-SELECT STRING_AGG('hello')
-----
-hello
-
-query TTTTT
-SELECT STRING_AGG('hello', ' '), STRING_AGG('hello', NULL), STRING_AGG(NULL, ' '), STRING_AGG(NULL, NULL), STRING_AGG('', '')
-----
-hello	NULL	NULL	NULL	(empty)
-
 statement error
 SELECT STRING_AGG()
 
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignore
similarity index 93%
copy from modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
copy to modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignore
index 205b848..854f968 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignore
@@ -1,13 +1,14 @@
 # name: test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
 # description: Test scalar aggregates with many different types
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14543
+№ Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
 
-query IIIIII
+query IIIII
 SELECT COUNT(), COUNT(1), COUNT(*), COUNT(NULL), COUNT('hello'), COUNT(DATE '1992-02-02')
 ----
 1
 1
-1
 0
 1
 1
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_approx_quantile.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_approx_quantile.test_ignore
similarity index 97%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_approx_quantile.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_approx_quantile.test_ignore
index b4030f7..f97c5cb 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_approx_quantile.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_approx_quantile.test_ignore
@@ -1,9 +1,8 @@
 # name: test/sql/aggregate/aggregates/test_approx_quantile.test
 # description: Test approx quantile operator
 # group: [aggregates]
-
-statement ok
-PRAGMA enable_verification
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14542
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14637
 
 statement ok
 create table quantile as select range r, random() from range(10000) union all values (NULL, 0.1), (NULL, 0.5), (NULL, 0.9) order by 2;
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_approximate_distinct_count.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_approximate_distinct_count.test_ignore
similarity index 93%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_approximate_distinct_count.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_approximate_distinct_count.test_ignore
index b91d77c..f5edbcb 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_approximate_distinct_count.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_approximate_distinct_count.test_ignore
@@ -1,6 +1,9 @@
 # name: test/sql/aggregate/aggregates/test_approximate_distinct_count.test
 # description: Test approx_count_distinct operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14542
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14637
+
 
 statement error
 select approx_count_distinct(*)
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_arg_min_max.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_arg_min_max.test_ignore
similarity index 97%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_arg_min_max.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_arg_min_max.test_ignore
index 2def236..f1bbeb7 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_arg_min_max.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_arg_min_max.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_arg_min_max.test
 # description: Test arg_min and arg_max operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14639
 
 #Corner cases
 statement error
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test
index bf32a26..f181816 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test
@@ -3,25 +3,10 @@
 # group: [aggregates]
 
 # scalar average
-query RR
-SELECT AVG(3), AVG(NULL)
-----
-3
-NULL
-
-# test average on sequence
-statement ok
-CREATE SEQUENCE seq;
-
-query R
-SELECT AVG(nextval('seq'))
-----
-1
-
 query R
-SELECT AVG(nextval('seq'))
+SELECT AVG(3)
 ----
-2
+3
 
 statement ok
 CREATE TABLE integers(i INTEGER);
@@ -29,13 +14,11 @@ CREATE TABLE integers(i INTEGER);
 statement ok
 INSERT INTO integers VALUES (1), (2), (3)
 
-query RRRR
-SELECT AVG(i), AVG(1), AVG(DISTINCT i), AVG(NULL) FROM integers
+query RR
+SELECT AVG(i), AVG(1) FROM integers
 ----
 2
 1
-2
-NULL
 
 query R
 SELECT AVG(i) FROM integers WHERE i > 100
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test_ignore
similarity index 79%
copy from modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test
copy to modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test_ignore
index bf32a26..18b56ca 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_avg.test_ignore
@@ -1,6 +1,8 @@
 # name: test/sql/aggregate/aggregates/test_avg.test
 # description: Test AVG operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14543
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14544
 
 # scalar average
 query RR
@@ -9,20 +11,6 @@ SELECT AVG(3), AVG(NULL)
 3
 NULL
 
-# test average on sequence
-statement ok
-CREATE SEQUENCE seq;
-
-query R
-SELECT AVG(nextval('seq'))
-----
-1
-
-query R
-SELECT AVG(nextval('seq'))
-----
-2
-
 statement ok
 CREATE TABLE integers(i INTEGER);
 
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_and.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_and.test_ignore
similarity index 93%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_bit_and.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_bit_and.test_ignore
index dc0808e..082fe2c 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_and.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_and.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_bit_and.test
 # description: Test BIT_AND operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14640
 
 # test on scalar values
 query II
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_or.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_or.test_ignore
similarity index 92%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_bit_or.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_bit_or.test_ignore
index 29910d4..1fe325e 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_or.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_or.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_bit_or.test
 # description: Test BIT_OR operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14640
 
 # test on scalar values
 query II
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_xor.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_xor.test_ignore
similarity index 93%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_bit_xor.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_bit_xor.test_ignore
index ad4fe1b..4b9fb0b 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_xor.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_bit_xor.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_bit_xor.test
 # description: Test BIT_XOR operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14640
 
 # test on scalar values
 query II
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_bool.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_bool.test
deleted file mode 100644
index 6f50fd1..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_bool.test
+++ /dev/null
@@ -1,95 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_bool.test
-# description: Test Bool operator
-# group: [aggregates]
-
-# Corner Cases
-statement error
-select bool_or(0)
-
-statement error
-select bool_and(0)
-
-query I
-select bool_or(NULL)
-----
-NULL
-
-query I
-select bool_and(NULL)
-----
-NULL
-
-statement error
-select bool_or()
-
-statement error
-select bool_and()
-
-statement error
-select bool_or(*)
-
-statement error
-select bool_and(*)
-
-query I
-SELECT bool_or(True) FROM range(100);
-----
-1
-
-query I
-SELECT bool_and(True) FROM range(100);
-----
-1
-
-query I
-SELECT bool_or(True) FROM range(100) tbl(i) WHERE 1=0;
-----
-NULL
-
-query I
-SELECT bool_and(True) FROM range(100) tbl(i) WHERE 1=0;
-----
-NULL
-
-statement ok
-create table t (d date)
-
-statement ok
-insert into t values (DATE'2021-02-09'-1),(DATE'2021-02-09'+1),(NULL)
-
-query II
-select bool_or(d > '2021-02-09') AS or_result,
-       bool_and(d > '2021-02-09') AS and_result
-from t;
-----
-1	0
-
-query III
-select d,bool_or(d > '2021-02-09') AS or_result,
-       bool_and(d > '2021-02-09') AS and_result
-from t
-group by d;
-----
-NULL	NULL	NULL
-2021-02-08	0	0
-2021-02-10	1	1
-
-# Window Function
-require vector_size 512
-
-query I
-select bool_or(d > '2021-02-09') over (partition by d)
-    from t order by d;
-----
-NULL
-0
-1
-
-query I
-select bool_and(d > '2021-02-09') over (partition by d)
-    from t order by d;
-----
-NULL
-0
-1
-
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_corr.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_corr.test
deleted file mode 100644
index 57355d2..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_corr.test
+++ /dev/null
@@ -1,51 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_corr.test
-# description: Test CORR operator
-# group: [aggregates]
-
-#Corner cases
-statement error
-select corr()
-
-query I
-select corr(NULL,NULL)
-----
-NULL
-
-query I
-select corr(1,1)
-----
-NULL
-
-statement error
-select corr(*)
-
-statement ok
-create table aggr(k int, v decimal(10,2), v2 decimal(10, 2));
-
-statement ok
-insert into aggr values(1, 10, null),(2, 10, 11), (2, 20, 22), (2, 25, null), (2, 30, 35);
-
-query II
-select k, corr(v, v2) from aggr group by k;
-----
-1	NULL
-2	0.9988445981
-
-query I
-select  corr(v, v2) from aggr
-----
-0.9988445981
-
-# Window Function
-require vector_size 512
-
-query I rowsort
-select  corr(v, v2) over (partition by k)
-    from aggr;
-----
-0.998845
-0.998845
-0.998845
-0.998845
-NULL
-
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_count.test_ignored b/modules/calcite/src/test/sql/aggregate/aggregates/test_count.test_ignore
similarity index 100%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_count.test_ignored
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_count.test_ignore
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_covar.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_covar.test_ignore
similarity index 96%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_covar.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_covar.test_ignore
index f20100f..60fdab3 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_covar.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_covar.test_ignore
@@ -1,6 +1,8 @@
 # name: test/sql/aggregate/aggregates/test_covar.test
 # description: Test COVAR operators
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14641
+
 
 # test incorrect usage of COVAR_POP function
 statement error
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_aggr.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_aggr.test_ignore
similarity index 89%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_aggr.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_aggr.test_ignore
index 6cc863f..c4dd585 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_aggr.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_aggr.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_distinct_aggr.test
 # description: DISTINCT aggregations
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14544
 
 statement ok
 CREATE TABLE distinctagg(i INTEGER, j INTEGER);
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_string_agg.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_string_agg.test_ignore
similarity index 73%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_string_agg.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_string_agg.test_ignore
index 8b206fd..3e2f1f7 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_string_agg.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_distinct_string_agg.test_ignore
@@ -1,6 +1,8 @@
 # name: test/sql/aggregate/aggregates/test_distinct_string_agg.test
 # description: Test distinct STRING_AGG operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14544
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
 
 statement ok
 CREATE TABLE strings(s VARCHAR);
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test
index 6ee4b96..2c51be5 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test
@@ -5,8 +5,8 @@
 statement ok
 CREATE TABLE integers(i INTEGER);
 
-query IIRRRIII
-SELECT COUNT(*), COUNT(i), STDDEV_SAMP(i), SUM(i), SUM(DISTINCT i), FIRST(i), MAX(i), MIN(i) FROM integers WHERE i > 100
+query IIRRRI
+SELECT COUNT(*), COUNT(i), SUM(i), SUM(DISTINCT i), MAX(i), MIN(i) FROM integers WHERE i > 100
 ----
 0
 0
@@ -14,8 +14,6 @@ NULL
 NULL
 NULL
 NULL
-NULL
-NULL
 
 statement ok
 CREATE TABLE emptyaggr(i INTEGER);
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test_ignore
similarity index 82%
copy from modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test
copy to modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test_ignore
index 6ee4b96..0b655bc 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_empty_aggregate.test_ignore
@@ -1,12 +1,13 @@
 # name: test/sql/aggregate/aggregates/test_empty_aggregate.test
 # description: Test aggregate operators on empty set
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14642
 
 statement ok
 CREATE TABLE integers(i INTEGER);
 
-query IIRRRIII
-SELECT COUNT(*), COUNT(i), STDDEV_SAMP(i), SUM(i), SUM(DISTINCT i), FIRST(i), MAX(i), MIN(i) FROM integers WHERE i > 100
+query IIRRRII
+SELECT COUNT(*), COUNT(i), STDDEV_SAMP(i), SUM(i), SUM(DISTINCT i), MAX(i), MIN(i) FROM integers WHERE i > 100
 ----
 0
 0
@@ -15,7 +16,6 @@ NULL
 NULL
 NULL
 NULL
-NULL
 
 statement ok
 CREATE TABLE emptyaggr(i INTEGER);
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_entropy.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_entropy.test
deleted file mode 100644
index d58eddd..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_entropy.test
+++ /dev/null
@@ -1,94 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_entropy.test
-# description: Test entropy function
-# group: [aggregates]
-
-#Corner cases
-statement error
-select entropy()
-
-query I
-select entropy(NULL)
-----
-0
-
-query I
-select entropy(1)
-----
-0
-
-statement error
-select entropy(*)
-
-statement ok
-create table aggr(k int);
-
-statement ok
-insert into aggr values (0),(1),(1),(1),(4),(0),(3),(3),(2),(2),(4),(4),(2),(4),(0),(0),(0),(1),(2),(3),(4),(2),(3),(3),(1);
-
-query I
-select entropy(k) from aggr ;
-----
-2.321928
-
-query I
-SELECT entropy(2) FROM range(100);
-----
-0
-
-
-
-query I
-select entropy(k) from aggr group by k%2
-----
-1.584963
-1.000000
-
-statement ok
-create table names (name string)
-
-statement ok
-insert into names values ('pedro'), ('pedro'), ('pedro'),('hannes'),('hannes'),('mark'),(null);
-
-query I
-select entropy(name) from names;
-----
-1.459148
-
-require vector_size 512
-
-query I rowsort
-select entropy(k) over (partition by k%2)
-    from aggr;
-----
-1.000000
-1.000000
-1.000000
-1.000000
-1.000000
-1.000000
-1.000000
-1.000000
-1.000000
-1.000000
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-1.584963
-
-# Empty Table
-query I
-SELECT entropy(i) FROM range(100) tbl(i) WHERE 1=0;
-----
-0
-
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_first_noninlined.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_first_noninlined.test
deleted file mode 100644
index fb9a310..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_first_noninlined.test
+++ /dev/null
@@ -1,38 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_first_noninlined.test
-# description: Test FIRST with non-inlined strings
-# group: [aggregates]
-
-statement ok
-CREATE TABLE tbl(a INTEGER, b VARCHAR)
-
-statement ok
-INSERT INTO tbl VALUES (1, NULL), (2, 'thisisalongstring'), (3, 'thisisalsoalongstring')
-
-# non-grouped aggregate
-query T
-SELECT FIRST(b) FROM tbl WHERE a=2
-----
-thisisalongstring
-
-# Check if arbitraty alias works like FIRST
-query T
-SELECT ARBITRARY(b) FROM tbl WHERE a=2
-----
-thisisalongstring
-
-query T
-SELECT FIRST(b) FROM tbl WHERE a=1
-----
-NULL
-
-# grouped aggregate
-query IT
-SELECT a, FIRST(b) FROM tbl GROUP BY a ORDER BY a
-----
-1
-NULL
-2
-thisisalongstring
-3
-thisisalsoalongstring
-
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_group_by_many_groups.test_slow b/modules/calcite/src/test/sql/aggregate/aggregates/test_group_by_many_groups.test_slow_ignore
similarity index 86%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_group_by_many_groups.test_slow
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_group_by_many_groups.test_slow_ignore
index 6988ab9..648779d 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_group_by_many_groups.test_slow
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_group_by_many_groups.test_slow_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_group_by_many_groups.test_slow
 # description: Test GROUP BY with many groups
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14542
 
 statement ok
 CREATE TABLE integers AS SELECT i, 1 AS j FROM range(0, 10000, 1) t1(i) UNION ALL SELECT i, 2 j FROM range(0, 10000, 1) t1(i);
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_histogram.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_histogram.test_ignore
similarity index 97%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_histogram.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_histogram.test_ignore
index e3bfbed..dc0b823 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_histogram.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_histogram.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_histogram.test
 # description: Test histogram aggregation
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14637
 
 statement ok
 PRAGMA enable_verification
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_incorrect_aggregate.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_incorrect_aggregate.test
deleted file mode 100644
index 026da2c..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_incorrect_aggregate.test
+++ /dev/null
@@ -1,55 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_incorrect_aggregate.test
-# description: Test incorrect usages of aggregates
-# group: [aggregates]
-
-statement error
-SELECT COUNT(1, 2, 3)
-
-statement error
-SELECT COUNT(COUNT(1))
-
-statement error
-SELECT STDDEV_SAMP()
-
-statement error
-SELECT STDDEV_SAMP(1, 2, 3)
-
-statement error
-SELECT STDDEV_SAMP(STDDEV_SAMP(1))
-
-statement error
-SELECT SUM()
-
-statement error
-SELECT SUM(1, 2, 3)
-
-statement error
-SELECT SUM(SUM(1))
-
-statement error
-SELECT FIRST()
-
-statement error
-SELECT FIRST(1, 2, 3)
-
-statement error
-SELECT FIRST(FIRST(1))
-
-statement error
-SELECT MAX()
-
-statement error
-SELECT MAX(1, 2, 3)
-
-statement error
-SELECT MAX(MAX(1))
-
-statement error
-SELECT MIN()
-
-statement error
-SELECT MIN(1, 2, 3)
-
-statement error
-SELECT MIN(MIN(1))
-
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_kurtosis.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_kurtosis.test
deleted file mode 100644
index 4680809..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_kurtosis.test
+++ /dev/null
@@ -1,82 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_kurtosis.test
-# description: Test kurtosis aggregate
-# group: [aggregates]
-
-#Corner cases
-statement error
-select kurtosis()
-
-query I
-select kurtosis(NULL)
-----
-NULL
-
-query I
-select kurtosis(1)
-----
-NULL
-
-statement error
-select kurtosis(*)
-
-
-# Constant Value (This shoud be an error)
-query I
-select kurtosis (10) from range (5)
-----
-NULL
-
-#Empty Table
-query I
-select kurtosis (10) from range (5) where 1 == 0
-----
-NULL
-
-statement ok
-create table aggr(k int, v int, v2 int);
-
-statement ok
-insert into aggr values
-    (1, 10, null),
-    (2, 10, 11),
-    (2, 10, 15),
-    (2, 10, 18),
-    (2, 20, 22),
-    (2, 20, 25),
-    (2, 25, null),
-    (2, 30, 35),
-    (2, 30, 40),
-    (2, 30, 50),
-    (2, 30, 51);
-
-query III
-select kurtosis(k), kurtosis(v), kurtosis(v2) from aggr;
-----
-11.000000	-1.961428	-1.445120
-
-query I
-select  kurtosis(v2) from aggr group by v;
-----
-NULL
-NULL
-NULL
--3.977599
-
-# Window Function
-require vector_size 512
-
-query I rowsort
-select kurtosis(v2) over (partition by v)
-    from aggr;
-----
--3.977599
--3.977599
--3.977599
--3.977599
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
-NULL
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_mode.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_mode.test_ignore
similarity index 95%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_mode.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_mode.test_ignore
index aad6973..0dc81b6 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_mode.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_mode.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_mode.test
 # description: Test mode function
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14637
 
 #Corner cases
 statement error
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_null_aggregates.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_null_aggregates.test
index faa0fb8..9dea875 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_null_aggregates.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_null_aggregates.test
@@ -311,7 +311,6 @@ INSERT INTO t1 VALUES(9196517019233481682,NULL);
 query IIII
 SELECT c0, sum(c1), min(c1), max(c1) FROM t1 GROUP BY c0 ORDER BY 1, 2, 3, 4
 ----
-NULL	NULL	NULL	NULL
 -9121942514766415310	NULL	NULL	NULL
 -9113483941634330359	NULL	NULL	NULL
 -8718457747090493475	NULL	NULL	NULL
@@ -404,3 +403,4 @@ NULL	NULL	NULL	NULL
 9034558451786630908	NULL	NULL	NULL
 9049770455330813268	NULL	NULL	NULL
 9196517019233481682	NULL	NULL	NULL
+NULL	NULL	NULL	NULL
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_perfect_ht.test_ignored b/modules/calcite/src/test/sql/aggregate/aggregates/test_perfect_ht.test_ignore
similarity index 100%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_perfect_ht.test_ignored
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_perfect_ht.test_ignore
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_product.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_product.test
deleted file mode 100644
index 55896a2..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_product.test
+++ /dev/null
@@ -1,68 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_product.test
-# description: Test Product operator
-# group: [aggregates]
-
-#Corner cases
-statement error
-select product()
-
-query I
-select product(NULL)
-----
-NULL
-
-query I
-select product(1)
-----
-1
-
-statement error
-select product(*)
-
-statement ok
-CREATE TABLE integers(i INTEGER);
-
-statement ok
-INSERT INTO integers VALUES (1), (2),(4), (NULL)
-
-query I
-SELECT product(i)  FROM integers
-----
-8
-
-query I
-SELECT PRODUCT(2) FROM range(100);
-----
-1267650600228229401496703205376
-
-query I
-SELECT PRODUCT(2) FROM range(100) tbl(i) WHERE i % 2 != 0;
-----
-1125899906842624
-
-# Grouped Aggregation
-query I
-select product(i) from integers group by i%2
-----
-1.000000
-8.000000
-NULL
-
-# Empty Table
-query I
-SELECT PRODUCT(i) FROM range(100) tbl(i) WHERE 1=0;
-----
-NULL
-
-# Window Function
-require vector_size 512
-
-query I rowsort
-select product(i) over (partition by i%2)
-    from integers;
-----
-1
-8
-8
-NULL
-
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_quantile.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_quantile.test_ignore
similarity index 100%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_quantile.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_quantile.test_ignore
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_quantile_list.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_quantile_list.test_ignore
similarity index 97%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_quantile_list.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_quantile_list.test_ignore
index 6002daf..e7ecd68 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_quantile_list.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_quantile_list.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_quantile_list.test
 # description: Test QUANTILE operator with LIST quantiles
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14637
 
 statement ok
 PRAGMA enable_verification
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_regression.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_regression.test_ignore
similarity index 98%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_regression.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_regression.test_ignore
index bd1006c..c891c56 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_regression.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_regression.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_regression.test
 # description: Test Regression Functions
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14643
 
 #Corner cases
 statement error
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test
index 328a1fc..e6827e8 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test
@@ -2,38 +2,12 @@
 # description: Test aggregates with scalar inputs
 # group: [aggregates]
 
-# test aggregate on scalar values
-query IIIIIT
-SELECT COUNT(1), MIN(1), FIRST(1), MAX(1), SUM(1), STRING_AGG('hello', ',')
-----
-1
-1
-1
-1
-1
-hello
-
-# test aggregate on scalar NULLs
-query IIIIIT
-SELECT COUNT(NULL), MIN(NULL), FIRST(NULL), MAX(NULL), SUM(NULL), STRING_AGG(NULL, NULL)
-----
-0
-NULL
-NULL
-NULL
-NULL
-NULL
-
-query I
-SELECT FIRST(NULL)
-----
-NULL
 
 query III
 SELECT NULL as a, NULL as b, 1 as id UNION SELECT CAST('00:00:00' AS TIME) as a, CAST('12:34:56' AS TIME) as b, 2 as id ORDER BY 1
 ----
-NULL	NULL	1
 00:00:00	12:34:56	2
+NULL	NULL	1
 
 # test aggregates on a set of values with scalar inputs
 statement ok
@@ -42,24 +16,10 @@ CREATE TABLE integers(i INTEGER);
 statement ok
 INSERT INTO integers VALUES (1), (2), (NULL)
 
-query IIIIIT
-SELECT COUNT(1), MIN(1), FIRST(1), MAX(1), SUM(1), STRING_AGG('hello', ',') FROM integers
+query IIII
+SELECT COUNT(1), MIN(1), MAX(1), SUM(1) FROM integers
 ----
 3
 1
 1
-1
 3
-hello,hello,hello
-
-# test aggregates on a set of values with scalar NULL values as inputs
-query IIIIIT
-SELECT COUNT(NULL), MIN(NULL), FIRST(NULL), MAX(NULL), SUM(NULL), STRING_AGG(NULL, NULL) FROM integers
-----
-0
-NULL
-NULL
-NULL
-NULL
-NULL
-
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test_ignore
similarity index 76%
copy from modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test
copy to modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test_ignore
index 328a1fc..197178c 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_scalar_aggr.test_ignore
@@ -1,33 +1,28 @@
 # name: test/sql/aggregate/aggregates/test_scalar_aggr.test
 # description: Test aggregates with scalar inputs
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14543
 
 # test aggregate on scalar values
-query IIIIIT
-SELECT COUNT(1), MIN(1), FIRST(1), MAX(1), SUM(1), STRING_AGG('hello', ',')
+query IIIIT
+SELECT COUNT(1), MIN(1),  MAX(1), SUM(1), STRING_AGG('hello', ',')
 ----
 1
 1
 1
 1
-1
 hello
 
 # test aggregate on scalar NULLs
-query IIIIIT
-SELECT COUNT(NULL), MIN(NULL), FIRST(NULL), MAX(NULL), SUM(NULL), STRING_AGG(NULL, NULL)
+query IIIIT
+SELECT COUNT(NULL), MIN(NULL), MAX(NULL), SUM(NULL), STRING_AGG(NULL, NULL)
 ----
 0
 NULL
 NULL
 NULL
 NULL
-NULL
-
-query I
-SELECT FIRST(NULL)
-----
-NULL
 
 query III
 SELECT NULL as a, NULL as b, 1 as id UNION SELECT CAST('00:00:00' AS TIME) as a, CAST('12:34:56' AS TIME) as b, 2 as id ORDER BY 1
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_skewness.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_skewness.test
deleted file mode 100644
index 1c9d1ff..0000000
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_skewness.test
+++ /dev/null
@@ -1,82 +0,0 @@
-# name: test/sql/aggregate/aggregates/test_skewness.test
-# description: Test skewness aggregate
-# group: [aggregates]
-
-#Corner cases
-statement error
-select skewness()
-
-query I
-select skewness(NULL)
-----
-NULL
-
-query I
-select skewness(1)
-----
-NULL
-
-statement error
-select skewness(*)
-
-
-# Constant Value
-query I
-select skewness (10) from range (5)
-----
-NULL
-
-#Empty Table
-query I
-select skewness (10) from range (5) where 1 == 0
-----
-NULL
-
-statement ok
-create table aggr(k int, v decimal(10,2), v2 decimal(10, 2));
-
-statement ok
-insert into aggr values
-    (1, 10, null),
-    (2, 10, 11),
-    (2, 10, 15),
-    (2, 10, 18),
-    (2, 20, 22),
-    (2, 20, 25),
-    (2, 25, null),
-    (2, 30, 35),
-    (2, 30, 40),
-    (2, 30, 50),
-    (2, 30, 51);
-
-query III
-select skewness(k), skewness(v), skewness(v2) from aggr
-----
--3.316625	-0.163444	0.365401
-
-query I
-select skewness(v2) from aggr group by v
-----
--0.423273
-NULL
-NULL
--0.330141
-
-# Window Function
-require vector_size 512
-
-query I
-select skewness(v2) over (partition by v)
-    from aggr order by v;
-----
--0.423273
--0.423273
--0.423273
--0.423273
-NULL
-NULL
-NULL
--0.330141
--0.330141
--0.330141
--0.330141
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_stddev.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_stddev.test_ignore
similarity index 97%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_stddev.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_stddev.test_ignore
index ffc955a..ae4cccb 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_stddev.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_stddev.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_stddev.test
 # description: STDDEV aggregations
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14642
 
 statement ok
 create table stddev_test(val integer, grp integer)
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg.test_ignore
similarity index 96%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg.test_ignore
index 9a451c4..c294edb 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_string_agg.test
 # description: Test STRING_AGG operator
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
 
 # test incorrect usage of STRING_AGG function
 
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_big.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_big.test_ignore
similarity index 88%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_big.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_big.test_ignore
index 68f2735..aef50ff2 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_big.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_big.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_string_agg_big.test
 # description: STRING_AGG big
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
 
 statement ok
 CREATE TABLE strings AS SELECT c::VARCHAR g, (c*10+e)::VARCHAR x FROM range(0, 100, 1) t1(c), range(0, 100, 1) t2(e);
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_many_groups.test_slow b/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_many_groups.test_slow_ignore
similarity index 85%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_many_groups.test_slow
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_many_groups.test_slow_ignore
index 38ac86f..e6932f4 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_many_groups.test_slow
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_string_agg_many_groups.test_slow_ignore
@@ -1,6 +1,8 @@
 # name: test/sql/aggregate/aggregates/test_string_agg_many_groups.test_slow
 # description: Test STRING_AGG operator with many groups
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14542
 
 # generate a table
 
diff --git a/modules/calcite/src/test/sql/aggregate/aggregates/test_sum.test b/modules/calcite/src/test/sql/aggregate/aggregates/test_sum.test_ignore
similarity index 95%
rename from modules/calcite/src/test/sql/aggregate/aggregates/test_sum.test
rename to modules/calcite/src/test/sql/aggregate/aggregates/test_sum.test_ignore
index 80bf112..40d7ed4 100644
--- a/modules/calcite/src/test/sql/aggregate/aggregates/test_sum.test
+++ b/modules/calcite/src/test/sql/aggregate/aggregates/test_sum.test_ignore
@@ -1,6 +1,7 @@
 # name: test/sql/aggregate/aggregates/test_sum.test
 # description: Test sum aggregate
 # group: [aggregates]
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14542
 
 statement ok
 CREATE TABLE integers(i INTEGER);
diff --git a/modules/calcite/src/test/sql/aggregate/distinct/test_distinct_on.test_ignored b/modules/calcite/src/test/sql/aggregate/distinct/test_distinct_on.test_ignore
similarity index 100%
rename from modules/calcite/src/test/sql/aggregate/distinct/test_distinct_on.test_ignored
rename to modules/calcite/src/test/sql/aggregate/distinct/test_distinct_on.test_ignore
diff --git a/modules/calcite/src/test/sql/aggregate/having/test_corel_subquery_in_having.test_ignored b/modules/calcite/src/test/sql/aggregate/having/test_corel_subquery_in_having.test_ignore
similarity index 100%
rename from modules/calcite/src/test/sql/aggregate/having/test_corel_subquery_in_having.test_ignored
rename to modules/calcite/src/test/sql/aggregate/having/test_corel_subquery_in_having.test_ignore
diff --git a/modules/calcite/src/test/sql/aggregate/having/test_scalar_having.test_ignored b/modules/calcite/src/test/sql/aggregate/having/test_scalar_having.test_ignore
similarity index 100%
rename from modules/calcite/src/test/sql/aggregate/having/test_scalar_having.test_ignored
rename to modules/calcite/src/test/sql/aggregate/having/test_scalar_having.test_ignore