Skip to content

[Fix-18015] [DST ISSUE] Handle DST issue when calculating yyyyMMdd±N time placeholders #18026

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

Open
iampratap7997-dot wants to merge 7 commits into
base: dev
Choose a base branch
from
+33 −9
Open

[Fix-18015] [DST ISSUE] Handle DST issue when calculating yyyyMMdd±N time placeholders #18026

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99fc79a
Fix DST issue when calculating yyyyMMdd±N time placeholders
iampratap7997-dot Mar 6, 2026
dd94740
Merge remote-tracking branch 'upstream/dev' into fix-dst-time-placeho…
iampratap7997-dot Mar 8, 2026
85c7736
Improve DST handling using LocalDate and handle NumberFormatException…
iampratap7997-dot Mar 9, 2026
9f50798
Apply spotless formatting
iampratap7997-dot Mar 11, 2026
7de1051
Merge branch 'dev' into fix-dst-time-placeholder
SbloodyS Mar 16, 2026
edca860
Potential fix for pull request finding
iampratap7997-dot Mar 16, 2026
afa12f3
Merge branch 'dev' into fix-dst-time-placeholder
SbloodyS Mar 17, 2026
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
42 changes: 33 additions & 9 deletions ...rc/main/java/org/apache/dolphinscheduler/plugin/task/api/parser/TimePlaceholderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
package org.apache.dolphinscheduler.plugin.task.api.parser;

import static org.apache.commons.lang3.time.DateUtils.addWeeks;
import static org.apache.dolphinscheduler.common.utils.DateUtils.addDays;
import static org.apache.dolphinscheduler.common.utils.DateUtils.addMinutes;
import static org.apache.dolphinscheduler.common.utils.DateUtils.addMonths;
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.ADD_CHAR;
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.ADD_MONTHS;
Expand Down Expand Up @@ -55,6 +53,8 @@

import org.apache.commons.lang3.StringUtils;

import java.time.LocalDate;
import java.time.ZoneId;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Calendar;
Expand Down Expand Up @@ -528,7 +528,7 @@ public static Map.Entry<Date, String> calcCustomDay(String expression, String ke
break;
case THIS_DAY:
dataFormat = expression.substring(THIS_DAY.length() + 1, expression.length() - 1);
targetDate = addDays(date, 0);
targetDate = date;
break;
case LAST_DAY:
dataFormat = expression.substring(LAST_DAY.length() + 1, expression.length() - 1);
Expand Down Expand Up @@ -649,19 +649,43 @@ public static Map.Entry<Date, String> calcMinutes(String expression, Date date)
if (expression.contains("+")) {
int index = expression.lastIndexOf('+');

if (Character.isDigit(expression.charAt(index + 1))) {
String addMinuteExpr = expression.substring(index + 1);
Date targetDate = addMinutes(date, calcMinutes(addMinuteExpr));
if (index + 1 < expression.length() && Character.isDigit(expression.charAt(index + 1))) {
String addDayExpr = expression.substring(index + 1);
int days;
try {
days = Integer.parseInt(addDayExpr);
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Invalid minute expression: " + expression, e);
}
LocalDate localDate = date.toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate()
.plusDays(days);

Date targetDate = Date.from(
localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
String dateFormat = expression.substring(0, index);

return new AbstractMap.SimpleImmutableEntry<>(targetDate, dateFormat);
}
} else if (expression.contains("-")) {
int index = expression.lastIndexOf('-');

if (Character.isDigit(expression.charAt(index + 1))) {
String addMinuteExpr = expression.substring(index + 1);
Date targetDate = addMinutes(date, 0 - calcMinutes(addMinuteExpr));
if (index + 1 < expression.length() && Character.isDigit(expression.charAt(index + 1))) {
String addDayExpr = expression.substring(index + 1);
int days;
try {
days = Integer.parseInt(addDayExpr);
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Invalid minute expression: " + expression, e);
}
LocalDate localDate = date.toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate()
.minusDays(days);

Date targetDate = Date.from(
localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
String dateFormat = expression.substring(0, index);

return new AbstractMap.SimpleImmutableEntry<>(targetDate, dateFormat);
Expand Down
Loading