[
https://issues.apache.org/jira/browse/DRILL-7926?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17381839#comment-17381839
]
ASF GitHub Bot commented on DRILL-7926:
---------------------------------------
oleg-zinovev commented on a change in pull request #2268:
URL: https://github.com/apache/drill/pull/2268#discussion_r671013477
##########
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java
##########
@@ -470,43 +500,73 @@ public void eval() {
@Param DateHolder left;
@Param DateHolder right;
@Output IntervalHolder out;
+ @Inject ContextInformation contextInfo;
@Override
public void setup() {
}
@Override
public void eval() {
- long diff = left.value - right.value;
- long days = diff /
org.apache.drill.exec.vector.DateUtilities.daysToStandardMillis;
- out.months = (int) (days /
org.apache.drill.exec.vector.DateUtilities.monthToStandardDays);
- out.days = (int) (days %
org.apache.drill.exec.vector.DateUtilities.monthToStandardDays);
- out.milliseconds = (int) (diff %
org.apache.drill.exec.vector.DateUtilities.daysToStandardMillis);
+ java.time.OffsetDateTime from =
java.time.Instant.ofEpochMilli(right.value).atOffset(java.time.ZoneOffset.UTC);
+ java.time.OffsetDateTime to =
java.time.Instant.ofEpochMilli(left.value).atOffset(java.time.ZoneOffset.UTC);
+ java.time.Duration duration =
java.time.Duration.between(from.toLocalTime(), to.toLocalTime());
+ java.time.Period period;
+
+ if (from.isAfter(to) &&
duration.compareTo(java.time.Duration.ZERO) > 0) {
+ // negative period and positive duration
+ period = java.time.Period.between(from.toLocalDate(),
to.toLocalDate().plusDays(1));
+ duration = duration.minusDays(1);
+ } else if (from.isBefore(to) &&
duration.compareTo(java.time.Duration.ZERO) < 0) {
+ // positive period and negative duration
+ period = java.time.Period.between(from.toLocalDate(),
to.toLocalDate().minusDays(1));
+ duration = duration.plusDays(1);
+ } else {
+ period = java.time.Period.between(from.toLocalDate(),
to.toLocalDate());
+ }
+
+ out.months = (int) period.toTotalMonths();
+ out.days = period.getDays();
+ out.milliseconds = (int) duration.toMillis();
}
}
@FunctionTemplate(name = "age", scope =
FunctionTemplate.FunctionScope.SIMPLE, nulls = NullHandling.NULL_IF_NULL)
public static class AgeDate2Function implements DrillSimpleFunc {
@Param DateHolder right;
- @Workspace long queryStartDate;
+ @Workspace java.time.OffsetDateTime queryStartDate;
@Output IntervalHolder out;
@Inject ContextInformation contextInfo;
@Override
public void setup() {
int timeZoneIndex = contextInfo.getRootFragmentTimeZone();
- org.joda.time.DateTimeZone timeZone =
org.joda.time.DateTimeZone.forID(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
- org.joda.time.DateTime now = new
org.joda.time.DateTime(contextInfo.getQueryStartTime(), timeZone);
- queryStartDate = (new org.joda.time.DateMidnight(now.getYear(),
now.getMonthOfYear(), now.getDayOfMonth(), timeZone)).getMillis();
+ java.time.ZoneId zoneId =
java.time.ZoneId.of(org.apache.drill.exec.expr.fn.impl.DateUtility.getTimeZone(timeZoneIndex));
+ java.time.ZonedDateTime dt =
java.time.Instant.ofEpochMilli(contextInfo.getQueryStartTime()).atZone(zoneId);
+ queryStartDate = java.time.OffsetDateTime.of(dt.toLocalDate(),
java.time.LocalTime.MIDNIGHT, java.time.ZoneOffset.UTC);
}
@Override
public void eval() {
- long diff = queryStartDate - right.value;
- long days = diff /
org.apache.drill.exec.vector.DateUtilities.daysToStandardMillis;
- out.months = (int) (days /
org.apache.drill.exec.vector.DateUtilities.monthToStandardDays);
- out.days = (int) (days %
org.apache.drill.exec.vector.DateUtilities.monthToStandardDays);
- out.milliseconds = (int) (diff %
org.apache.drill.exec.vector.DateUtilities.daysToStandardMillis);
+ java.time.OffsetDateTime dt =
java.time.Instant.ofEpochMilli(right.value).atOffset(java.time.ZoneOffset.UTC);
Review comment:
@paul-rogers
Moreover, the DateUtility.parseBest implementation simply discards the time
offset information.
OffsetDateTime.of(datePart, timePart, zoneOffset).toLocalDateTime()
equivalent to
LocalDateTime.of(datePart, timePart)
--
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]
> The " age " function is not working properly.
> ---------------------------------------------
>
> Key: DRILL-7926
> URL: https://issues.apache.org/jira/browse/DRILL-7926
> Project: Apache Drill
> Issue Type: Bug
> Components: Functions - Drill
> Affects Versions: 1.17.0, 1.18.0
> Reporter: Александр Глухов
> Priority: Blocker
> Attachments: image-2021-05-13-16-17-21-154.png, screenshot-1.png,
> screenshot-2.png
>
>
> The " age " function is not working properly.
> *Playback steps*
> {code:sql}
> select extract(year from m. "years") `years` from (select age('2021-05-13',
> '2007-07-02') `years") m{code}
> *Expected result* 13.
> *Actual result* 14.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
