From c78341b728bcdffc1f278cb5c00a4ad9b4fdac96 Mon Sep 17 00:00:00 2001 From: gnehil Date: Mon, 24 Jul 2023 09:07:53 +0800 Subject: [PATCH] [improvement](spark-load) support datev2 and datetimev2 #21839 --- .../java/org/apache/doris/load/loadv2/dpp/ColumnParser.java | 6 ++++-- .../java/org/apache/doris/load/loadv2/dpp/DppUtils.java | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java index 54619b0b0e..84ef9ba882 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/ColumnParser.java @@ -59,9 +59,11 @@ public abstract class ColumnParser implements Serializable { return new DoubleParser(); } else if (columnType.equalsIgnoreCase("BOOLEAN")) { return new BooleanParser(); - } else if (columnType.equalsIgnoreCase("DATE")) { + } else if (columnType.equalsIgnoreCase("DATE") + || columnType.equalsIgnoreCase("DATEV2")) { return new DateParser(); - } else if (columnType.equalsIgnoreCase("DATETIME")) { + } else if (columnType.equalsIgnoreCase("DATETIME") + || columnType.equalsIgnoreCase("DATETIMEV2")) { return new DatetimeParser(); } else if (columnType.equalsIgnoreCase("STRING") || columnType.equalsIgnoreCase("TEXT")) { diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java index ff5fb4a522..0c6b6454e7 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/DppUtils.java @@ -82,6 +82,7 @@ public class DppUtils { case "INT": return Integer.class; case "DATETIME": + case "DATETIMEV2": return java.sql.Timestamp.class; case "BIGINT": return Long.class; @@ -92,6 +93,7 @@ public class DppUtils { case "DOUBLE": return Double.class; case "DATE": + case "DATEV2": return Date.class; case "HLL": case "CHAR": @@ -127,6 +129,7 @@ public class DppUtils { dataType = DataTypes.IntegerType; break; case "DATETIME": + case "DATETIMEV2": dataType = DataTypes.TimestampType; break; case "BIGINT": @@ -142,6 +145,7 @@ public class DppUtils { dataType = DataTypes.DoubleType; break; case "DATE": + case "DATEV2": dataType = DataTypes.DateType; break; case "CHAR":