-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feature] [rest-api] Support Rest Api to upload file and submit task #8442
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
48 changes: 48 additions & 0 deletions
48
...gine-e2e/connector-seatunnel-e2e-base/src/test/resources/upload-file/fake_to_console.conf
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,48 @@ | ||
|
|
||
| # | ||
| # 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. | ||
| # | ||
| ###### | ||
| ###### This config file is a demonstration of streaming processing in seatunnel config | ||
| ###### | ||
|
|
||
| env { | ||
| parallelism = 1 | ||
| job.mode = "BATCH" | ||
| } | ||
|
|
||
| source { | ||
| # This is a example source plugin **only for test and demonstrate the feature source plugin** | ||
| FakeSource { | ||
| plugin_output = "fake" | ||
| parallelism = 1 | ||
| schema = { | ||
| fields { | ||
| name = "string" | ||
| age = "int" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| transform { | ||
| } | ||
|
|
||
| sink { | ||
| console { | ||
| plugin_input="fake" | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
...gine-e2e/connector-seatunnel-e2e-base/src/test/resources/upload-file/fake_to_console.json
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,27 @@ | ||
| { | ||
| "env": { | ||
| "job.mode": "batch" | ||
| }, | ||
| "source": [ | ||
| { | ||
| "plugin_name": "FakeSource", | ||
| "plugin_output": "fake", | ||
| "row.num": 100, | ||
| "schema": { | ||
| "fields": { | ||
| "name": "string", | ||
| "age": "int", | ||
| "card": "int" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "transform": [ | ||
| ], | ||
| "sink": [ | ||
| { | ||
| "plugin_name": "Console", | ||
| "plugin_input": ["fake"] | ||
| } | ||
| ] | ||
| } |
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
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
64 changes: 64 additions & 0 deletions
64
...in/java/org/apache/seatunnel/engine/server/rest/servlet/SubmitJobByUploadFileServlet.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,64 @@ | ||
| /* | ||
| * 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.apache.seatunnel.engine.server.rest.servlet; | ||
|
|
||
| import org.apache.seatunnel.shade.com.typesafe.config.Config; | ||
| import org.apache.seatunnel.shade.com.typesafe.config.ConfigFactory; | ||
| import org.apache.seatunnel.shade.com.typesafe.config.ConfigParseOptions; | ||
| import org.apache.seatunnel.shade.com.typesafe.config.ConfigSyntax; | ||
|
|
||
| import org.apache.seatunnel.engine.server.rest.service.JobInfoService; | ||
|
|
||
| import org.apache.commons.io.IOUtils; | ||
|
|
||
| import com.hazelcast.spi.impl.NodeEngineImpl; | ||
|
|
||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import javax.servlet.http.Part; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| public class SubmitJobByUploadFileServlet extends BaseServlet { | ||
| private final JobInfoService jobInfoService; | ||
|
|
||
| public SubmitJobByUploadFileServlet(NodeEngineImpl nodeEngine) { | ||
| super(nodeEngine); | ||
| this.jobInfoService = new JobInfoService(nodeEngine); | ||
| } | ||
|
|
||
| @Override | ||
| public void doPost(HttpServletRequest req, HttpServletResponse resp) | ||
| throws IOException, ServletException { | ||
|
|
||
| Part filePart = req.getPart("config_file"); | ||
| String submittedFileName = filePart.getSubmittedFileName(); | ||
| String content = IOUtils.toString(filePart.getInputStream(), StandardCharsets.UTF_8); | ||
| Config config; | ||
| if (submittedFileName.endsWith(".json")) { | ||
| config = | ||
| ConfigFactory.parseString( | ||
| content, ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON)); | ||
| } else { | ||
| config = ConfigFactory.parseString(content); | ||
| } | ||
| writeJson(resp, jobInfoService.submitJob(getParameterMap(req), config)); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now we only support json and conf file, can we add file name suffix check here, if not conf and json config, throw exception.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, thank you for your suggestion. My idea is that the configuration file format supports JSON or HOCON, so the configuration file suffix only needs to distinguish JSON from others, such as. conf, config, etc. This type of content can be parsed as long as it is HOCON, rather than limiting the. conf suffix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about add a parameters named
format? Just like submit job api? Please refer https://github.com/apache/seatunnel/blob/dev/docs/en/seatunnel-engine/rest-api-v2.md#parameters-6