You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by "NobiGo (via GitHub)" <gi...@apache.org> on 2023/06/25 07:52:58 UTC
[GitHub] [calcite] NobiGo commented on a diff in pull request #3238: [CALCITE-5744] Add MAP_FROM_ARRAYS, STR_TO_MAP function (enabled in Spark library)
NobiGo commented on code in PR #3238:
URL: https://github.com/apache/calcite/pull/3238#discussion_r1241074645
##########
core/src/main/java/org/apache/calcite/runtime/CalciteResource.java:
##########
@@ -897,6 +897,9 @@ ExInst<CalciteException> illegalArgumentForTableFunctionCall(String a0,
@BaseMessage("Substring error: negative substring length not allowed")
ExInst<CalciteException> illegalNegativeSubstringLength();
+ @BaseMessage("Illegal arguments: The length of the keys array {0,number,#} is not equal to the length of the values array {1,number,#} in MAP_FROM_ARRAYS function")
Review Comment:
How about we change this message to 'The key array and value array of parameters must have the same length'?
##########
core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java:
##########
@@ -4003,6 +4004,33 @@ public static List mapValues(Map map) {
return new ArrayList<>(map.values());
}
+ /** Support the MAP_FROM_ARRAYS function. */
+ public static Map mapFromArrays(List keysArray, List valuesArray) {
+ if (keysArray.size() != valuesArray.size()) {
Review Comment:
the parameter keysArray and values Array has confirmed is Not NULL?
##########
testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java:
##########
@@ -5688,6 +5688,79 @@ private static void checkIf(SqlOperatorFixture f) {
"INTEGER ARRAY NOT NULL");
}
+ /** Tests {@code MAP_FROM_ARRAYS} function from Spark. */
+ @Test void testMapFromArraysFunc() {
+ final SqlOperatorFixture f0 = fixture();
+ f0.setFor(SqlLibraryOperators.MAP_FROM_ARRAYS);
+ f0.checkFails("^map_from_arrays(array[1, 2], array['foo', 'bar'])^",
+ "No match found for function signature MAP_FROM_ARRAYS\\(<INTEGER ARRAY>, "
+ + "<CHAR\\(3\\) ARRAY>\\)", false);
+
+ final SqlOperatorFixture f = f0.withLibrary(SqlLibrary.SPARK);
+ f.checkScalar("map_from_arrays(array[1, 2], array['foo', 'bar'])", "{1=foo, 2=bar}",
+ "(INTEGER NOT NULL, CHAR(3) NOT NULL) MAP NOT NULL");
+ f.checkScalar("map_from_arrays(array[1, 1, null], array['foo', 'bar', 'name'])",
+ "{1=bar, null=name}", "(INTEGER, CHAR(4) NOT NULL) MAP NOT NULL");
+ f.checkScalar("map_from_arrays(array(), array())",
+ "{}", "(UNKNOWN NOT NULL, UNKNOWN NOT NULL) MAP NOT NULL");
+ f.checkType("map_from_arrays(cast(null as integer array), array['foo', 'bar'])",
+ "(INTEGER NOT NULL, CHAR(3) NOT NULL) MAP");
+ f.checkNull("map_from_arrays(cast(null as integer array), array['foo', 'bar'])");
+
+ f.checkFails("^map_from_arrays(array[1, 2], 2)^",
+ "Cannot apply 'MAP_FROM_ARRAYS' to arguments of type 'MAP_FROM_ARRAYS\\(<INTEGER ARRAY>,"
+ + " <INTEGER>\\)'. Supported form\\(s\\): 'MAP_FROM_ARRAYS\\(<ARRAY>, <ARRAY>\\)'",
+ false);
+ f.checkFails("^map_from_arrays(2, array[1, 2])^",
+ "Cannot apply 'MAP_FROM_ARRAYS' to arguments of type 'MAP_FROM_ARRAYS\\(<INTEGER>,"
+ + " <INTEGER ARRAY>\\)'. Supported form\\(s\\): 'MAP_FROM_ARRAYS\\(<ARRAY>, <ARRAY>\\)'",
+ false);
+ f.checkFails("map_from_arrays(^array[1, '1', true]^, array['a', 'b', 'c'])",
+ "Parameters must be of the same type",
+ false);
+ f.checkFails("map_from_arrays(array['a', 'b', 'c'], ^array[1, '1', true]^)",
+ "Parameters must be of the same type",
+ false);
+ f.checkFails("map_from_arrays(array[1, 2], array['foo'])",
+ "Illegal arguments: The length of the keys array 2 is not equal to the length "
+ + "of the values array 1 in MAP_FROM_ARRAYS function",
+ true);
+ }
+
+ /** Tests {@code STR_TO_MAP} function from Spark. */
+ @Test void testStrToMapFunc() {
+ final SqlOperatorFixture f0 = fixture();
+ f0.setFor(SqlLibraryOperators.STR_TO_MAP);
+ f0.checkFails("^str_to_map('a=1,b=2', ',', '=')^",
+ "No match found for function signature STR_TO_MAP\\("
+ + "<CHARACTER>, <CHARACTER>, <CHARACTER>\\)", false);
+
+ final SqlOperatorFixture f = f0.withLibrary(SqlLibrary.SPARK);
+ f.checkScalar("str_to_map('a=1,b=2', ',', '=')", "{a=1, b=2}",
+ "(CHAR(7) NOT NULL, CHAR(7) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('a:1,b:2')", "{a=1, b=2}",
+ "(CHAR(7) NOT NULL, CHAR(7) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('a:1,b:2', ',')", "{a=1, b=2}",
+ "(CHAR(7) NOT NULL, CHAR(7) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('a=1&b=2', '&', '=')", "{a=1, b=2}",
+ "(CHAR(7) NOT NULL, CHAR(7) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('k#2%v#3', '%', '#')", "{k=2, v=3}",
+ "(CHAR(7) NOT NULL, CHAR(7) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('a:1&b:2', '&')", "{a=1, b=2}",
+ "(CHAR(7) NOT NULL, CHAR(7) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('k:2%v:3', '%')", "{k=2, v=3}",
+ "(CHAR(7) NOT NULL, CHAR(7) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('a')", "{a=null}",
+ "(CHAR(1) NOT NULL, CHAR(1) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('a,b,c')", "{a=null, b=null, c=null}",
+ "(CHAR(5) NOT NULL, CHAR(5) NOT NULL) MAP NOT NULL");
+ f.checkScalar("str_to_map('a-b--c', '--')", "{a-b=null, c=null}",
+ "(CHAR(6) NOT NULL, CHAR(6) NOT NULL) MAP NOT NULL");
+ f.checkType("str_to_map(cast(null as varchar))",
+ "(VARCHAR, VARCHAR) MAP");
+ f.checkNull("str_to_map(cast(null as varchar))");
Review Comment:
Add tests like(Any parameters is NULL, the result will be NULL):
`SELECT str_to_map(null, ',', ':');
SELECT str_to_map('a:1,b:2,c:3', null, ':');
SELECT str_to_map('a:1,b:2,c:3', ',',null);
`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org