Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
b6fc8268
Commit
b6fc8268
authored
Mar 10, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复集群配置参数项为空时无法正常提交perjob任务的bug
parent
df862a44
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
0 deletions
+17
-0
CustomTableEnvironmentImpl.java
...n/java/com/dlink/executor/CustomTableEnvironmentImpl.java
+7
-0
CustomTableEnvironmentImpl.java
...n/java/com/dlink/executor/CustomTableEnvironmentImpl.java
+7
-0
Welcome.tsx
dlink-web/src/pages/Welcome.tsx
+3
-0
No files found.
dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java
View file @
b6fc8268
package
com
.
dlink
.
executor
;
package
com
.
dlink
.
executor
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.result.SqlExplainResult
;
import
com.dlink.result.SqlExplainResult
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
...
@@ -234,6 +235,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
...
@@ -234,6 +235,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
if
(
setOperation
.
getKey
().
isPresent
()
&&
setOperation
.
getValue
().
isPresent
())
{
if
(
setOperation
.
getKey
().
isPresent
()
&&
setOperation
.
getValue
().
isPresent
())
{
String
key
=
setOperation
.
getKey
().
get
().
trim
();
String
key
=
setOperation
.
getKey
().
get
().
trim
();
String
value
=
setOperation
.
getValue
().
get
().
trim
();
String
value
=
setOperation
.
getValue
().
get
().
trim
();
if
(
Asserts
.
isNullString
(
key
)||
Asserts
.
isNullString
(
value
)){
return
;
}
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
confMap
.
put
(
key
,
value
);
confMap
.
put
(
key
,
value
);
setMap
.
put
(
key
,
value
);
setMap
.
put
(
key
,
value
);
...
@@ -246,6 +250,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
...
@@ -246,6 +250,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
private
void
callReset
(
ResetOperation
resetOperation
,
StreamExecutionEnvironment
environment
,
Map
<
String
,
Object
>
setMap
)
{
private
void
callReset
(
ResetOperation
resetOperation
,
StreamExecutionEnvironment
environment
,
Map
<
String
,
Object
>
setMap
)
{
if
(
resetOperation
.
getKey
().
isPresent
())
{
if
(
resetOperation
.
getKey
().
isPresent
())
{
String
key
=
resetOperation
.
getKey
().
get
().
trim
();
String
key
=
resetOperation
.
getKey
().
get
().
trim
();
if
(
Asserts
.
isNullString
(
key
)){
return
;
}
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
confMap
.
put
(
key
,
null
);
confMap
.
put
(
key
,
null
);
setMap
.
remove
(
key
);
setMap
.
remove
(
key
);
...
...
dlink-client/dlink-client-1.14/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java
View file @
b6fc8268
package
com
.
dlink
.
executor
;
package
com
.
dlink
.
executor
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.result.SqlExplainResult
;
import
com.dlink.result.SqlExplainResult
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
...
@@ -297,6 +298,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
...
@@ -297,6 +298,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
if
(
setOperation
.
getKey
().
isPresent
()
&&
setOperation
.
getValue
().
isPresent
())
{
if
(
setOperation
.
getKey
().
isPresent
()
&&
setOperation
.
getValue
().
isPresent
())
{
String
key
=
setOperation
.
getKey
().
get
().
trim
();
String
key
=
setOperation
.
getKey
().
get
().
trim
();
String
value
=
setOperation
.
getValue
().
get
().
trim
();
String
value
=
setOperation
.
getValue
().
get
().
trim
();
if
(
Asserts
.
isNullString
(
key
)||
Asserts
.
isNullString
(
value
)){
return
;
}
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
confMap
.
put
(
key
,
value
);
confMap
.
put
(
key
,
value
);
setMap
.
put
(
key
,
value
);
setMap
.
put
(
key
,
value
);
...
@@ -309,6 +313,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
...
@@ -309,6 +313,9 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements
private
void
callReset
(
ResetOperation
resetOperation
,
StreamExecutionEnvironment
environment
,
Map
<
String
,
Object
>
setMap
)
{
private
void
callReset
(
ResetOperation
resetOperation
,
StreamExecutionEnvironment
environment
,
Map
<
String
,
Object
>
setMap
)
{
if
(
resetOperation
.
getKey
().
isPresent
())
{
if
(
resetOperation
.
getKey
().
isPresent
())
{
String
key
=
resetOperation
.
getKey
().
get
().
trim
();
String
key
=
resetOperation
.
getKey
().
get
().
trim
();
if
(
Asserts
.
isNullString
(
key
)){
return
;
}
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
Map
<
String
,
String
>
confMap
=
new
HashMap
<>();
confMap
.
put
(
key
,
null
);
confMap
.
put
(
key
,
null
);
setMap
.
remove
(
key
);
setMap
.
remove
(
key
);
...
...
dlink-web/src/pages/Welcome.tsx
View file @
b6fc8268
...
@@ -713,6 +713,9 @@ export default (): React.ReactNode => {
...
@@ -713,6 +713,9 @@ export default (): React.ReactNode => {
<
li
>
<
li
>
<
Link
>
优化 PerJob 和 Application 作业的JID提交检测
</
Link
>
<
Link
>
优化 PerJob 和 Application 作业的JID提交检测
</
Link
>
</
li
>
</
li
>
<
li
>
<
Link
>
修复 集群配置参数项为空时无法正常提交perjob任务的bug
</
Link
>
</
li
>
</
ul
>
</
ul
>
</
Paragraph
>
</
Paragraph
>
</
Timeline
.
Item
>
</
Timeline
.
Item
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment