You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/03/30 17:25:42 UTC
[73/73] [abbrv] lucene-solr:jira/solr-6203: resolve
SearchGroupsResultTransformer merge conflict
resolve SearchGroupsResultTransformer merge conflict
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/caed03da
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/caed03da
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/caed03da
Branch: refs/heads/jira/solr-6203
Commit: caed03da40ae9ba2795846add2c14588a97ea78d
Parents: 770265f
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Mar 30 17:26:28 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Mar 30 17:26:28 2017 +0100
----------------------------------------------------------------------
.../SearchGroupsResultTransformer.java | 25 +-------------------
1 file changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/caed03da/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
index bb2d821..3310141 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
@@ -59,13 +59,7 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
final SearchGroupsFieldCommandResult fieldCommandResult = fieldCommand.result();
final Collection<SearchGroup<BytesRef>> searchGroups = fieldCommandResult.getSearchGroups();
if (searchGroups != null) {
-<<<<<<< HEAD
- commandResult.add(TOP_GROUPS, serializeSearchGroup(searchGroups, fieldCommand.getGroupSortSpec()));
-||||||| merged common ancestors
- commandResult.add(TOP_GROUPS, serializeSearchGroup(searchGroups, fieldCommand.getGroupSort()));
-=======
commandResult.add(TOP_GROUPS, serializeSearchGroup(searchGroups, fieldCommand));
->>>>>>> master
}
final Integer groupedCount = fieldCommandResult.getGroupCount();
if (groupedCount != null) {
@@ -125,15 +119,9 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
return result;
}
-<<<<<<< HEAD
-
- private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SortSpec groupSortSpec) {
-||||||| merged common ancestors
- private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, Sort groupSort) {
-=======
private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SearchGroupsFieldCommand command) {
->>>>>>> master
final NamedList<Object[]> result = new NamedList<>(data.size());
+ final SortSpec groupSortSpec = command.getGroupSortSpec();
final List<SchemaField> groupSchemaFields = groupSortSpec.getSchemaFields();
final SortField[] groupSortFields = groupSortSpec.getSort().getSort();
@@ -142,18 +130,7 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
for (SearchGroup<BytesRef> searchGroup : data) {
Object[] convertedSortValues = new Object[searchGroup.sortValues.length];
for (int i = 0; i < searchGroup.sortValues.length; i++) {
-<<<<<<< HEAD
convertedSortValues[i] = ShardResultTransformerUtils.marshalSortValue(searchGroup.sortValues[i], groupSchemaFields.get(i));
-||||||| merged common ancestors
- Object sortValue = searchGroup.sortValues[i];
- SchemaField field = groupSort.getSort()[i].getField() != null ? searcher.getSchema().getFieldOrNull(groupSort.getSort()[i].getField()) : null;
- convertedSortValues[i] = ShardResultTransformerUtils.marshalSortValue(sortValue, field);
-=======
- Object sortValue = searchGroup.sortValues[i];
- SchemaField field = command.getGroupSort().getSort()[i].getField() != null ?
- searcher.getSchema().getFieldOrNull(command.getGroupSort().getSort()[i].getField()) : null;
- convertedSortValues[i] = ShardResultTransformerUtils.marshalSortValue(sortValue, field);
->>>>>>> master
}
SchemaField field = searcher.getSchema().getFieldOrNull(command.getKey());
String groupValue = searchGroup.groupValue != null ? field.getType().indexedToReadable(searchGroup.groupValue, new CharsRefBuilder()).toString() : null;