-
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.
Merge pull request #974 from wushengyeyouya/dev-1.0.2
Optimize computation client module, add some test classes for new client SDK.
- Loading branch information
Showing
8 changed files
with
197 additions
and
3 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
42 changes: 42 additions & 0 deletions
42
...nt/src/main/scala/com/webank/wedatasphere/linkis/computation/client/LinkisJobClient.scala
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,42 @@ | ||
| /* | ||
| * 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 com.webank.wedatasphere.linkis.computation.client | ||
|
|
||
| import java.io.Closeable | ||
|
|
||
| import com.webank.wedatasphere.linkis.computation.client.interactive.InteractiveJob | ||
| import com.webank.wedatasphere.linkis.computation.client.once.OnceJob | ||
|
|
||
|
|
||
| /** | ||
| * This class is only used to provide a unified entry for user to build a LinkisJob conveniently and simply. | ||
| * Please keep this class lightweight enough, do not set too many field to confuse user. | ||
| */ | ||
| object LinkisJobClient extends Closeable { | ||
|
|
||
| val config = LinkisJobBuilder | ||
|
|
||
| val interactive = InteractiveJob | ||
| val once = OnceJob | ||
|
|
||
| override def close(): Unit = { | ||
| if(config.justGetDefaultUJESClient != null) { | ||
| config.justGetDefaultUJESClient.close() | ||
| } | ||
| } | ||
| } |
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
76 changes: 76 additions & 0 deletions
76
...ent/src/test/java/com/webank/wedatasphere/linkis/computation/client/FlinkOnceJobTest.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,76 @@ | ||
| /* | ||
| * 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 com.webank.wedatasphere.linkis.computation.client; | ||
|
|
||
| import com.webank.wedatasphere.linkis.common.conf.Configuration; | ||
| import com.webank.wedatasphere.linkis.computation.client.once.simple.SubmittableSimpleOnceJob; | ||
| import com.webank.wedatasphere.linkis.computation.client.utils.LabelKeyUtils; | ||
|
|
||
| /** | ||
| * @author enjoyyin | ||
| * @date 2021-08-25 | ||
| * @since 0.5.0 | ||
| */ | ||
| public class FlinkOnceJobTest { | ||
| public static void main(String[] args) { | ||
| // TODO First, set the right gateway url. | ||
| LinkisJobClient.config().setDefaultServerUrl("http://127.0.0.1:9002"); | ||
| // TODO Second, modify the sql, so Flink engineConn can run it successfully. | ||
| String sql = "CREATE TABLE mysql_binlog (\n" | ||
| + " id INT NOT NULL,\n" | ||
| + " name STRING,\n" | ||
| + " age INT\n" | ||
| + ") WITH (\n" | ||
| + " 'connector' = 'mysql-cdc',\n" | ||
| + " 'hostname' = 'ip',\n" | ||
| + " 'port' = 'port',\n" | ||
| + " 'username' = '${username}',\n" | ||
| + " 'password' = '${password}',\n" | ||
| + " 'database-name' = '${database}',\n" | ||
| + " 'table-name' = '${tablename}',\n" | ||
| + " 'debezium.snapshot.locking.mode' = 'none'\n" | ||
| + ");\n" | ||
| + "CREATE TABLE sink_table (\n" | ||
| + " id INT NOT NULL,\n" | ||
| + " name STRING,\n" | ||
| + " age INT,\n" | ||
| + " primary key(id) not enforced\n" | ||
| + ") WITH (\n" | ||
| + " 'connector' = 'jdbc',\n" | ||
| + " 'url' = 'jdbc:mysql://${ip}:port/${database}',\n" | ||
| + " 'table-name' = '${tablename}',\n" | ||
| + " 'driver' = 'com.mysql.jdbc.Driver',\n" | ||
| + " 'username' = '${username}',\n" | ||
| + " 'password' = '${password}'\n" | ||
| + ");\n" | ||
| + "INSERT INTO sink_table SELECT id, name, age FROM mysql_binlog"; | ||
| // TODO Thirdly, please modify the user_creator label and executeUser | ||
| SubmittableSimpleOnceJob onceJob = LinkisJobClient.once().simple().builder().setCreateService("Flink-Test") | ||
| .addLabel(LabelKeyUtils.ENGINE_TYPE_LABEL_KEY(), "flink-1.12.2") | ||
| .addLabel(LabelKeyUtils.USER_CREATOR_LABEL_KEY(), "hadoop-Streamis") | ||
| .addLabel(LabelKeyUtils.ENGINE_CONN_MODE_LABEL_KEY(), "once") | ||
| .addStartupParam(Configuration.IS_TEST_MODE().key(), true) | ||
| .setMaxSubmitTime(300000) | ||
| .addExecuteUser("hadoop").addJobContent("runType", "sql").addJobContent("code", sql).addSource("jobName", "OnceJobTest") | ||
| .build(); | ||
| onceJob.submit(); | ||
| System.out.println(onceJob.getId()); | ||
| onceJob.waitForCompleted(); | ||
| System.exit(0); | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
...t/src/test/java/com/webank/wedatasphere/linkis/computation/client/InteractiveJobTest.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,45 @@ | ||
| /* | ||
| * 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 com.webank.wedatasphere.linkis.computation.client; | ||
|
|
||
| import com.webank.wedatasphere.linkis.computation.client.interactive.SubmittableInteractiveJob; | ||
|
|
||
| /** | ||
| * A test class for submit a sql to hive engineConn. | ||
| */ | ||
| public class InteractiveJobTest { | ||
|
|
||
| public static void main(String[] args) { | ||
| // TODO First, set the right gateway url. | ||
| LinkisJobClient.config().setDefaultServerUrl("http://127.0.0.1:9002"); | ||
| //TODO Secondly, please modify the executeUser | ||
| SubmittableInteractiveJob job = LinkisJobClient.interactive().builder() | ||
| .setEngineType("hive").setRunTypeStr("sql").setCreator("IDE") | ||
| .setCode("show tables").addExecuteUser("hadoop").build(); | ||
| // 3. Submit Job to Linkis | ||
| job.submit(); | ||
| // 4. Wait for Job completed | ||
| job.waitForCompleted(); | ||
| // 5. Get results from iterators. | ||
| ResultSetIterator iterator = job.getResultSetIterables()[0].iterator(); | ||
| System.out.println(iterator.getMetadata()); | ||
| while(iterator.hasNext()){ | ||
| System.out.println(iterator.next()); | ||
| } | ||
| } | ||
| } |
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