-
Notifications
You must be signed in to change notification settings - Fork 2.1k
[Improve][engine-server] engine-server and seantunnel-ui support remote paginated queries #9951
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
Open
liucongjy
wants to merge
4
commits into
apache:dev
Choose a base branch
from
liucongjy:lc-feture-branch
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+451
−40
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b1f4c9b
[Improve][UI] seantunnel-ui support paginated queries in finished and…
liucongjy e00bc01
[Improve][engine-server] add page parameter validate and modify rest …
liucongjy c38727a
[Improve][engine-server] get running job json order by jobinfo initia…
liucongjy b9adea0
[Improve][engine-server] Resolve the issue of throwing an IllegalArgu…
liucongjy 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
75 changes: 75 additions & 0 deletions
75
...server/src/main/java/org/apache/seatunnel/engine/server/rest/servlet/PageBaseServlet.java
This file contains hidden or 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,75 @@ | ||
| /* | ||
| * 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 com.hazelcast.internal.json.JsonArray; | ||
| import com.hazelcast.internal.json.JsonObject; | ||
| import com.hazelcast.spi.impl.NodeEngineImpl; | ||
|
|
||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Map; | ||
|
|
||
| public class PageBaseServlet extends BaseServlet { | ||
| private final String pageParam = "page"; | ||
| private final String rowsParam = "rows"; | ||
|
Comment on lines
+31
to
+32
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The API parameters in the docs rest-api-v2.md have been updated. |
||
|
|
||
| public PageBaseServlet(NodeEngineImpl nodeEngine) { | ||
| super(nodeEngine); | ||
| } | ||
|
|
||
| protected void writeJsonWithPagination( | ||
| HttpServletRequest req, HttpServletResponse resp, JsonArray jsonArray) | ||
| throws IOException { | ||
| int total = jsonArray.size(); | ||
|
|
||
| // fetch pagination params, if page exist, then paginate data,pagination data format like: | ||
| // {"data": [], "total": 10} | ||
| Map<String, String> parameterMap = getParameterMap(req); | ||
| if (parameterMap != null && parameterMap.containsKey(pageParam)) { | ||
| int page = Integer.parseInt(parameterMap.get(pageParam)); | ||
| int rows = | ||
| parameterMap.get(rowsParam) != null | ||
| ? Integer.parseInt(parameterMap.get(rowsParam)) | ||
| : 10; | ||
| int start = (page - 1) * rows; | ||
| if (start > total || page < 1) { | ||
| throw new IllegalArgumentException( | ||
| page < 1 | ||
| ? "Page number must be greater than 0" | ||
| : "Page number exceeds total pages"); | ||
| } | ||
| JsonArray paginatedArray = new JsonArray(); | ||
| jsonArray | ||
| .values() | ||
| .subList(start, Math.min(start + rows, total)) | ||
| .forEach( | ||
| t -> { | ||
| paginatedArray.add(t); | ||
| }); | ||
| JsonObject paginatedObj = new JsonObject(); | ||
| paginatedObj.add("data", paginatedArray); | ||
| paginatedObj.add("total", total); | ||
| writeJson(resp, paginatedObj); | ||
| } else { | ||
| writeJson(resp, jsonArray); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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.
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.
JobId is ordered, I think it can be sorted by jobId, compared to higher efficiency.
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.
The JobId is manually passed in and may not guarantee order, so it has been changed to use the InitializationTimestamp of the JobInfo for sorting.