Merge branch 'issue-2095' of dlab/hive

from pull-request 1465 * refs/heads/issue-2095: Removed LabelSearchUtil Enhanced performance for searching with label. Reviewed-by: 이응준 <eungjun.yi@navercorp.com>
naver · Feb 10, 2015 · 1e9e200 · 1e9e200
2 parents 0a94499 + bee5790
commit 1e9e200
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 98 deletions.
diff --git a/app/controllers/IssueApp.java b/app/controllers/IssueApp.java
@@ -102,7 +102,7 @@ public static Result issues(String ownerName, String projectName, String state,
         Form<models.support.SearchCondition> issueParamForm = new Form<>(models.support.SearchCondition.class);
         models.support.SearchCondition searchCondition = issueParamForm.bindFromRequest().get();
         searchCondition.pageNum = pageNum - 1;
-        searchCondition.labelIds.addAll(LabelSearchUtil.getLabelIds(request()));
+        searchCondition.labelIds.addAll(LabelApp.getLabelIds(request()));
         searchCondition.labelIds.remove(null);
 
         // determine pjax or json when requested with XHR

diff --git a/app/controllers/LabelApp.java b/app/controllers/LabelApp.java
@@ -26,12 +26,15 @@
 import com.avaje.ebean.SqlRow;
 import controllers.annotation.AnonymousCheck;
 import models.Label;
+import org.apache.commons.lang3.StringUtils;
 import play.mvc.Controller;
 import play.mvc.Http;
 import play.mvc.Result;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static com.avaje.ebean.Expr.icontains;
 import static play.libs.Json.toJson;
@@ -113,4 +116,17 @@ public static Result categories(String query, Integer limit) {
 
         return ok(toJson(categories));
     }
+
+    public static Set<Long> getLabelIds(final Http.Request request) {
+        Set<Long> set = new HashSet<>();
+        String[] labelIds = request.queryString().get("labelIds");
+        if (labelIds != null) {
+            for (String labelId : labelIds) {
+                if(!StringUtils.isEmpty(labelId)) {
+                    set.add(Long.valueOf(labelId));
+                }
+            }
+        }
+        return set;
+    }
 }
diff --git a/app/controllers/ProjectApp.java b/app/controllers/ProjectApp.java
@@ -938,9 +938,9 @@ public static Result projects(String query, int pageNum) {
     private static Result getPagingProjects(String query, int pageNum) {
         ExpressionList<Project> el = createProjectSearchExpressionList(query);
 
-        Set<Long> labelIds = LabelSearchUtil.getLabelIds(request());
+        Set<Long> labelIds = LabelApp.getLabelIds(request());
         if (CollectionUtils.isNotEmpty(labelIds)) {
-            el.add(LabelSearchUtil.createLabelSearchExpression(el.query(), labelIds));
+            el.in("labels.id", labelIds);
         }
 
         el.orderBy("createdDate desc");

diff --git a/app/models/support/SearchCondition.java b/app/models/support/SearchCondition.java
@@ -29,13 +29,12 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import play.data.format.Formats;
-import utils.LabelSearchUtil;
 
-import javax.persistence.Transient;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static models.enumeration.ResourceType.*;
+import static models.enumeration.ResourceType.ISSUE_COMMENT;
+import static models.enumeration.ResourceType.ISSUE_POST;
 
 public class SearchCondition extends AbstractPostingApp.SearchCondition {
     public String state;
@@ -307,7 +306,7 @@ public ExpressionList<Issue> asExpressionList(Project project) {
         }
 
         if (CollectionUtils.isNotEmpty(labelIds)) {
-            el.add(LabelSearchUtil.createLabelSearchExpression(el.query(), labelIds));
+            el.in("labels.id", labelIds);
         }
 
         if (StringUtils.isNotBlank(orderBy)) {

diff --git a/app/utils/LabelSearchUtil.java b/app/utils/LabelSearchUtil.java