[SOLR-9783] remove no-longer-needed sortWithinGroup null checks in (Search|Top)Group[s]ShardResponseProcessor

• Type: Task
• Status: Resolved
• Priority: Minor
• Resolution: Fixed
• Fix Version/s: 6.4, 7.0
• Assignee: Christine Poerschke
• Reporter: Christine Poerschke
• Created: 19/Nov/16 18:26
• Updated: 08/Jun/19 15:34
• Resolved: 07/Dec/16 10:17

Description

Why this, why now? I was looking some more at SOLR-6203 and what the next sub-step after the SOLR-9660 sub-step might be. Revisiting Judith's SOLR-6203 README file, the step (1) is included in SOLR-9660 and step (2) mentions passing around SortSpecs rather than plain Sorts, with Search and TopGroups ShardResponseProcessor amongst the files affected. In principle the change for those two files should be straightforward i.e.

  ...
- Sort sortWithinGroup = rb.getGroupingSpec().getSortWithinGroup();
+ SortSpec sortSpecWithinGroup = rb.getGroupingSpec().getSortSpecWithinGroup();
  ...

except that both starting points are

  Sort sortWithinGroup = rb.getGroupingSpec().getSortWithinGroup();
  if (sortWithinGroup == null) { // TODO prevent it from being null in the first place
    sortWithinGroup = Sort.RELEVANCE;
  }

and so this ticket here aims to get rid of the two 'TODO' statements. The statements were added as part of LUCENE-6900's https://svn.apache.org/viewvc?view=revision&revision=1716569 in November 2015 and Judith's original SOLR-6203.patch is from October 2015 i.e. slightly before then.

dsmiley - do you recall anything re: when/how sortWithinGroup could be null back then? From my reading of the current (master) code the sortWithinGroup would never be null now. solr/core tests pass when the if statements are removed (will attach patch and also run the non-core solr tests) but that could of course just be due to lacking test coverage.

And unrelated but noticed whilst in the code area, the patch includes a

+ ... || sort == Sort.RELEVANCE) {
- ... || sort.equals(Sort.RELEVANCE)) {

tweak to QueryCommand.java also.

Issue Links

• is related to: SOLR-6203 cast exception while searching with sort function and result grouping
• is related to: LUCENE-6900 Grouping sortWithinGroup should use Sort.RELEVANCE to indicate that, not null
• is related to: SOLR-9660 in GroupingSpecification factor [group](sort|offset|limit) into [group](sortSpec)