Skip to content

Commit 8de2992

Browse files
author
gituser
committed
Merge branch 'hotfix_1.10_4.0.x_32570' into 1.10_release_4.0.x
2 parents af3dc96 + a54ce86 commit 8de2992

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

core/src/main/java/com/dtstack/flink/sql/environment/StreamEnvConfigManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ public static void streamExecutionEnvironmentConfig(StreamExecutionEnvironment s
7373

7474
confProperties = PropertiesUtils.propertiesTrim(confProperties);
7575
streamEnv.getConfig().disableClosureCleaner();
76-
// Disables reusing object
77-
streamEnv.getConfig().enableObjectReuse();
7876

7977
Configuration globalJobParameters = new Configuration();
8078
//Configuration unsupported set properties key-value

core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.apache.commons.lang3.StringUtils;
4747
import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
4848
import org.apache.flink.api.common.typeinfo.LocalTimeTypeInfo;
49+
import org.apache.flink.api.common.typeinfo.TypeHint;
4950
import org.apache.flink.api.common.typeinfo.TypeInformation;
5051
import org.apache.flink.api.java.typeutils.RowTypeInfo;
5152
import org.apache.flink.streaming.api.datastream.DataStream;
@@ -66,6 +67,7 @@
6667
import org.slf4j.Logger;
6768
import org.slf4j.LoggerFactory;
6869

70+
import java.sql.Timestamp;
6971
import java.time.LocalDateTime;
7072
import java.util.Arrays;
7173
import java.util.LinkedList;
@@ -502,6 +504,10 @@ private void joinFun(Object pollObj,
502504
if (fieldDataTypes[i].getClass().equals(LegacyLocalDateTimeTypeInfo.class)) {
503505
fieldDataTypes[i] = LocalTimeTypeInfo.LOCAL_DATE_TIME;
504506
}
507+
508+
if (fieldDataTypes[i].getClass().equals(TimeIndicatorTypeInfo.class)) {
509+
fieldDataTypes[i] = TypeInformation.of(new TypeHint<Timestamp>() {});
510+
}
505511
}
506512

507513
RowTypeInfo typeInfo = new RowTypeInfo(fieldDataTypes, targetTable.getSchema().getFieldNames());

0 commit comments

Comments
 (0)