Improve performance of ES request on users

Searching for users by SCM account does not require scoring, so filters must be used instead of queries.

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java
index aa34fcf9b59e98497aeab50ff68e5e5b355f3f44..0354da4952cbf0887287834b930787d43dfbc37e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndex.java
@@ -23,6 +23,7 @@ package org.sonar.server.user.index;
 import org.elasticsearch.action.get.GetRequestBuilder;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
+import org.elasticsearch.index.query.FilterBuilders;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.sonar.api.ServerComponent;
@@ -55,10 +56,11 @@ public class UserIndex implements ServerComponent {
   public UserDoc getNullableByScmAccount(String scmAccount) {
     SearchRequestBuilder request = esClient.prepareSearch(UserIndexDefinition.INDEX)
       .setTypes(UserIndexDefinition.TYPE_USER)
-      .setQuery(QueryBuilders.boolQuery()
-        .should(QueryBuilders.termQuery(UserIndexDefinition.FIELD_LOGIN, scmAccount))
-        .should(QueryBuilders.termQuery(UserIndexDefinition.FIELD_EMAIL, scmAccount))
-        .should(QueryBuilders.termQuery(UserIndexDefinition.FIELD_SCM_ACCOUNTS, scmAccount)))
+      .setQuery(QueryBuilders.filteredQuery(QueryBuilders.matchAllQuery(),
+        FilterBuilders.boolFilter()
+          .should(FilterBuilders.termFilter(UserIndexDefinition.FIELD_LOGIN, scmAccount))
+          .should(FilterBuilders.termFilter(UserIndexDefinition.FIELD_EMAIL, scmAccount))
+          .should(FilterBuilders.termFilter(UserIndexDefinition.FIELD_SCM_ACCOUNTS, scmAccount))))
       .setSize(2);
     SearchHit[] result = request.get().getHits().getHits();
     if (result.length == 1) {