Skip to content

Commit 0c2e344

Browse files
HangyuanLiumorningman
authored andcommitted
Refactor DateLiteral class in FE (#1644)
1. Add FE time zone function support 2. Refactor DateLiteral class in FE ISSUE #1583
1 parent 7e981b2 commit 0c2e344

12 files changed

Lines changed: 507 additions & 505 deletions

File tree

‎fe/src/main/java/org/apache/doris/analysis/DateLiteral.java‎

Lines changed: 406 additions & 44 deletions
Large diffs are not rendered by default.

‎fe/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -558,23 +558,7 @@ public void analyzeImpl(Analyzer analyzer) throws AnalysisException {
558558
LOG.warn("fn {} not exists", fnName.getFunction());
559559
throw new AnalysisException(getFunctionNotFoundError(collectChildReturnTypes()));
560560
}
561-
562-
if (fnName.getFunction().equals("from_unixtime")) {
563-
// if has only one child, it has default time format: yyyy-MM-dd HH:mm:ss.SSSSSS
564-
if (children.size() > 1) {
565-
final StringLiteral formatExpr = (StringLiteral) children.get(1);
566-
final String dateFormat1 = "yyyy-MM-dd HH:mm:ss";
567-
final String dateFormat2 = "yyyy-MM-dd";
568-
if (!formatExpr.getStringValue().equals(dateFormat1)
569-
&& !formatExpr.getStringValue().equals(dateFormat2)) {
570-
throw new AnalysisException(new StringBuilder("format does't support, try ")
571-
.append("'").append(dateFormat1).append("'")
572-
.append(" or ")
573-
.append("'").append(dateFormat2).append("'.").toString());
574-
}
575-
}
576-
}
577-
561+
578562
if (fn.getFunctionName().getFunction().equals("time_diff")) {
579563
fn.getReturnType().getPrimitiveType().setTimeType();
580564
return;

‎fe/src/main/java/org/apache/doris/common/FeConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ public class FeConstants {
3535

3636
// general model
3737
// Current meta data version. Use this version to write journals and image
38-
public static int meta_version = FeMetaVersion.VERSION_59;
38+
public static int meta_version = FeMetaVersion.VERSION_60;
3939
}

‎fe/src/main/java/org/apache/doris/common/FeMetaVersion.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,6 @@ public final class FeMetaVersion {
128128
public static final int VERSION_58 = 58;
129129
// support strict mode in routine load and stream load
130130
public static final int VERSION_59 = 59;
131+
// refactor date literal
132+
public static final int VERSION_60 = 60;
131133
}

‎fe/src/main/java/org/apache/doris/common/util/TimeUtils.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.apache.doris.common.DdlException;
2828
import org.apache.doris.common.ErrorCode;
2929
import org.apache.doris.common.ErrorReport;
30+
import org.apache.doris.qe.ConnectContext;
31+
import org.apache.doris.qe.VariableMgr;
3032
import org.apache.logging.log4j.LogManager;
3133
import org.apache.logging.log4j.Logger;
3234

@@ -116,6 +118,16 @@ public static synchronized String getCurrentFormatTime() {
116118
return DATETIME_FORMAT.format(new Date());
117119
}
118120

121+
public static TimeZone getTimeZone() {
122+
String timezone;
123+
if (ConnectContext.get() != null) {
124+
timezone = ConnectContext.get().getSessionVariable().getTimeZone();
125+
} else {
126+
timezone = VariableMgr.getGlobalSessionVariable().getTimeZone();
127+
}
128+
return TimeZone.getTimeZone(ZoneId.of(timezone, timeZoneAliasMap));
129+
}
130+
119131
public static String longToTimeString(long timeStamp, SimpleDateFormat dateFormat) {
120132
if (timeStamp <= 0L) {
121133
return "N/A";
@@ -124,7 +136,10 @@ public static String longToTimeString(long timeStamp, SimpleDateFormat dateForma
124136
}
125137

126138
public static synchronized String longToTimeString(long timeStamp) {
127-
return longToTimeString(timeStamp, DATETIME_FORMAT);
139+
TimeZone timeZone = getTimeZone();
140+
SimpleDateFormat dateFormatTimeZone = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
141+
dateFormatTimeZone.setTimeZone(timeZone);
142+
return longToTimeString(timeStamp, dateFormatTimeZone);
128143
}
129144

130145
public static synchronized Date getTimeAsDate(String timeString) {

‎fe/src/main/java/org/apache/doris/qe/ConnectProcessor.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ public TMasterOpResult proxyExecute(TMasterOpRequest request) {
336336
if (request.isSetUser_ip()) {
337337
ctx.setRemoteIP(request.getUser_ip());
338338
}
339+
if (request.isSetTime_zone()) {
340+
ctx.getSessionVariable().setTimeZone(request.getTime_zone());
341+
}
339342

340343
ctx.setThreadLocalInfo();
341344

‎fe/src/main/java/org/apache/doris/qe/MasterOpExecutor.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ private void forward() throws Exception {
8080
params.setExecMemLimit(ctx.getSessionVariable().getMaxExecMemByte());
8181
params.setQueryTimeout(ctx.getSessionVariable().getQueryTimeoutS());
8282
params.setUser_ip(ctx.getRemoteIP());
83+
params.setTime_zone(ctx.getSessionVariable().getTimeZone());
8384

8485
LOG.info("Forward statement {} to Master {}", ctx.getStmtId(), thriftAddress);
8586

‎fe/src/main/java/org/apache/doris/rewrite/FEFunctions.java‎

Lines changed: 28 additions & 398 deletions
Large diffs are not rendered by default.

‎fe/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,20 @@
2929
import java.util.List;
3030
import java.util.TimeZone;
3131

32+
import org.apache.doris.common.FeConstants;
33+
import org.easymock.EasyMock;
3234
import org.junit.Assert;
3335
import org.junit.BeforeClass;
3436
import org.junit.Test;
35-
37+
import org.junit.runner.RunWith;
38+
import org.powermock.api.easymock.PowerMock;
39+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
40+
import org.powermock.core.classloader.annotations.PrepareForTest;
41+
import org.powermock.modules.junit4.PowerMockRunner;
42+
43+
@RunWith(PowerMockRunner.class)
44+
@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" })
45+
@PrepareForTest(Catalog.class)
3646
public class PartitionKeyTest {
3747

3848
private static List<Column> allColumns;
@@ -43,6 +53,8 @@ public class PartitionKeyTest {
4353
private static Column largeInt;
4454
private static Column date;
4555
private static Column datetime;
56+
57+
private Catalog catalog;
4658

4759
@BeforeClass
4860
public static void setUp() {
@@ -143,6 +155,12 @@ public void compareTest() throws AnalysisException {
143155

144156
@Test
145157
public void testSerialization() throws Exception {
158+
catalog = EasyMock.createMock(Catalog.class);
159+
PowerMock.mockStatic(Catalog.class);
160+
EasyMock.expect(Catalog.getInstance()).andReturn(catalog).anyTimes();
161+
EasyMock.expect(Catalog.getCurrentCatalogJournalVersion()).andReturn(FeConstants.meta_version).anyTimes();
162+
PowerMock.replay(Catalog.class);
163+
146164
// 1. Write objects to file
147165
File file = new File("./keyRangePartition");
148166
file.createNewFile();

‎fe/src/test/java/org/apache/doris/common/util/TimeUtilsTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ public void testDateTrans() throws AnalysisException {
132132

133133
DateLiteral datetime = new DateLiteral("2015-03-01 12:00:00", ScalarType.DATETIME);
134134
Assert.assertEquals(20150301120000L, datetime.getRealValue());
135-
136-
Assert.assertEquals("2015-03-01", TimeUtils.format(date.getValue(), date.getType()));
137-
Assert.assertEquals("2015-03-01 12:00:00", TimeUtils.format(datetime.getValue(), datetime.getType()));
138135
}
139136

140137
}

0 commit comments

Comments
 (0)