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 2016/11/29 22:03:34 UTC
lucene-solr:jira/solr-6203: SOLR-6203: starting working branch
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-6203 [created] 859eb0837
SOLR-6203: starting working branch
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/859eb083
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/859eb083
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/859eb083
Branch: refs/heads/jira/solr-6203
Commit: 859eb0837f52d131924ce8401c4ae1dc3056b7de
Parents: a7fa920
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Nov 29 22:42:51 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Nov 29 22:42:51 2016 +0100
----------------------------------------------------------------------
.../shardresultserializer/SearchGroupsResultTransformer.java | 2 ++
.../distributed/shardresultserializer/ShardResultTransformer.java | 1 +
.../shardresultserializer/TopGroupsResultTransformer.java | 3 +++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/859eb083/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 213414a..7b8aad8 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
@@ -77,6 +77,7 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
*/
@Override
public Map<String, SearchGroupsFieldCommandResult> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard) {
+//public Map<String, SearchGroupsFieldCommandResult> transformToNative(NamedList<NamedList> shardResponse, SortSpec groupSortSpec, SortSpec sortSpecWithinGroup, String shard) {
final Map<String, SearchGroupsFieldCommandResult> result = new HashMap<>(shardResponse.size());
for (Map.Entry<String, NamedList> command : shardResponse) {
List<SearchGroup<BytesRef>> searchGroups = new ArrayList<>();
@@ -108,6 +109,7 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
}
private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, Sort groupSort) {
+//private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SortSpec groupSortSpec) {
final NamedList<Object[]> result = new NamedList<>(data.size());
for (SearchGroup<BytesRef> searchGroup : data) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/859eb083/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java
index 04a3dfc..3a026ca 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java
@@ -49,5 +49,6 @@ public interface ShardResultTransformer<T, R> {
* @return native structure of the data
*/
R transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard);
+//R transformToNative(NamedList<NamedList> shardResponse, SortSpec groupSortSpec, SortSpec sortSpecWithinGroup, String shard);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/859eb083/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
index 37e837e..b93f9a0 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
@@ -90,6 +90,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
*/
@Override
public Map<String, ?> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard) {
+//public Map<String, ?> transformToNative(NamedList<NamedList> shardResponse, SortSpec groupSortSpec, SortSpec sortSpecWithinGroup, String shard) {
Map<String, Object> result = new HashMap<>();
final IndexSchema schema = rb.req.getSearcher().getSchema();
@@ -233,6 +234,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
}
}
convertedSortValues[j] = sortValue;
+ //convertedSortValues[j] = aNewStaticMethod(j, rb.getGroupingSpec().getSortSpecWithinGroup(), fieldDoc.fields);
}
document.add("sortValues", convertedSortValues);
}
@@ -284,6 +286,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
}
}
convertedSortValues[j] = sortValue;
+ //convertedSortValues[j] = aNewStaticMethod(j, rb.getGroupingSpec().getGroupSortSpec(), fieldDoc.fields);
}
document.add("sortValues", convertedSortValues);
}