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
102b1b21
Unverified
Commit
102b1b21
authored
Aug 21, 2022
by
Kerwin
Committed by
GitHub
Aug 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added dlink-function and dlink-gateway module code style (#920)
parent
f44cfd2d
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
47 additions
and
68 deletions
+47
-68
GetKey.java
dlink-function/src/main/java/com/dlink/ud/udf/GetKey.java
+0
-1
RowsToMap.java
...-function/src/main/java/com/dlink/ud/udtaf/RowsToMap.java
+0
-3
Top2.java
dlink-function/src/main/java/com/dlink/ud/udtaf/Top2.java
+0
-1
Top2WithRetract.java
...ion/src/main/java/com/dlink/ud/udtaf/Top2WithRetract.java
+0
-1
AbstractGateway.java
...eway/src/main/java/com/dlink/gateway/AbstractGateway.java
+2
-1
Gateway.java
dlink-gateway/src/main/java/com/dlink/gateway/Gateway.java
+1
-1
GatewayType.java
...-gateway/src/main/java/com/dlink/gateway/GatewayType.java
+0
-1
ActionType.java
...ay/src/main/java/com/dlink/gateway/config/ActionType.java
+0
-1
AppConfig.java
...way/src/main/java/com/dlink/gateway/config/AppConfig.java
+1
-1
ClusterConfig.java
...src/main/java/com/dlink/gateway/config/ClusterConfig.java
+6
-7
ConfigPara.java
...ay/src/main/java/com/dlink/gateway/config/ConfigPara.java
+0
-1
FlinkConfig.java
...y/src/main/java/com/dlink/gateway/config/FlinkConfig.java
+7
-8
GatewayConfig.java
...src/main/java/com/dlink/gateway/config/GatewayConfig.java
+7
-7
SavePointStrategy.java
...main/java/com/dlink/gateway/config/SavePointStrategy.java
+0
-1
SavePointType.java
...src/main/java/com/dlink/gateway/config/SavePointType.java
+0
-1
GatewayException.java
...in/java/com/dlink/gateway/exception/GatewayException.java
+0
-1
KubernetesApplicationGateway.java
...link/gateway/kubernetes/KubernetesApplicationGateway.java
+0
-1
KubernetesGateway.java
.../java/com/dlink/gateway/kubernetes/KubernetesGateway.java
+5
-3
JobInfo.java
...ateway/src/main/java/com/dlink/gateway/model/JobInfo.java
+0
-1
AbstractGatewayResult.java
.../java/com/dlink/gateway/result/AbstractGatewayResult.java
+3
-3
GatewayResult.java
...src/main/java/com/dlink/gateway/result/GatewayResult.java
+0
-1
KubernetesResult.java
.../main/java/com/dlink/gateway/result/KubernetesResult.java
+0
-1
SavePointResult.java
...c/main/java/com/dlink/gateway/result/SavePointResult.java
+3
-3
TestResult.java
...ay/src/main/java/com/dlink/gateway/result/TestResult.java
+0
-1
YarnResult.java
...ay/src/main/java/com/dlink/gateway/result/YarnResult.java
+0
-1
YarnApplicationGateway.java
...n/java/com/dlink/gateway/yarn/YarnApplicationGateway.java
+0
-2
YarnGateway.java
...way/src/main/java/com/dlink/gateway/yarn/YarnGateway.java
+11
-12
YarnPerJobGateway.java
...c/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java
+1
-1
GatewayTest.java
...-gateway/src/test/java/com/dlink/gateway/GatewayTest.java
+0
-1
No files found.
dlink-function/src/main/java/com/dlink/ud/udf/GetKey.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
ud
.
udf
;
import
org.apache.flink.table.functions.ScalarFunction
;
...
...
dlink-function/src/main/java/com/dlink/ud/udtaf/RowsToMap.java
View file @
102b1b21
...
...
@@ -17,10 +17,8 @@
*
*/
package
com
.
dlink
.
ud
.
udtaf
;
import
org.apache.flink.table.functions.TableAggregateFunction
;
import
org.apache.flink.util.Collector
;
...
...
@@ -40,7 +38,6 @@ public class RowsToMap extends TableAggregateFunction<String, Map> {
return
new
HashMap
();
}
public
void
accumulate
(
Map
acc
,
String
cls
,
Object
v
,
String
key
)
{
String
[]
keys
=
key
.
split
(
","
);
for
(
int
i
=
0
;
i
<
keys
.
length
;
i
++)
{
...
...
dlink-function/src/main/java/com/dlink/ud/udtaf/Top2.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
ud
.
udtaf
;
import
org.apache.flink.api.java.tuple.Tuple2
;
...
...
dlink-function/src/main/java/com/dlink/ud/udtaf/Top2WithRetract.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
ud
.
udtaf
;
import
org.apache.flink.api.java.tuple.Tuple2
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/AbstractGateway.java
View file @
102b1b21
...
...
@@ -17,11 +17,12 @@
*
*/
package
com
.
dlink
.
gateway
;
import
com.dlink.gateway.config.GatewayConfig
;
import
org.apache.flink.configuration.Configuration
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/Gateway.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
;
import
com.dlink.assertion.Asserts
;
...
...
@@ -26,6 +25,7 @@ import com.dlink.gateway.exception.GatewayException;
import
com.dlink.gateway.result.GatewayResult
;
import
com.dlink.gateway.result.SavePointResult
;
import
com.dlink.gateway.result.TestResult
;
import
org.apache.flink.runtime.jobgraph.JobGraph
;
import
java.util.Iterator
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/GatewayType.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
;
import
com.dlink.assertion.Asserts
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/config/ActionType.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
import
com.dlink.assertion.Asserts
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/config/AppConfig.java
View file @
102b1b21
...
...
@@ -17,10 +17,10 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
import
com.dlink.assertion.Asserts
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/config/ClusterConfig.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
import
lombok.Getter
;
...
...
@@ -60,11 +59,11 @@ public class ClusterConfig {
@Override
public
String
toString
()
{
return
"ClusterConfig{"
+
"flinkConfigPath='"
+
flinkConfigPath
+
'\''
+
", flinkLibPath='"
+
flinkLibPath
+
'\''
+
", yarnConfigPath='"
+
yarnConfigPath
+
'\''
+
", appId='"
+
appId
+
'\''
+
'}'
;
return
"ClusterConfig{"
+
"flinkConfigPath='"
+
flinkConfigPath
+
'\''
+
", flinkLibPath='"
+
flinkLibPath
+
'\''
+
", yarnConfigPath='"
+
yarnConfigPath
+
'\''
+
", appId='"
+
appId
+
'\''
+
'}'
;
}
}
dlink-gateway/src/main/java/com/dlink/gateway/config/ConfigPara.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
/**
...
...
dlink-gateway/src/main/java/com/dlink/gateway/config/FlinkConfig.java
View file @
102b1b21
...
...
@@ -17,19 +17,20 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
import
com.dlink.assertion.Asserts
;
import
java.util.HashMap
;
import
java.util.Map
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* FlinkConfig
*
...
...
@@ -86,10 +87,8 @@ public class FlinkConfig {
e
.
printStackTrace
();
}
paras
.
forEach
((
JsonNode
node
)
->
{
configMap
.
put
(
node
.
get
(
"key"
).
asText
(),
node
.
get
(
"value"
).
asText
());
// configParasList.add(new ConfigPara(node.get("key").asText(), node.get("value").asText()));
}
);
configMap
.
put
(
node
.
get
(
"key"
).
asText
(),
node
.
get
(
"value"
).
asText
());
});
}
return
new
FlinkConfig
(
jobName
,
jobId
,
ActionType
.
get
(
actionStr
),
SavePointType
.
get
(
savePointTypeStr
),
savePoint
,
configMap
);
}
...
...
dlink-gateway/src/main/java/com/dlink/gateway/config/GatewayConfig.java
View file @
102b1b21
...
...
@@ -17,19 +17,20 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
import
com.dlink.gateway.GatewayType
;
import
java.util.HashMap
;
import
java.util.Map
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* SubmitConfig
*
...
...
@@ -89,9 +90,8 @@ public class GatewayConfig {
Map
<
String
,
String
>
configMap
=
new
HashMap
<>();
JsonNode
paras
=
mapper
.
readTree
(
para
.
get
(
"configParas"
).
asText
());
paras
.
forEach
((
JsonNode
node
)
->
{
configMap
.
put
(
node
.
get
(
"key"
).
asText
(),
node
.
get
(
"value"
).
asText
());
}
);
configMap
.
put
(
node
.
get
(
"key"
).
asText
(),
node
.
get
(
"value"
).
asText
());
});
config
.
getFlinkConfig
().
setConfiguration
(
configMap
);
}
catch
(
JsonProcessingException
e
)
{
e
.
printStackTrace
();
...
...
dlink-gateway/src/main/java/com/dlink/gateway/config/SavePointStrategy.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
/**
...
...
dlink-gateway/src/main/java/com/dlink/gateway/config/SavePointType.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
config
;
import
com.dlink.assertion.Asserts
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/exception/GatewayException.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
exception
;
/**
...
...
dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
kubernetes
;
import
com.dlink.assertion.Asserts
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesGateway.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
kubernetes
;
import
com.dlink.assertion.Asserts
;
...
...
@@ -34,7 +33,6 @@ import com.dlink.utils.LogUtil;
import
org.apache.flink.api.common.JobID
;
import
org.apache.flink.client.program.ClusterClient
;
import
org.apache.flink.configuration.CheckpointingOptions
;
import
org.apache.flink.configuration.Configuration
;
import
org.apache.flink.configuration.DeploymentOptions
;
import
org.apache.flink.configuration.GlobalConfiguration
;
import
org.apache.flink.kubernetes.KubernetesClusterClientFactory
;
...
...
@@ -45,7 +43,11 @@ import org.apache.flink.kubernetes.kubeclient.FlinkKubeClientFactory;
import
org.apache.flink.runtime.client.JobStatusMessage
;
import
org.apache.flink.runtime.jobgraph.SavepointConfigOptions
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
import
java.util.concurrent.CompletableFuture
;
/**
...
...
dlink-gateway/src/main/java/com/dlink/gateway/model/JobInfo.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
model
;
import
lombok.Getter
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/result/AbstractGatewayResult.java
View file @
102b1b21
...
...
@@ -17,15 +17,15 @@
*
*/
package
com
.
dlink
.
gateway
.
result
;
import
com.dlink.gateway.GatewayType
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.time.LocalDateTime
;
import
lombok.Getter
;
import
lombok.Setter
;
/**
* AbstractGatewayResult
*
...
...
dlink-gateway/src/main/java/com/dlink/gateway/result/GatewayResult.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
result
;
import
java.util.List
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/result/KubernetesResult.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
result
;
import
com.dlink.gateway.GatewayType
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/result/SavePointResult.java
View file @
102b1b21
...
...
@@ -17,17 +17,17 @@
*
*/
package
com
.
dlink
.
gateway
.
result
;
import
com.dlink.gateway.GatewayType
;
import
com.dlink.gateway.model.JobInfo
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
lombok.Getter
;
import
lombok.Setter
;
/**
* TODO
*
...
...
dlink-gateway/src/main/java/com/dlink/gateway/result/TestResult.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
result
;
/**
...
...
dlink-gateway/src/main/java/com/dlink/gateway/result/YarnResult.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
result
;
import
com.dlink.gateway.GatewayType
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
yarn
;
import
com.dlink.assertion.Asserts
;
...
...
@@ -29,7 +28,6 @@ import com.dlink.gateway.result.GatewayResult;
import
com.dlink.gateway.result.YarnResult
;
import
com.dlink.utils.LogUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.flink.client.deployment.ClusterSpecification
;
import
org.apache.flink.client.deployment.application.ApplicationConfiguration
;
import
org.apache.flink.client.program.ClusterClient
;
...
...
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnGateway.java
View file @
102b1b21
...
...
@@ -17,10 +17,20 @@
*
*/
package
com
.
dlink
.
gateway
.
yarn
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.gateway.AbstractGateway
;
import
com.dlink.gateway.config.ActionType
;
import
com.dlink.gateway.config.GatewayConfig
;
import
com.dlink.gateway.config.SavePointType
;
import
com.dlink.gateway.exception.GatewayException
;
import
com.dlink.gateway.model.JobInfo
;
import
com.dlink.gateway.result.SavePointResult
;
import
com.dlink.gateway.result.TestResult
;
import
com.dlink.utils.FlinkUtil
;
import
com.dlink.utils.LogUtil
;
import
org.apache.flink.api.common.JobID
;
import
org.apache.flink.client.deployment.ClusterRetrieveException
;
import
org.apache.flink.client.program.ClusterClient
;
...
...
@@ -56,17 +66,6 @@ import java.util.UUID;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.Executors
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.gateway.AbstractGateway
;
import
com.dlink.gateway.config.ActionType
;
import
com.dlink.gateway.config.GatewayConfig
;
import
com.dlink.gateway.config.SavePointType
;
import
com.dlink.gateway.exception.GatewayException
;
import
com.dlink.gateway.model.JobInfo
;
import
com.dlink.gateway.result.SavePointResult
;
import
com.dlink.gateway.result.TestResult
;
import
com.dlink.utils.LogUtil
;
/**
* YarnSubmiter
*
...
...
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
.
yarn
;
import
com.dlink.assertion.Asserts
;
...
...
@@ -27,6 +26,7 @@ import com.dlink.gateway.exception.GatewayException;
import
com.dlink.gateway.result.GatewayResult
;
import
com.dlink.gateway.result.YarnResult
;
import
com.dlink.utils.LogUtil
;
import
org.apache.flink.client.deployment.ClusterSpecification
;
import
org.apache.flink.client.program.ClusterClient
;
import
org.apache.flink.client.program.ClusterClientProvider
;
...
...
dlink-gateway/src/test/java/com/dlink/gateway/GatewayTest.java
View file @
102b1b21
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
gateway
;
/**
...
...
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