From fab2f56f5631335d5ac5b1497fa996fbe63d0b1f Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 11 1월 2022 14:45:33 +0900
Subject: [PATCH] - 이슈 검색 속도 개선
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 30 ++--
src/main/resources/mybatis/query-template/issue-template.xml | 346 +------------------------------------------------
src/main/resources/migration/V1_4__sql_tuning.sql | 3
3 files changed, 25 insertions(+), 354 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 9bb8241..4cf7a5d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -933,22 +933,19 @@
return Lists.newArrayList();
}
- // �뒠�떇 �쟾 - 1.3 / 1.2 / 1.1
- // �뒠�떇 �썑 (�떒�씪/�떎以� 寃��깋 議곌굔 3媛� 湲곗�) - 0.49 / 0.41 / 0.47 / 0.41
-
List<IssueVo> issueVos = Lists.newArrayList(); // �씠�뒋 紐⑸줉 �뜲�씠�꽣 ���옣 而щ젆�뀡
// �궗�슜�옄 �젙�쓽 �븘�뱶濡� 寃��깋�븳 �씠�뒋 �븘�씠�뵒 媛�
List<String> issueKeys = Lists.newArrayList(issueIds);
issueCondition.setIssueIds(issueKeys);
-
- issueCondition.setLoginUserId(this.webAppUtil.getLoginId());
- issueCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
User user = this.webAppUtil.getLoginUserObject();
+
+ issueCondition.setLoginUserId(user.getId());
+ issueCondition.setWorkspaceId(user.getLastWorkspaceId());
List<Map<String, Object>> results = Lists.newArrayList();
Long totalCount = 0L;
- UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
+// UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
// if (!this.userWorkspaceService.checkWorkspaceManager(user)
// && !MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) { //理쒓퀬愿�由ъ옄 & �봽濡쒖젥�듃,�씠�뒋 愿�由ъ옄 �씪 寃쎌슦 紐⑤뱺 �씠�뒋 蹂닿린
@@ -958,17 +955,18 @@
// results = this.issueMapper.findByDepartment(issueCondition);
// totalCount = this.issueMapper.countByDepartment(issueCondition);
// }*/
+// StopWatch serviceStart = new StopWatch();
+// serviceStart.start();
results = this.issueMapper.find(issueCondition);
+// serviceStart.stop();
+// log.error("result : " + serviceStart.toString());
+
+// serviceStart = new StopWatch();
+// serviceStart.start();
totalCount = this.issueMapper.count(issueCondition);
-
- // �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
- /*StopWatch serviceStart = new StopWatch();
- serviceStart.start();*/
- // �뒠�떇 �쟾 - 1.1, 1.1, 1.3, 1.2
-
- /*serviceStart.stop();
- log.debug("serviceENd1 : " + serviceStart.getTime());*/
+// serviceStart.stop();
+// log.error("totalCount : " + serviceStart.toString());
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �씠�뒋 �븘�씠�뵒 珥덇린�솕
@@ -984,8 +982,8 @@
this.setDownIssues(user, issueVos);
this.setRelationIssues(issueVos);
}
- this.setCountDownIssues(issueVos);
+ this.setCountDownIssues(issueVos);
this.SetWorkflowDepartment(issueVos); //�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
diff --git a/src/main/resources/migration/V1_4__sql_tuning.sql b/src/main/resources/migration/V1_4__sql_tuning.sql
new file mode 100644
index 0000000..c6ee48e
--- /dev/null
+++ b/src/main/resources/migration/V1_4__sql_tuning.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `issue_isp` ADD INDEX `issueIdIndex` (`issue_id`) USING BTREE;
+ALTER TABLE `issue_hosting` ADD INDEX `issueIdIndex` (`issue_id`) USING BTREE;
+ALTER TABLE `issue_company` ADD INDEX `issueIdIndex` (`issue_id`) USING BTREE;
\ No newline at end of file
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 8685b96..f7dfead 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -5,7 +5,7 @@
<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- DISTINCT issue.id as id,
+ issue.id as id,
issue.register_id as registerId,
issue.reverse_index as reverseIndex,
issue.title as title,
@@ -50,14 +50,13 @@
LEFT OUTER JOIN issue_user issue_user FORCE INDEX(issueIdIndex) ON issue.id = issue_user.issue_id
LEFT OUTER JOIN user_department ud ON ud.department_id = isd.department_id
LEFT OUTER JOIN department d ON d.id = isd.department_id
- LEFT OUTER JOIN issue_company ic ON ic.issue_id = issue.id
- LEFT OUTER JOIN issue_isp ii ON ii.issue_id = issue.id
- LEFT OUTER JOIN issue_hosting ih ON ih.issue_id = issue.id
+ LEFT OUTER JOIN issue_company ic FORCE INDEX(issueIdIndex) ON ic.issue_id = issue.id
+ LEFT OUTER JOIN issue_isp ii FORCE INDEX(issueIdIndex) ON ii.issue_id = issue.id
+ LEFT OUTER JOIN issue_hosting ih FORCE INDEX(issueIdIndex) ON ih.issue_id = issue.id
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as attachedFileCount FROM attached_file GROUP BY issue_id)
temp_attached_file on (temp_attached_file.issue_id = issue.id)
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
temp_issue_comment on (temp_issue_comment.issue_id = issue.id)
- LEFT OUTER JOIN user user ON issue_user.user_id = user.id
WHERE 1=1
<if test="keyWord != null and !keyWord.equals('') ">
AND (issue.title like CONCAT('%',#{keyWord},'%')
@@ -249,337 +248,9 @@
</if>
</select>
- <!--<select id="findByDepartment" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
- SELECT
- DISTINCT issue.id as id,
- issue.register_id as registerId,
- issue.reverse_index as reverseIndex,
- issue.title as title,
- issue.description as description,
- issue.parent_issue_id as parentIssueId,
- issue.start_date as startDate,
- issue.complete_date as completeDate,
- issue.issue_number as issueNumber,
- issue.register_date as registerDate,
- SUBSTRING(issue.modify_date, 1, 19) as modifyDate,
- project.id as projectId,
- project.name as projectName,
- project.project_key as projectKey,
- issue_type.id as issueTypeId,
- issue_type.name as issueTypeName,
- issue_status.id as issueStatusId,
- issue_status.issue_status_type as issueStatusType,
- issue_status.name as issueStatusName,
- issue_status.color as issueStatusColor,
- priority.id as priorityId,
- priority.name as priorityName,
- priority.color as priorityColor,
- severity.id as severityId,
- severity.name as severityName,
- severity.color as severityColor,
- GROUP_CONCAT(issue_custom.use_value) AS useValue,
- IFNULL(temp_attached_file.attachedFileCount, 0) as attachedFileCount,
- IFNULL(temp_issue_comment.issueCommentCount, 0) as issueCommentCount
- FROM issue issue FORCE INDEX(reverseIndex)
- INNER JOIN project project FORCE INDEX(workspaceIdIndex) ON issue.project_id = project.id
- INNER JOIN workspace workspace ON workspace.id = project.workspace_id
- INNER JOIN issue_status issue_status FORCE INDEX(PRIMARY) ON issue.issue_status_id = issue_status.id
- INNER JOIN issue_type issue_type FORCE INDEX(PRIMARY) ON issue.issue_type_id = issue_type.id
- INNER JOIN priority priority FORCE INDEX(PRIMARY) ON issue.priority_id = priority.id
- INNER JOIN severity severity FORCE INDEX(PRIMARY) ON issue.severity_id = severity.id
- INNER JOIN issue_department isd ON isd.issue_id = issue.id
- INNER JOIN user_department ud ON ud.department_id = isd.department_id
- LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON issue.id = issue_custom.issue_id
- LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as attachedFileCount FROM attached_file GROUP BY issue_id)
- temp_attached_file on (temp_attached_file.issue_id = issue.id)
- LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
- temp_issue_comment on (temp_issue_comment.issue_id = issue.id)
- WHERE 1=1
- <if test="keyWord != null and !keyWord.equals('')">
- AND issue.title like CONCAT('%',#{keyWord},'%')
- OR issue.description like CONCAT('%',#{keyWord},'%')
- OR issue.start_date like CONCAT('%',#{keyWord},'%')
- OR issue.complete_date like CONCAT('%',#{keyWord},'%')
- OR issue.issue_number like CONCAT('%',#{keyWord},'%')
- OR issue.register_date like CONCAT('%',#{keyWord},'%')
- OR project.name like CONCAT('%',#{keyWord},'%')
- OR project.project_key like CONCAT('%',#{keyWord},'%')
- OR issue_type.name like CONCAT('%',#{keyWord},'%')
- OR issue_status.issue_status_type like CONCAT('%',#{keyWord},'%')
- OR issue_status.name like CONCAT('%',#{keyWord},'%')
- OR priority.name like CONCAT('%',#{keyWord},'%')
- OR severity.name like CONCAT('%',#{keyWord},'%')
- OR issue_custom.use_value like CONCAT('%',#{keyWord},'%')
- </if>
-
- <if test="title != null and !title.equals('')">
- AND issue.title like CONCAT('%',#{title},'%')
- </if>
-
- <if test="description != null and !description.equals('')">
- AND issue.description like CONCAT('%',#{description},'%')
- </if>
-
- <if test="issueNumber != null and !issueNumber.equals('')">
- AND issue.issue_number = #{issueNumber}
- </if>
-
- <if test="beginRegisterDate != null and !beginRegisterDate.equals('')">
- ANd issue.register_date >= #{beginRegisterDate}
- </if>
-
- <if test="endRegisterDate != null and !endRegisterDate.equals('')">
- ANd issue.register_date <![CDATA[ <= ]]> #{endRegisterDate}
- </if>
-
- <if test="beginStartDate != null and !beginStartDate.equals('')">
- ANd issue.start_date >= #{beginStartDate}
- </if>
-
- <if test="endStartDate != null and !endStartDate.equals('')">
- ANd issue.start_date <![CDATA[ <= ]]> #{endStartDate}
- </if>
-
- <if test="beginCompleteDate != null and !beginCompleteDate.equals('')">
- ANd issue.complete_date >= #{beginCompleteDate}
- </if>
-
- <if test="endCompleteDate != null and !endCompleteDate.equals('')">
- ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
- </if>
-
- <if test="hideIssue != null and hideIssue == true">
- AND issue_status.issue_status_type != 'CLOSE'
- </if>
-
- <choose>
- <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
- AND isd.department_id IN
- <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- <otherwise>
- AND 1 != 1
- </otherwise>
- </choose>
-
- <choose>
- <when test="projectIds.size != 0">
- AND project.id IN
- <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="issueStatusIds.size != 0">
- AND issue_status.id IN
- <foreach collection="issueStatusIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="issueTypeIds.size != 0">
- AND issue_type.id IN
- <foreach collection="issueTypeIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="priorityIds.size != 0">
- AND priority.id IN
- <foreach collection="priorityIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="severityIds.size != 0">
- AND severity.id IN
- <foreach collection="severityIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="registerIds.size != 0">
- AND issue.register_id IN
- <foreach collection="registerIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="issueIds.size != 0">
- AND issue.id IN
- <foreach collection="issueIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- <choose>
- <when test="excludeIds.size != 0">
- AND issue.id NOT IN
- <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- AND issue.parent_issue_id IS NULL
- AND issue.reverse_index <![CDATA[ < ]]> 0
- AND workspace.id = #{workspaceId}
- GROUP BY issue.id
- ORDER BY issue.modify_date DESC
- <if test="page != null and !page.equals('')">
- limit #{pageSize} offset #{page};
- </if>
- </select>-->
-
- <!--<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
- SELECT
- COUNT(DISTINCT issue.id)
- FROM issue issue
- LEFT OUTER JOIN issue_user issue_user ON issue.id = issue_user.issue_id
- WHERE 1=1
- AND issue.parent_issue_id IS NULL
- <if test="title != null and !title.equals('') ">
- AND issue.title like CONCAT('%',#{title},'%')
- </if>
-
- <if test="description != null and !description.equals('')">
- AND issue.description like CONCAT('%',#{description},'%')
- </if>
-
- <if test="issueNumber != null and !issueNumber.equals('')">
- AND issue.issue_number = #{issueNumber}
- </if>
-
- <if test="beginRegisterDate != null and !beginRegisterDate.equals('')">
- ANd issue.register_date >= #{beginRegisterDate}
- </if>
-
- <if test="endRegisterDate != null and !endRegisterDate.equals('')">
- ANd issue.register_date <![CDATA[ <= ]]> #{endRegisterDate}
- </if>
-
- <if test="beginStartDate != null and !beginStartDate.equals('')">
- ANd issue.start_date >= #{beginStartDate}
- </if>
-
- <if test="endStartDate != null and !endStartDate.equals('')">
- ANd issue.start_date <![CDATA[ <= ]]> #{endStartDate}
- </if>
-
- <if test="beginCompleteDate != null and !beginCompleteDate.equals('')">
- ANd issue.complete_date >= #{beginCompleteDate}
- </if>
-
- <if test="endCompleteDate != null and !endCompleteDate.equals('')">
- ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
- </if>
-
- <choose>
- <when test="projectIds.size != 0">
- AND issue.project_id IN
- <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="issueStatusIds.size != 0">
- AND issue.issue_status_id IN
- <foreach collection="issueStatusIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="issueTypeIds.size != 0">
- AND issue.issue_type_id IN
- <foreach collection="issueTypeIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="priorityIds.size != 0">
- AND issue.priority_id IN
- <foreach collection="priorityIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="severityIds.size != 0">
- AND issue.severity_id IN
- <foreach collection="severityIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="userIds.size != 0">
- AND issue_user.user_id IN
- <foreach collection="userIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="departmentIds.size != 0">
- AND issue_department.department_id IN
- <foreach collection="departmentIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="registerIds.size != 0">
- AND issue.register_id IN
- <foreach collection="registerIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
-
- <choose>
- <when test="issueIds.size != 0">
- AND issue.id IN
- <foreach collection="issueIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- <choose>
- <when test="excludeIds.size != 0">
- AND issue.id NOT IN
- <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- </select>-->
-
<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- COUNT(DISTINCT issue.id)
+ COUNT(issue.id)
FROM issue issue
INNER JOIN project project FORCE INDEX(workspaceIdIndex) ON issue.project_id = project.id
INNER JOIN workspace workspace ON workspace.id = project.workspace_id
@@ -592,14 +263,13 @@
LEFT OUTER JOIN issue_user issue_user FORCE INDEX(issueIdIndex) ON issue.id = issue_user.issue_id
LEFT OUTER JOIN user_department ud ON ud.department_id = isd.department_id
LEFT OUTER JOIN department d ON d.id = isd.department_id
- LEFT OUTER JOIN issue_company ic ON ic.issue_id = issue.id
- LEFT OUTER JOIN issue_isp ii ON ii.issue_id = issue.id
- LEFT OUTER JOIN issue_hosting ih ON ih.issue_id = issue.id
+ LEFT OUTER JOIN issue_company ic USE index(issueIdIndex) ON ic.issue_id = issue.id
+ LEFT OUTER JOIN issue_isp ii USE INDEX(issueIdIndex) ON ii.issue_id = issue.id
+ LEFT OUTER JOIN issue_hosting ih USE index(issueIdIndex) ON ih.issue_id = issue.id
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as attachedFileCount FROM attached_file GROUP BY issue_id)
temp_attached_file on (temp_attached_file.issue_id = issue.id)
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
temp_issue_comment on (temp_issue_comment.issue_id = issue.id)
- LEFT OUTER JOIN user user ON issue_user.user_id = user.id
WHERE 1=1
<if test="keyWord != null and !keyWord.equals('') ">
AND (issue.title like CONCAT('%',#{keyWord},'%')
--
Gitblit v1.8.0