kgyrtkirk commented on code in PR #15836: URL: https://github.com/apache/druid/pull/15836#discussion_r1484412658
########## sql/src/main/java/org/apache/druid/sql/calcite/parser/SqlGranularityLiteral.java: ########## @@ -0,0 +1,77 @@ +/* + * 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. + */ + +package org.apache.druid.sql.calcite.parser; + +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.util.NlsString; +import org.apache.druid.error.DruidException; +import org.apache.druid.java.util.common.granularity.Granularity; + +import javax.annotation.Nonnull; + +/** + * Extends the {@link SqlIdentifier} to hold parameters for the PARTITIONED BY clause. + */ +public class SqlGranularityLiteral extends SqlLiteral +{ + private String unparseString; + private Granularity granularity; + + public SqlGranularityLiteral( + @Nonnull Granularity granularity, + @Nonnull String unparseString, + SqlParserPos pos) + { + super(new NlsString(unparseString, null, null), SqlTypeName.CHAR, pos); + this.granularity = granularity; + this.unparseString = unparseString; + } + + @Override + public SqlGranularityLiteral clone(SqlParserPos pos) + { + return new SqlGranularityLiteral(granularity, unparseString, pos); + } + + @Override + @Deprecated + public Object clone() + { + throw DruidException.defensive("Function is deprecated, please use clone(SqlNode) instead."); + } + + @Nonnull + public Granularity getGranularity() + { + return granularity; + } + + @Override + public void unparse(SqlWriter writer, int leftPrec, int rightPrec) + { + if (unparseString != null) { Review Comment: note: not sure if you need to be defensive here; its `@NonNull` in the constructor ########## sql/src/main/java/org/apache/druid/sql/calcite/parser/SqlGranularityLiteral.java: ########## @@ -0,0 +1,77 @@ +/* + * 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. + */ + +package org.apache.druid.sql.calcite.parser; + +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlLiteral; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.util.NlsString; +import org.apache.druid.error.DruidException; +import org.apache.druid.java.util.common.granularity.Granularity; + +import javax.annotation.Nonnull; + +/** + * Extends the {@link SqlIdentifier} to hold parameters for the PARTITIONED BY clause. + */ +public class SqlGranularityLiteral extends SqlLiteral +{ + private String unparseString; + private Granularity granularity; Review Comment: note: these can be final ########## sql/src/main/java/org/apache/druid/sql/calcite/parser/DruidSqlParserUtils.java: ########## @@ -200,17 +248,51 @@ public static Granularity convertSqlNodeToGranularity(SqlNode sqlNode) throws Pa throw makeInvalidPartitionByException(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); + } + } + } + + private static Granularity convertSqlIdentiferToGranularity(SqlIdentifier identifier) Review Comment: these 2 methods are almost identical; the difference is how they get to the `String` ; can you leave just one with a `String` arg - and do the X2String conversion before calling that method? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
