commit 5d1a9226fc4091af791bc789f2ed2cc56277daf0
author David Pursehouse <dpursehouse@collab.net> Tue Mar 12 01:18:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 12 01:18:50 2019 +0000
tree e32fe1b85a25946f64983f3d6fcdb2aa18d6de20
parent 17329c7629986eeb8e40ff83e2ba1202ca717f0f
parent 19cfe23e3755cd24aa1ec08766b3f3c6c67a2665

Merge "Fix support for "SystemVerilog"" into stable-2.16

java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java

diff --git a/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
index 1b69b6d..d0b70ae 100644
--- a/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
+++ b/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
@@ -93,8 +93,7 @@
   public DataSource<AccountState> getSource(Predicate<AccountState> p, QueryOptions opts)
       throws QueryParseException {
     JsonArray sortArray = getSortArray(AccountField.ID.getName());
-    return new ElasticQuerySource(
-        p, opts.filterFields(IndexUtils::accountFields), ACCOUNTS, sortArray);
+    return new ElasticQuerySource(p, opts.filterFields(IndexUtils::accountFields), type, sortArray);
   }
 
   @Override

java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java

diff --git a/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
index f694a05..e74f208 100644
--- a/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
+++ b/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
@@ -91,7 +91,7 @@
   public DataSource<InternalGroup> getSource(Predicate<InternalGroup> p, QueryOptions opts)
       throws QueryParseException {
     JsonArray sortArray = getSortArray(GroupField.UUID.getName());
-    return new ElasticQuerySource(p, opts.filterFields(IndexUtils::groupFields), GROUPS, sortArray);
+    return new ElasticQuerySource(p, opts.filterFields(IndexUtils::groupFields), type, sortArray);
   }
 
   @Override