Skip to content

[To dev/1.1] Fix the bug in parse date to int when year out of range #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 1 commit into from
May 27, 2025
Merged

[To dev/1.1] Fix the bug in parse date to int when year out of range #500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java/tsfile/src/main/java/org/apache/tsfile/utils/DateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static Integer parseDateExpressionToInt(String dateExpression) {
throw new DateTimeParseException(
"Invalid date format. Please use YYYY-MM-DD format.", dateExpression, 0);
}
if (date.getYear() < 1000) {
if (date.getYear() < 1000 || date.getYear() > 9999) {
throw new DateTimeParseException("Year must be between 1000 and 9999.", dateExpression, 0);
}
return date.getYear() * 10000 + date.getMonthValue() * 100 + date.getDayOfMonth();
Expand All @@ -58,7 +58,7 @@ public static Integer parseDateExpressionToInt(LocalDate localDate) {
if (localDate == null) {
throw new DateTimeParseException("Date expression is null or empty.", "", 0);
}
if (localDate.getYear() < 1000) {
if (localDate.getYear() < 1000 || localDate.getYear() > 9999) {
throw new DateTimeParseException(
"Year must be between 1000 and 9999.",
localDate.format(DateTimeFormatter.ISO_LOCAL_DATE),
Expand Down