Skip to content

Commit f2a9b20

Browse files
author
dapeng
committed
Merge remote-tracking branch 'origin/feat_1.8_async' into feat_async_mergedDev
# Conflicts: # core/src/main/java/com/dtstack/flink/sql/side/AsyncReqRow.java
2 parents bd517df + 28294ff commit f2a9b20

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ public void timeout(CRow input, ResultFuture<CRow> resultFuture) throws Exceptio
130130
timeOutNum ++;
131131
if(timeOutNum > sideInfo.getSideTableInfo().getAsyncTimeoutNumLimit()){
132132
resultFuture.completeExceptionally(new Exception("Async function call timedoutNum beyond limit."));
133+
} else {
134+
resultFuture.complete(null);
133135
}
134136
}
135137

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public abstract class SideTableInfo extends TableInfo implements Serializable {
6565

6666
private int asyncTimeout=10000;
6767

68-
private int asyncTimeoutNumLimit = 0;
68+
private int asyncTimeoutNumLimit = Integer.MAX_VALUE;
6969

7070
private boolean partitionedJoin = false;
7171

0 commit comments

Comments
 (0)