>From Ian Maxon <ima...@apache.org>: Ian Maxon has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20370?usp=email )
Change subject: [NO ISSUE] Split countn_01 into multiple queries ...................................................................... [NO ISSUE] Split countn_01 into multiple queries Split this test into single statements to avoid triggering ASTERIXDB-3645 Ext-ref: MB-68457 Change-Id: I5b855538fff6530ae3ae6ca45e238d6c801dae93 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20370 Reviewed-by: Ian Maxon <ima...@apache.org> Reviewed-by: Ali Alsuliman <ali.al.solai...@gmail.com> Integration-Tests: Ian Maxon <ima...@apache.org> Tested-by: Ian Maxon <ima...@apache.org> --- M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.3.query.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.5.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.6.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.7.query.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.3.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.4.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.5.adm 8 files changed, 63 insertions(+), 23 deletions(-) Approvals: Ali Alsuliman: Looks good to me, approved Ian Maxon: Looks good to me, but someone else must approve; Verified; Verified Objections: Anon. E. Moose #1000171: Violations found diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.3.query.sqlpp index 31e7b07..c7a0815 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.3.query.sqlpp @@ -22,20 +22,4 @@ select element test.strict_countn(( select element x from [1,2,3,"four"] as x -)); - -select element test.countn(x) from [ -{"x":1},{"x":2},{"x":3},{"x":"four"},{"x":null},{"x":[1,2,3]},{"x":"1"},{"x":{"k":1}} -] as list; - -select n, test.countn(x) from [ - {"x":1,"n":"a"}, - {"x":2,"n":"a"}, - {"x":3,"n":"b"}, - {"x":"four","n":"a"}, - {"x":null,"n":"b"}, - {"x":[1,2,3],"n":"a"}, - {"x":"1","n":"b"}, - {"x":{"k":1},"n":"b"}, - {"n":"b"} -] as list group by n; +)); \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.5.query.sqlpp index a43a13f..efb9cb0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.5.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.5.query.sqlpp @@ -29,4 +29,4 @@ {"x":"1","n":"b"}, {"x":{"k":1},"n":"b"}, {"n":"b"} -] as list group by n; +] as list group by n; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.6.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.6.query.sqlpp new file mode 100644 index 0000000..5cf603e --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.6.query.sqlpp @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select element test.countn(x) from [ +{"x":1},{"x":2},{"x":3},{"x":"four"},{"x":null},{"x":[1,2,3]},{"x":"1"},{"x":{"k":1}} +] as list; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.7.query.sqlpp new file mode 100644 index 0000000..a43a13f --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/countn_01/countn_01.7.query.sqlpp @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +select n, test.countn(x) from [ + {"x":1,"n":"a"}, + {"x":2,"n":"a"}, + {"x":3,"n":"b"}, + {"x":"four","n":"a"}, + {"x":null,"n":"b"}, + {"x":[1,2,3],"n":"a"}, + {"x":"1","n":"b"}, + {"x":{"k":1},"n":"b"}, + {"n":"b"} +] as list group by n; diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.1.adm index 1d6b377..e440e5c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.1.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.1.adm @@ -1,4 +1 @@ -3 -3 -{ "$1": 2, "n": "a" } -{ "$1": 1, "n": "b" } \ No newline at end of file +3 \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.3.adm index 8b63208..f67ffc7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.3.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.3.adm @@ -1,2 +1,2 @@ { "$1": 2, "n": "a" } -{ "$1": 1, "n": "b" } \ No newline at end of file +{ "$1": 1, "n": "b" } diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.4.adm new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.4.adm @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.5.adm new file mode 100644 index 0000000..8b63208 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/countn_01/countn_01.5.adm @@ -0,0 +1,2 @@ +{ "$1": 2, "n": "a" } +{ "$1": 1, "n": "b" } \ No newline at end of file -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20370?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: phoenix Gerrit-Change-Id: I5b855538fff6530ae3ae6ca45e238d6c801dae93 Gerrit-Change-Number: 20370 Gerrit-PatchSet: 4 Gerrit-Owner: Ian Maxon <ima...@apache.org> Gerrit-Reviewer: Ali Alsuliman <ali.al.solai...@gmail.com> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <ima...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org> Gerrit-Reviewer: Peeyush Gupta <peeyush.gu...@couchbase.com> Gerrit-Reviewer: shahrzadshirazi <shahrzad.shir...@couchbase.com>
