[incubator-inlong] branch master updated: [INLONG-4583][Manager] Fix the SQL error for query InlongGroup (#4584)

[healchow]

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 12ed2caad [INLONG-4583][Manager] Fix the SQL error for query 
InlongGroup (#4584)
12ed2caad is described below

commit 12ed2caadd18e1f0b336529def50ea74c13b32d2
Author: healzhou <healc...@gmail.com>
AuthorDate: Wed Jun 8 14:28:39 2022 +0800

    [INLONG-4583][Manager] Fix the SQL error for query InlongGroup (#4584)
---
 .../src/main/resources/mappers/InlongGroupEntityMapper.xml           | 1 -
 .../apache/inlong/manager/service/group/InlongGroupServiceImpl.java  | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
 
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index ddf861337..591c78b7f 100644
--- 
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++ 
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -156,7 +156,6 @@
             </if>
         </where>
         order by modify_time desc
-        limit 100
     </select>
     <select id="selectBriefList" 
parameterType="org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest"
             
resultType="org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo">
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index d40eb0a7d..7e8f7ac4a 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -70,6 +70,7 @@ import java.util.stream.Collectors;
 public class InlongGroupServiceImpl implements InlongGroupService {
 
     private static final Logger LOGGER = 
LoggerFactory.getLogger(InlongGroupServiceImpl.class);
+    private static final Integer MAX_PAGE_SIZE = 100;
 
     @Autowired
     private InlongGroupOperatorFactory groupOperatorFactory;
@@ -166,6 +167,10 @@ public class InlongGroupServiceImpl implements 
InlongGroupService {
 
     @Override
     public PageInfo<InlongGroupListResponse> listByPage(InlongGroupPageRequest 
request) {
+        if (request.getPageSize() > MAX_PAGE_SIZE) {
+            LOGGER.warn("list group info, but page size is {}, change to {}", 
request.getPageSize(), MAX_PAGE_SIZE);
+            request.setPageSize(MAX_PAGE_SIZE);
+        }
         PageHelper.startPage(request.getPageNum(), request.getPageSize());
         Page<InlongGroupEntity> entityPage = (Page<InlongGroupEntity>) 
groupMapper.selectByCondition(request);