From e576412a56c2d210a7adfd33b94397a42ba395e4 Mon Sep 17 00:00:00 2001 From: GoGoWen <82132356+GoGoWen@users.noreply.github.com> Date: Sat, 27 Jan 2024 08:47:36 +0800 Subject: [PATCH] fix iceberg table get split fail when with date type conjuct (#30162) --- .../main/java/org/apache/doris/analysis/DateLiteral.java | 4 ++++ .../apache/doris/external/iceberg/util/IcebergUtils.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java index 8b0921f9b1..2f7f183b1a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java @@ -639,6 +639,10 @@ public class DateLiteral extends LiteralExpr { } } + public boolean isDateType() { + return this.type.isDate() || this.type.isDateV2(); + } + @Override public String getStringValue() { char[] dateTimeChars = new char[26]; // Enough to hold "YYYY-MM-DD HH:MM:SS.mmmmmm" diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java index 4c3ad20a3e..78a0df2ee6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/iceberg/util/IcebergUtils.java @@ -206,7 +206,11 @@ public class IcebergUtils { return boolLiteral.getValue(); } else if (expr instanceof DateLiteral) { DateLiteral dateLiteral = (DateLiteral) expr; - return dateLiteral.unixTimestamp(TimeUtils.getTimeZone()) * MILLIS_TO_NANO_TIME; + if (dateLiteral.isDateType()) { + return dateLiteral.getStringValue(); + } else { + return dateLiteral.unixTimestamp(TimeUtils.getTimeZone()) * MILLIS_TO_NANO_TIME; + } } else if (expr instanceof DecimalLiteral) { DecimalLiteral decimalLiteral = (DecimalLiteral) expr; return decimalLiteral.getValue();