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/02/24 21:20:33 UTC
[50/50] [abbrv] lucene-solr:jira/solr-6203: SOLR-6203: post merge
follow-ups
SOLR-6203: post merge follow-ups
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2cd3f71d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2cd3f71d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2cd3f71d
Branch: refs/heads/jira/solr-6203
Commit: 2cd3f71d1b86ccff38c35ccedbd729ff0fc25fb5
Parents: af74958
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 24 19:30:15 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 24 21:07:25 2017 +0000
----------------------------------------------------------------------
.../solr/handler/component/QueryComponent.java | 4 +--
.../apache/solr/search/grouping/Command.java | 9 ------
.../solr/search/grouping/CommandHandler.java | 4 +--
.../distributed/command/QueryCommand.java | 7 -----
.../command/SearchGroupsFieldCommand.java | 8 ------
.../command/TopGroupsFieldCommand.java | 6 ----
.../SearchGroupShardResponseProcessor.java | 1 -
.../SearchGroupsResultTransformer.java | 24 ++--------------
.../ShardResultTransformer.java | 1 -
.../TopGroupsResultTransformer.java | 30 +++-----------------
...DistributedQueryComponentCustomSortTest.java | 1 -
11 files changed, 9 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 57a913d..2050685 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -669,9 +669,7 @@ public class QueryComponent extends SearchComponent
leafComparator.setScorer(new FakeScorer(doc, score));
leafComparator.copy(0, doc);
Object val = comparator.value(0);
- if (null != ft) {
- val = ft.marshalSortValue(val);
- }
+ if (null != ft) val = ft.marshalSortValue(val);
vals[position] = val;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/java/org/apache/solr/search/grouping/Command.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/Command.java b/solr/core/src/java/org/apache/solr/search/grouping/Command.java
index 0fb4ec6..1bba7fc 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/Command.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/Command.java
@@ -58,15 +58,6 @@ public interface Command<T> {
*/
Sort getGroupSort();
-
-
- @Deprecated
- /**
- * @return The sort inside a group
- */
- Sort getSortWithinGroup();
-
-
/**
* @return The sort inside a group
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
index 2dd2291..8ba0a6a 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
@@ -174,9 +174,9 @@ public class CommandHandler {
final AllGroupHeadsCollector allGroupHeadsCollector;
if (fieldType.getNumberType() != null) {
ValueSource vs = fieldType.getValueSource(sf, null);
- allGroupHeadsCollector = new FunctionAllGroupHeadsCollector(vs, new HashMap(), firstCommand.getSortWithinGroup());
+ allGroupHeadsCollector = new FunctionAllGroupHeadsCollector(vs, new HashMap(), firstCommand.getWithinGroupSort());
} else {
- allGroupHeadsCollector = TermAllGroupHeadsCollector.create(firstCommand.getKey(), firstCommand.getSortWithinGroup());
+ allGroupHeadsCollector = TermAllGroupHeadsCollector.create(firstCommand.getKey(), firstCommand.getWithinGroupSort());
}
if (collectors.isEmpty()) {
searchWithTimeLimiter(query, filter, allGroupHeadsCollector);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
index c23c7de..a98533f 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
@@ -149,13 +149,6 @@ public class QueryCommand implements Command<QueryCommandResult> {
return sort;
}
- @Deprecated
- @Override
- public Sort getSortWithinGroup() {
- return null;
- }
-
-
@Override
public Sort getWithinGroupSort() {
return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java
index 568b1f3..35da60a 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java
@@ -148,19 +148,11 @@ public class SearchGroupsFieldCommand implements Command<SearchGroupsFieldComman
return new SearchGroupsFieldCommandResult(groupCount, topGroups);
}
- @Deprecated
- @Override
- public Sort getSortWithinGroup() {
- return null;
- }
-
-
@Override
public Sort getWithinGroupSort() {
return null;
}
-
@Override
public Sort getGroupSort() {
return groupSortSpec.getSort();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
index 6ab6cdf..ffdd7f1 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
@@ -191,12 +191,6 @@ public class TopGroupsFieldCommand implements Command<TopGroups<BytesRef>> {
return groupSortSpec.getSort();
}
- @Deprecated
- @Override
- public Sort getSortWithinGroup() {
- return getWithinGroupSort();
- }
-
@Override
public Sort getWithinGroupSort() {
return withinGroupSortSpec.getSort();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
index f1d2a5a..5e7c95d 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.search.Sort;
import org.apache.lucene.search.grouping.SearchGroup;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.client.solrj.SolrServerException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/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 036a216..9c08406 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
@@ -16,7 +16,6 @@
*/
package org.apache.solr.search.grouping.distributed.shardresultserializer;
-import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.grouping.SearchGroup;
import org.apache.lucene.util.BytesRef;
@@ -79,11 +78,9 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
@Override
public Map<String, SearchGroupsFieldCommandResult> transformToNative(NamedList<NamedList> shardResponse, SortSpec groupSortSpec, SortSpec withinGroupSortSpec, String shard) {
final Map<String, SearchGroupsFieldCommandResult> result = new HashMap<>(shardResponse.size());
- final Sort groupSort = groupSortSpec.getSort();
final List<SchemaField> groupSchemaFields = groupSortSpec.getSchemaFields();
- final SortField[] groupSortFields = groupSort.getSort();
- boolean convertFromNative = false;
+ final SortField[] groupSortFields = groupSortSpec.getSort().getSort();
assert (groupSchemaFields.size() == groupSortFields.length);
@@ -113,10 +110,8 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SortSpec groupSortSpec) {
final NamedList<Object[]> result = new NamedList<>(data.size());
- final Sort groupSort = groupSortSpec.getSort();
final List<SchemaField> groupSchemaFields = groupSortSpec.getSchemaFields();
- final SortField[] groupSortFields = groupSort.getSort();
- boolean convertFromNative = true;
+ final SortField[] groupSortFields = groupSortSpec.getSort().getSort();
assert (groupSchemaFields.size() == groupSortFields.length);
@@ -132,19 +127,4 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
return result;
}
- private static Object convertSortValue(SchemaField schemaField, Object origValue, boolean convertFromNative) {
-
- Object sortValue = origValue;
- if (schemaField != null && sortValue != null) {
-
- FieldType fieldType = schemaField.getType();
- if (convertFromNative) {
- sortValue = fieldType.marshalSortValue(sortValue);
- } else {
- sortValue = fieldType.unmarshalSortValue(sortValue);
- }
- }
- return sortValue;
- }
-
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/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 bf69a47..1eb69ba 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
@@ -16,7 +16,6 @@
*/
package org.apache.solr.search.grouping.distributed.shardresultserializer;
-import org.apache.lucene.search.Sort;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.SortSpec;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/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 f39696b..d3daee1 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
@@ -37,7 +37,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.handler.component.ResponseBuilder;
import org.apache.solr.handler.component.ShardDoc;
-import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SortSpec;
@@ -159,11 +158,9 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
protected ScoreDoc[] transformToNativeShardDoc(List<NamedList<Object>> documents, SortSpec sortSpec, String shard,
IndexSchema schema) {
ScoreDoc[] scoreDocs = new ScoreDoc[documents.size()];
- Sort sort = sortSpec.getSort();
final List<SchemaField> schemaFields = sortSpec.getSchemaFields();
- final SortField[] sortFields = sort.getSort();
- boolean convertFromNative = false;
+ final SortField[] sortFields = sortSpec.getSort().getSort();
assert (schemaFields.size() == sortFields.length);
@@ -210,10 +207,8 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
SchemaField uniqueField = schema.getUniqueKeyField();
final SortSpec withinGroupSortSpec = rb.getGroupingSpec().getWithinGroupSortSpec();
- final Sort withinGroupSort = withinGroupSortSpec.getSort();
final List<SchemaField> withinGroupSchemaFields = withinGroupSortSpec.getSchemaFields();
- final SortField[] withinGroupSortFields = withinGroupSort.getSort();
- boolean convertFromNative = true;
+ final SortField[] withinGroupSortFields = withinGroupSortSpec.getSort().getSort();
assert (withinGroupSchemaFields.size() == withinGroupSortFields.length);
@@ -244,7 +239,7 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
Object[] convertedSortValues = new Object[fieldDoc.fields.length];
for (int j = 0; j < fieldDoc.fields.length; j++) {
- convertedSortValues[j] = convertSortValue(withinGroupSchemaFields.get(j), fieldDoc.fields[j], convertFromNative);
+ convertedSortValues[j] = ShardResultTransformerUtils.marshalSortValue(fieldDoc.fields[j], withinGroupSchemaFields.get(j));
}
document.add("sortValues", convertedSortValues);
}
@@ -271,10 +266,8 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
SchemaField uniqueField = schema.getUniqueKeyField();
final SortSpec groupSortSpec = rb.getGroupingSpec().getGroupSortSpec();
- final Sort groupSort = groupSortSpec.getSort();
final List<SchemaField> groupSchemaFields = groupSortSpec.getSchemaFields();
- final SortField[] groupSortFields = groupSort.getSort();
- boolean convertFromNative = true;
+ final SortField[] groupSortFields = groupSortSpec.getSort().getSort();
assert (groupSchemaFields.size() == groupSortFields.length);
@@ -308,19 +301,4 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
return visitor.getDocument();
}
- private static Object convertSortValue(SchemaField schemaField, Object origValue, boolean convertFromNative) {
-
- Object sortValue = origValue;
- if (schemaField != null && sortValue != null) {
-
- FieldType fieldType = schemaField.getType();
- if (convertFromNative) {
- sortValue = fieldType.marshalSortValue(sortValue);
- } else {
- sortValue = fieldType.unmarshalSortValue(sortValue);
- }
- }
- return sortValue;
- }
-
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cd3f71d/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
index fc8ec74..7ce171c 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
@@ -19,7 +19,6 @@ package org.apache.solr.handler.component;
import java.util.List;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.BaseDistributedSearchTestCase;