snuyanzin commented on code in PR #24255:
URL: https://github.com/apache/flink/pull/24255#discussion_r1842560994
##########
flink-table/flink-sql-parser/src/main/codegen/templates/Parser.jj:
##########
@@ -4935,103 +5031,75 @@ SqlIntervalQualifier IntervalQualifierStart() :
}
}
-/**
- * Parses time unit for CEIL and FLOOR functions.
- */
-TimeUnit TimeUnit() :
-{
- final TimeUnit unit;
-}
-{
- LOOKAHEAD(1)
- (
- <MILLISECOND> { return TimeUnit.MILLISECOND; }
- | <SECOND> { return TimeUnit.SECOND; }
- | <MINUTE> { return TimeUnit.MINUTE; }
- | <HOUR> { return TimeUnit.HOUR; }
- | <DAY> { return TimeUnit.DAY; }
- | <DOW> { return TimeUnit.DOW; }
- | <DOY> { return TimeUnit.DOY; }
- | <ISODOW> { return TimeUnit.ISODOW; }
- | <ISOYEAR> { return TimeUnit.ISOYEAR; }
- | <WEEK> { return TimeUnit.WEEK; }
- | <MONTH> { return TimeUnit.MONTH; }
- | <QUARTER> { return TimeUnit.QUARTER; }
- | <YEAR> { return TimeUnit.YEAR; }
- | <EPOCH> { return TimeUnit.EPOCH; }
- | <DECADE> { return TimeUnit.DECADE; }
- | <CENTURY> { return TimeUnit.CENTURY; }
- | <MILLENNIUM> { return TimeUnit.MILLENNIUM; }
- )
-|
- unit = TimeUnitIdentifier() { return unit; }
-}
-
-/**
- * Parses time unit for the EXTRACT function.
- * As for FLOOR and CEIL, but also includes NANOSECOND and MICROSECOND.
+/** Parses a built-in time unit (e.g. "YEAR")
+ * or user-defined time frame (e.g. "MINUTE15")
+ * and in each case returns a {@link SqlIntervalQualifier}.
+ *
+ * <p>The units are used in several functions, incuding CEIL, FLOOR, EXTRACT.
+ * Includes NANOSECOND, MILLISECOND, which were previously allowed in EXTRACT
+ * but not CEIL, FLOOR.
+ *
+ * <p>Includes {@code WEEK} and {@code WEEK(SUNDAY)} through
+ {@code WEEK(SATURDAY)}.
+ *
+ * <p>Does not include SQL_TSI_DAY, SQL_TSI_FRAC_SECOND etc. These will be
+ * parsed as identifiers and can be resolved in the validator if they are
+ * registered as abbreviations in your time frame set.
*/
-TimeUnit TimeUnitForExtract() :
-{
+SqlIntervalQualifier TimeUnitOrName() : {
+ final Span span;
+ final String w;
final TimeUnit unit;
+ final SqlIdentifier unitName;
}
{
- LOOKAHEAD(1)
+ LOOKAHEAD(2)
+ <NANOSECOND> { return new SqlIntervalQualifier(TimeUnit.NANOSECOND, null,
getPos()); }
+| <MICROSECOND> { return new SqlIntervalQualifier(TimeUnit.MICROSECOND,
null, getPos()); }
+| <MILLISECOND> { return new SqlIntervalQualifier(TimeUnit.MILLISECOND,
null, getPos()); }
+| <SECOND> { return new SqlIntervalQualifier(TimeUnit.SECOND, null,
getPos()); }
+| <MINUTE> { return new SqlIntervalQualifier(TimeUnit.MINUTE, null,
getPos()); }
+| <HOUR> { return new SqlIntervalQualifier(TimeUnit.HOUR, null, getPos()); }
+| <DAY> { return new SqlIntervalQualifier(TimeUnit.DAY, null, getPos()); }
+| <DOW> { return new SqlIntervalQualifier(TimeUnit.DOW, null, getPos()); }
+| <DOY> { return new SqlIntervalQualifier(TimeUnit.DOY, null, getPos()); }
+| <ISODOW> { return new SqlIntervalQualifier(TimeUnit.ISODOW, null,
getPos()); }
+| <ISOYEAR> { return new SqlIntervalQualifier(TimeUnit.ISOYEAR, null,
getPos()); }
+| <WEEK> { span = span(); }
(
- <NANOSECOND> { return TimeUnit.NANOSECOND; }
- | <MICROSECOND> { return TimeUnit.MICROSECOND; }
+ LOOKAHEAD(2)
+ <LPAREN> w = weekdayName() <RPAREN> {
+ return new SqlIntervalQualifier(w, span.end(this));
+ }
+ |
+ { return new SqlIntervalQualifier(TimeUnit.WEEK, null, getPos()); }
)
-|
- unit = TimeUnit() { return unit; }
+| <MONTH> { return new SqlIntervalQualifier(TimeUnit.MONTH, null, getPos());
}
+| <QUARTER> { return new SqlIntervalQualifier(TimeUnit.QUARTER, null,
getPos()); }
+| <YEAR> { return new SqlIntervalQualifier(TimeUnit.YEAR, null, getPos()); }
+| <EPOCH> { return new SqlIntervalQualifier(TimeUnit.EPOCH, null, getPos());
}
+| <DECADE> { return new SqlIntervalQualifier(TimeUnit.DECADE, null,
getPos()); }
+| <CENTURY> { return new SqlIntervalQualifier(TimeUnit.CENTURY, null,
getPos()); }
+| <MILLENNIUM> { return new SqlIntervalQualifier(TimeUnit.MILLENNIUM, null,
getPos()); }
+| unitName = SimpleIdentifier() {
+ return new SqlIntervalQualifier(unitName.getSimple(),
+ unitName.getParserPosition());
+ }
}
-/**
- * Parses a simple identifier as a TimeUnit.
- */
-TimeUnit TimeUnitIdentifier() :
+String weekdayName() :
{
- final List<String> names = new ArrayList<String>();
- final List<SqlParserPos> positions = new ArrayList<SqlParserPos>();
}
{
- AddIdentifierSegment(names, positions) {
- TimeUnit unit = timeUnitCodes.get(names.get(0));
- if (unit != null) {
- return unit;
- }
- throw SqlUtil.newContextException(positions.get(0),
- RESOURCE.invalidDatetimeFormat(SqlIdentifier.getString(names)));
- }
+ <SUNDAY> { return "WEEK_SUNDAY"; }
Review Comment:
there is no full e2e support here yet
--
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]
