Revert "Use angle brackets"

apache · Aug 27, 2023 · 79bc783 · 79bc783
1 parent 89e858f
commit 79bc783
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj
@@ -5973,11 +5973,11 @@ SqlTypeNameSpec MapTypeName() :
 }
 {
     <MAP>
-    <LPAREN>
+    <LT>
     keyType = DataType()
     <COMMA>
     valType = DataType()
-    <RPAREN>
+    <GT>
     {
         return new SqlMapTypeNameSpec(keyType, valType, getPos());
     }

diff --git a/core/src/main/java/org/apache/calcite/sql/SqlMapTypeNameSpec.java b/core/src/main/java/org/apache/calcite/sql/SqlMapTypeNameSpec.java
@@ -62,7 +62,7 @@ public SqlDataTypeSpec getValType() {
 
   @Override public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
     writer.keyword("MAP");
-    SqlWriter.Frame frame = writer.startList(SqlWriter.FrameTypeEnum.FUN_CALL, "(", ")");
+    SqlWriter.Frame frame = writer.startList(SqlWriter.FrameTypeEnum.FUN_CALL, "<", ">");
     writer.sep(","); // configures the writer
     keyType.unparse(writer, leftPrec, rightPrec);
     // Default is not null.

diff --git a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
@@ -7133,14 +7133,14 @@ void testGroupExpressionEquivalenceParams() {
    * Support nested map type for SqlDataTypeSpec</a>.
    */
   @Test void testCastMapType() {
-    sql("select cast(\"int2IntMapType\" as map(int,int)) from COMPLEXTYPES.CTC_T1")
+    sql("select cast(\"int2IntMapType\" as map<int,int>) from COMPLEXTYPES.CTC_T1")
         .withExtendedCatalog()
         .columnType("(INTEGER NOT NULL, INTEGER NOT NULL) MAP NOT NULL");
-    sql("select cast(\"int2varcharArrayMapType\" as map(int,varchar array)) "
+    sql("select cast(\"int2varcharArrayMapType\" as map<int,varchar array>) "
         + "from COMPLEXTYPES.CTC_T1")
         .withExtendedCatalog()
         .columnType("(INTEGER NOT NULL, VARCHAR NOT NULL ARRAY NOT NULL) MAP NOT NULL");
-    sql("select cast(\"varcharMultiset2IntIntMapType\" as map(varchar(5) multiset, map(int, int)))"
+    sql("select cast(\"varcharMultiset2IntIntMapType\" as map<varchar(5) multiset, map<int, int>>)"
         + " from COMPLEXTYPES.CTC_T1")
         .withExtendedCatalog()
         .columnType("(VARCHAR(5) NOT NULL MULTISET NOT NULL, "

diff --git a/core/src/test/resources/sql/misc.iq b/core/src/test/resources/sql/misc.iq
@@ -2545,9 +2545,9 @@ select decimal'12.3' + 5.6;
 
 # [CALCITE-5570] Support nested map type for SqlDataTypeSpec
 SELECT
-  cast(x as map(int, int)),
-  cast(y as map(int, varchar array)),
-  cast(z as map(varchar  multiset, map(int, int)))
+  cast(x as map<int, int>),
+  cast(y as map<int, varchar array>),
+  cast(z as map<varchar  multiset, map<int, int>>)
 FROM (
   SELECT
     map[1, 2, 3, 4] as x,

diff --git a/testkit/src/main/java/org/apache/calcite/sql/parser/SqlParserTest.java b/testkit/src/main/java/org/apache/calcite/sql/parser/SqlParserTest.java
@@ -6085,12 +6085,12 @@ private static Matcher<SqlNode> isCharLiteral(String s) {
    * Support nested map type for SqlDataTypeSpec</a>.
    */
   @Test void testCastAsMapType() {
-    expr("cast(a as map(int, int))")
-        .ok("CAST(`A` AS MAP(INTEGER, INTEGER))");
-    expr("cast(a as map(int, varchar array))")
-        .ok("CAST(`A` AS MAP(INTEGER, VARCHAR ARRAY))");
-    expr("cast(a as map(varchar multiset, map(int, int)))")
-        .ok("CAST(`A` AS MAP(VARCHAR MULTISET, MAP(INTEGER, INTEGER)))");
+    expr("cast(a as map<int, int>)")
+        .ok("CAST(`A` AS MAP< INTEGER, INTEGER >)");
+    expr("cast(a as map<int, varchar array>)")
+        .ok("CAST(`A` AS MAP< INTEGER, VARCHAR ARRAY >)");
+    expr("cast(a as map<varchar multiset, map<int, int>>)")
+        .ok("CAST(`A` AS MAP< VARCHAR MULTISET, MAP< INTEGER, INTEGER > >)");
   }
 
   @Test void testMapValueConstructor() {