-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature][Web]Flink jar add form (#3949)
Co-authored-by: zackyoungh <zackyoungh@users.noreply.github.com>
- Loading branch information
1 parent
3f46587
commit 9b8108f
Showing
21 changed files
with
470 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
dinky-admin/src/main/java/org/dinky/data/vo/FlinkJarSqlConvertVO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.dinky.data.vo; | ||
|
|
||
| import org.dinky.data.model.JarSubmitParam; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| public class FlinkJarSqlConvertVO { | ||
| private String initSqlStatement; | ||
| private JarSubmitParam jarSubmitParam; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| EXECUTE JAR WITH ( | ||
| 'uri'='${uri}', | ||
| 'main-class'='${mainClass}', | ||
| 'args'='${args}', | ||
| 'allowNonRestoredState'='${allowNonRestoredState}' | ||
| ); |
96 changes: 96 additions & 0 deletions
96
dinky-client/dinky-client-base/src/main/java/org/dinky/data/model/JarSubmitParam.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.dinky.data.model; | ||
|
|
||
| import org.dinky.parser.SqlSegment; | ||
|
|
||
| import org.apache.flink.runtime.jobgraph.SavepointConfigOptions; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import cn.hutool.core.bean.BeanUtil; | ||
| import cn.hutool.core.bean.copier.CopyOptions; | ||
| import cn.hutool.core.codec.Base64; | ||
| import cn.hutool.core.lang.Assert; | ||
| import cn.hutool.core.util.StrUtil; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| public class JarSubmitParam { | ||
| protected JarSubmitParam() {} | ||
|
|
||
| private String uri; | ||
| private String mainClass; | ||
| private String args; | ||
| private String parallelism; | ||
| private String savepointPath; | ||
| private Boolean allowNonRestoredState = SavepointConfigOptions.SAVEPOINT_IGNORE_UNCLAIMED_STATE.defaultValue(); | ||
|
|
||
| public static JarSubmitParam build(String statement) { | ||
| JarSubmitParam submitParam = getInfo(statement); | ||
| Assert.notBlank(submitParam.getUri()); | ||
| return submitParam; | ||
| } | ||
|
|
||
| public static JarSubmitParam getInfo(String statement) { | ||
| statement = statement.replace("\r\n", " ").replace("\n", " ") + " ENDOFSQL"; | ||
| SqlSegment sqlSegment = new SqlSegment("with", "(with\\s+\\()(.+)(\\))", "',"); | ||
| sqlSegment.parse(statement); | ||
| List<String> bodyPieces = sqlSegment.getBodyPieces(); | ||
| Map<String, String> keyValue = getKeyValue(bodyPieces); | ||
| return BeanUtil.toBean( | ||
| keyValue, | ||
| JarSubmitParam.class, | ||
| CopyOptions.create().setFieldNameEditor(s -> StrUtil.toCamelCase(s, '-'))); | ||
| } | ||
|
|
||
| private static Map<String, String> getKeyValue(List<String> list) { | ||
| Map<String, String> map = new HashMap<>(); | ||
| Pattern p = Pattern.compile("'(.*?)'\\s*=\\s*'(.*?)'"); | ||
| for (String s : list) { | ||
| Matcher m = p.matcher(s + "'"); | ||
| if (m.find()) { | ||
| map.put(m.group(1), m.group(2)); | ||
| } | ||
| } | ||
| return map; | ||
| } | ||
|
|
||
| public static JarSubmitParam empty() { | ||
| JarSubmitParam jarSubmitParam = new JarSubmitParam(); | ||
| jarSubmitParam.setArgs(""); | ||
| jarSubmitParam.setMainClass(""); | ||
| jarSubmitParam.setUri(""); | ||
| return jarSubmitParam; | ||
| } | ||
|
|
||
| public String getArgs() { | ||
| if (StrUtil.subPre(args, 7).equals("base64@")) { | ||
| return Base64.decodeStr(StrUtil.removePrefix(args, "base64@")); | ||
| } | ||
| return args; | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
...y-client/dinky-client-base/src/main/java/org/dinky/trans/ExecuteJarParseStrategyUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.dinky.trans; | ||
|
|
||
| import org.dinky.trans.parse.ExecuteJarParseStrategy; | ||
|
|
||
| import cn.hutool.core.lang.Singleton; | ||
|
|
||
| public class ExecuteJarParseStrategyUtil { | ||
|
|
||
| public static boolean match(String statement) { | ||
| return Singleton.get(ExecuteJarParseStrategy.class).match(statement); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.