Fix rebase conflict

apache · May 28, 2019 · 173c013 · 173c013
1 parent 1ac8564
commit 173c013
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...ava/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java b/...ava/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
@@ -72,7 +72,14 @@ public void transform(Map<String, ?> result, ResponseBuilder rb, SolrDocumentSou
           SimpleOrderedMap<Object> groupResult = new SimpleOrderedMap<>();
           if (group.groupValue != null) {
             // use createFields so that fields having doc values are also supported
-            List<IndexableField> fields = groupField.createFields(group.groupValue.utf8ToString());
+            final String groupValue;
+            if (rb.getGroupingSpec().isSkipSecondGroupingStep()) {
+              groupValue = groupField.getType().indexedToReadable(group.groupValue.utf8ToString());
+            } else {
+              groupValue = group.groupValue.utf8ToString();
+            }
+            List<IndexableField> fields = groupField.createFields(groupValue);
+
             if (CollectionUtils.isNotEmpty(fields)) {
               groupResult.add("groupValue", groupFieldType.toObject(fields.get(0)));
             } else {