This is an automated email from the ASF dual-hosted git repository.
dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 841a92e [ASTERIXDB-2483][FUN] Fix ClassCastException during type check
841a92e is described below
commit 841a92e08702b95cd8a8291f668d9e8f3416fd3a
Author: Dmitry Lychagin <[email protected]>
AuthorDate: Wed Apr 17 17:38:48 2019 -0700
[ASTERIXDB-2483][FUN] Fix ClassCastException during type check
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Fix ClassCastException in scan-collection()'s type computer
Change-Id: I17c4469b8ccbcea9e97f4e7ca8dd96061253d3c3
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3349
Contrib: Jenkins <[email protected]>
Sonar-Qube: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Ali Alsuliman <[email protected]>
---
.../query-ASTERIXDB-2550.1.ddl.sqlpp | 34 ++++++++++++++++++++++
.../query-ASTERIXDB-2550.2.update.sqlpp | 26 +++++++++++++++++
.../query-ASTERIXSB-2550.3.query.sqlpp | 28 ++++++++++++++++++
.../test/resources/runtimets/testsuite_sqlpp.xml | 6 ++++
.../impl/CollectionMemberResultType.java | 4 +--
5 files changed, 96 insertions(+), 2 deletions(-)
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXDB-2550.1.ddl.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXDB-2550.1.ddl.sqlpp
new file mode 100644
index 0000000..2789f28
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXDB-2550.1.ddl.sqlpp
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+/*
+ * Description: This test case is to verify the fix for ASTERIXDB-2550
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+
+use test;
+
+create type test.TestType as
+{
+ id : integer
+};
+
+create dataset t1(TestType) primary key id;
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXDB-2550.2.update.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXDB-2550.2.update.sqlpp
new file mode 100644
index 0000000..ca80eee
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXDB-2550.2.update.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+insert into t1
+([
+ {"id":1, "a":10 },
+ {"id":2, "a":null }
+]);
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXSB-2550.3.query.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXSB-2550.3.query.sqlpp
new file mode 100644
index 0000000..9077741
--- /dev/null
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-2550/query-ASTERIXSB-2550.3.query.sqlpp
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+/*
+ * Description: This test case is to verify the fix for ASTERIXDB-2550
+ */
+
+use test;
+
+SELECT * FROM (
+ SELECT a FROM t1
+)[0] i
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index edfa544..5bb25f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -5723,6 +5723,12 @@
</compilation-unit>
</test-case>
<test-case FilePath="misc">
+ <compilation-unit name="query-ASTERIXDB-2550">
+ <output-dir compare="Text">none</output-dir>
+ <expected-error>ASX0037: Type mismatch: expected value of type array
or multiset, but got the value of type object (in line 28, at column
2)</expected-error>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="misc">
<compilation-unit name="unsupported_parameter">
<output-dir compare="Text">none</output-dir>
<expected-error>Query parameter compiler.joinmem is not
supported</expected-error>
diff --git
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
index 1d20775..9ad6af2 100644
---
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
+++
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/CollectionMemberResultType.java
@@ -50,7 +50,7 @@ public class CollectionMemberResultType extends
AbstractResultTypeComputer {
protected void checkArgType(FunctionIdentifier funcId, int argIndex,
IAType type, SourceLocation sourceLoc)
throws AlgebricksException {
ATypeTag actualTypeTag = type.getTypeTag();
- if (type.getTypeTag() != ATypeTag.MULTISET && type.getTypeTag() !=
ATypeTag.ARRAY) {
+ if (!type.getTypeTag().isListType()) {
throw new TypeMismatchException(sourceLoc, actualTypeTag,
ATypeTag.MULTISET, ATypeTag.ARRAY);
}
}
@@ -58,7 +58,7 @@ public class CollectionMemberResultType extends
AbstractResultTypeComputer {
@Override
protected IAType getResultType(ILogicalExpression expr, IAType...
strippedInputTypes) throws AlgebricksException {
IAType type = strippedInputTypes[0];
- if (type.getTypeTag() == ATypeTag.ANY) {
+ if (!type.getTypeTag().isListType()) {
return BuiltinType.ANY;
}
IAType itemType = ((AbstractCollectionType) type).getItemType();
