* address remaining comments from apache#15836

zachjsh · Feb 24, 2024 · acfa4ca · acfa4ca
1 parent b69f89d
commit acfa4ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java b/sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java
@@ -250,26 +250,19 @@ public static Granularity convertSqlNodeToGranularity(SqlNode sqlNode)
 
   private static Granularity convertSqlLiteralCharToGranularity(SqlLiteral literal)
   {
-    String value = literal.getValueAs(String.class);
-    try {
-      return Granularity.fromString(value);
-    }
-    catch (IllegalArgumentException e) {
-      try {
-        return new PeriodGranularity(new Period(value), null, null);
-      }
-      catch (Exception e2) {
-        throw makeInvalidPartitionByException(literal);
-      }
-    }
+    return convertStringToGranularity(literal.getValueAs(String.class), literal);
   }
 
   private static Granularity convertSqlIdentiferToGranularity(SqlIdentifier identifier)
   {
     if (identifier.names.isEmpty()) {
       throw makeInvalidPartitionByException(identifier);
     }
-    String value = identifier.names.get(0);
+    return convertStringToGranularity(identifier.names.get(0), identifier);
+  }
+
+  private static Granularity convertStringToGranularity(String value, SqlNode node)
+  {
     try {
       return Granularity.fromString(value);
     }
@@ -278,7 +271,7 @@ private static Granularity convertSqlIdentiferToGranularity(SqlIdentifier identi
         return new PeriodGranularity(new Period(value), null, null);
       }
       catch (Exception e2) {
-        throw makeInvalidPartitionByException(identifier);
+        throw makeInvalidPartitionByException(node);
       }
     }
   }

diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/parser/SqlGranularityLiteral.java b/sql/src/main/java/org/apache/druid/sql/calcite/parser/SqlGranularityLiteral.java
@@ -35,8 +35,8 @@
  */
 public class SqlGranularityLiteral extends SqlLiteral
 {
-  private String unparseString;
-  private Granularity granularity;
+  private final String unparseString;
+  private final Granularity granularity;
 
   public SqlGranularityLiteral(
       @Nonnull Granularity granularity,
@@ -70,8 +70,6 @@ public Granularity getGranularity()
   @Override
   public void unparse(SqlWriter writer, int leftPrec, int rightPrec)
   {
-    if (unparseString != null) {
-      writer.keyword(unparseString);
-    }
+    writer.keyword(unparseString);
   }
 }