database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Implement adddate, days_add and from_unixtime function in FE (#1149)

Browse Source
This commit is contained in:
kangkaisen
2019-05-13 16:59:52 +08:00
committed by ZHAO Chun
parent e7e92f0a89
commit ffe3eaa1a7
2 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fe/src/main/java/org/apache/doris/rewrite/FEFunctions.java
View File

@ -67,6 +67,16 @@ public class FEFunctions {
return new DateLiteral(DateFormatUtils.format(d, "yyyy-MM-dd HH:mm:ss"), Type.DATETIME);
}
@FEFunction(name = "adddate", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME")
public static DateLiteral addDate(LiteralExpr date, LiteralExpr day) throws AnalysisException {
return dateAdd(date, day);
}
@FEFunction(name = "days_add", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME")
public static DateLiteral daysAdd(LiteralExpr date, LiteralExpr day) throws AnalysisException {
return dateAdd(date, day);
}
@FEFunction(name = "date_format", argTypes = { "DATETIME", "VARCHAR" }, returnType = "VARCHAR")
public static StringLiteral dateFormat(LiteralExpr date, StringLiteral fmtLiteral) throws AnalysisException {
String result = dateFormat(new Date(getTime(date)), fmtLiteral.getStringValue());
@ -239,6 +249,27 @@ public class FEFunctions {
return new IntLiteral(timestamp / 1000, Type.INT);
}
@FEFunction(name = "from_unixtime", argTypes = { "INT" }, returnType = "VARCHAR")
public static StringLiteral fromUnixTime(LiteralExpr unixTime) throws AnalysisException {
//if unixTime < 0, we should return null, throw a exception and let BE process
if (unixTime.getLongValue() < 0) {
throw new AnalysisException("unixtime should larger than zero");
}
Date date = new Date(unixTime.getLongValue() * 1000);
return new StringLiteral(dateFormat(date, "%Y-%m-%d %H:%i:%S"));
}
@FEFunction(name = "from_unixtime", argTypes = { "INT", "VARCHAR" }, returnType = "VARCHAR")
public static StringLiteral fromUnixTime(LiteralExpr unixTime, StringLiteral fmtLiteral) throws AnalysisException {
//if unixTime < 0, we should return null, throw a exception and let BE process
if (unixTime.getLongValue() < 0) {
throw new AnalysisException("unixtime should larger than zero");
}
Date date = new Date(unixTime.getLongValue() * 1000);
//currently, doris BE only support "yyyy-MM-dd HH:mm:ss" and "yyyy-MM-dd" format
return new StringLiteral(DateFormatUtils.format(date, fmtLiteral.getStringValue()));
}
private static long getTime(LiteralExpr expr) throws AnalysisException {
try {
String[] parsePatterns = { "yyyyMMdd", "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss" };

38
fe/src/test/java/org/apache/doris/rewrite/FEFunctionsTest.java
View File

@ -24,7 +24,9 @@ import org.apache.doris.catalog.Type;
import org.apache.doris.common.AnalysisException;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import java.util.TimeZone;
@ -37,6 +39,9 @@ import static org.junit.Assert.fail;
public class FEFunctionsTest {
@Rule
public ExpectedException expectedEx = ExpectedException.none();
@Test
public void unixtimestampTest() {
try {
@ -47,6 +52,39 @@ public class FEFunctionsTest {
}
}
@Test
public void dateAddTest() throws AnalysisException {
DateLiteral actualResult = FEFunctions.dateAdd(new StringLiteral("2018-08-08"), new IntLiteral(1));
DateLiteral expectedResult = new DateLiteral("2018-08-09", Type.DATE);
Assert.assertEquals(expectedResult, actualResult);
actualResult = FEFunctions.dateAdd(new StringLiteral("2018-08-08"), new IntLiteral(-1));
expectedResult = new DateLiteral("2018-08-07", Type.DATE);
Assert.assertEquals(expectedResult, actualResult);
}
@Test
public void fromUnixTimeTest() throws AnalysisException {
StringLiteral actualResult = FEFunctions.fromUnixTime(new IntLiteral(100000));
StringLiteral expectedResult = new StringLiteral("1970-01-02 11:46:40");
Assert.assertEquals(expectedResult, actualResult);
actualResult = FEFunctions.fromUnixTime(new IntLiteral(100000), new StringLiteral("yyyy-MM-dd"));
expectedResult = new StringLiteral("1970-01-02");
Assert.assertEquals(expectedResult, actualResult);
actualResult = FEFunctions.fromUnixTime(new IntLiteral(0));
expectedResult = new StringLiteral("1970-01-01 08:00:00");
Assert.assertEquals(expectedResult, actualResult);
}
@Test
public void fromUnixTimeTestException() throws AnalysisException {
expectedEx.expect(AnalysisException.class);
expectedEx.expectMessage("unixtime should larger than zero");
FEFunctions.fromUnixTime(new IntLiteral(-100));
}
@Test
public void dateFormatUtilTest() {
try {