You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/03/09 03:07:23 UTC
svn commit: r1298690 - in /lucene/dev/trunk/solr/core/src:
java/org/apache/solr/search/ test/org/apache/solr/
test/org/apache/solr/cloud/ test/org/apache/solr/search/
Author: ryan
Date: Fri Mar 9 02:07:23 2012
New Revision: 1298690
URL: http://svn.apache.org/viewvc?rev=1298690&view=rev
Log:
SOLR-2712: expecting fl=score to return all fields removed in trunk
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java?rev=1298690&r1=1298689&r2=1298690&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java Fri Mar 9 02:07:23 2012
@@ -118,11 +118,6 @@ public class ReturnFields
augmenters.addTransformer( new RenameFieldsTransformer( rename ) );
}
- // Legacy behavior: "score" == "*,score"
- if( fields.size() == 1 && _wantsScore && augmenters.size() == 1 && globs.isEmpty() ) {
- _wantsAllFields = true;
- }
-
if( !_wantsAllFields ) {
if( !globs.isEmpty() ) {
// TODO??? need to fill up the fields with matching field names in the index
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java?rev=1298690&r1=1298689&r2=1298690&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java Fri Mar 9 02:07:23 2012
@@ -1127,7 +1127,7 @@ public class ConvertedLegacyTest extends
// test addition of score field
args = new HashMap<String,String>();
- args.put("fl","score ");
+ args.put("fl","score,* ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
"standard", 0, 10, args);
assertQ(req
@@ -1190,7 +1190,7 @@ public class ConvertedLegacyTest extends
,"//@maxScore = //doc/float[@name='score']"
);
args = new HashMap<String,String>();
- args.put("fl","score");
+ args.put("fl","*,score");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
"standard", 0, 0 , args);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1298690&r1=1298689&r2=1298690&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Fri Mar 9 02:07:23 2012
@@ -128,7 +128,7 @@ public class TestDistributedSearch exten
query("q","*:*", "sort","{!func}testfunc(add("+i1+",5))"+" desc");
query("q","*:*", "sort",i1+" asc");
query("q","*:*", "sort",i1+" desc", "fl","*,score");
- query("q","*:*", "sort","n_tl1 asc", "fl","score"); // test legacy behavior - "score"=="*,score"
+ query("q","*:*", "sort","n_tl1 asc", "fl","*,score");
query("q","*:*", "sort","n_tl1 desc");
handle.put("maxScore", SKIPVAL);
query("q","{!func}"+i1);// does not expect maxScore. So if it comes ,ignore it. JavaBinCodec.writeSolrDocumentList()
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1298690&r1=1298689&r2=1298690&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Fri Mar 9 02:07:23 2012
@@ -166,7 +166,7 @@ public class BasicDistributedZkTest exte
query("q","*:*", "sort",i1+" desc");
query("q","*:*", "sort",i1+" asc");
query("q","*:*", "sort",i1+" desc", "fl","*,score");
- query("q","*:*", "sort","n_tl1 asc", "fl","score"); // test legacy behavior - "score"=="*,score"
+ query("q","*:*", "sort","n_tl1 asc", "fl","*,score");
query("q","*:*", "sort","n_tl1 desc");
handle.put("maxScore", SKIPVAL);
query("q","{!func}"+i1);// does not expect maxScore. So if it comes ,ignore it. JavaBinCodec.writeSolrDocumentList()
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java?rev=1298690&r1=1298689&r2=1298690&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java Fri Mar 9 02:07:23 2012
@@ -42,7 +42,7 @@ public class TestPseudoReturnFields exte
* values of the fl param that mean all real fields and score
*/
private static String[] SCORE_AND_REAL_FIELDS = new String[] {
- "score", "score,*", "*,score"
+ "score,*", "*,score"
};
@BeforeClass