svn commit: r1672532 - in /lucene/dev/trunk: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/schema/BBoxField.java solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java

[ry...@apache.org]

Author: ryan
Date: Fri Apr 10 03:37:50 2015
New Revision: 1672532

URL: http://svn.apache.org/r1672532
Log:
Merged revision(s) 1672518 from lucene/dev/branches/branch_5x:
SOLR-7164: update lucene field also
........

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/solr/   (props changed)
    lucene/dev/trunk/solr/core/   (props changed)
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BBoxField.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BBoxField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BBoxField.java?rev=1672532&r1=1672531&r2=1672532&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BBoxField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BBoxField.java Fri Apr 10 03:37:50 2015
@@ -139,6 +139,8 @@ public class BBoxField extends AbstractS
     final SchemaField solrNumField = new SchemaField("_", numberType);//dummy temp
     org.apache.lucene.document.FieldType luceneType =
         (org.apache.lucene.document.FieldType) solrNumField.createField(0.0, 1.0f).fieldType();
+    luceneType.setStored(storeSubFields);
+    
     //and annoyingly this Field isn't going to have a docValues format because Solr uses a separate Field for that
     if (solrNumField.hasDocValues()) {
       luceneType = new org.apache.lucene.document.FieldType(luceneType);

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java?rev=1672532&r1=1672531&r2=1672532&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java Fri Apr 10 03:37:50 2015
@@ -382,6 +382,11 @@ public class TestSolr4Spatial extends So
       // Make sure the subfields are not stored
       SchemaField sub = schema.getField("bbox"+BBoxStrategy.SUFFIX_MINX);
       assertFalse(sub.stored());
+
+      // Make sure solr field type is also not stored
+      BBoxField bbox = (BBoxField)schema.getField("bbox").getType();
+      BBoxStrategy strategy = bbox.getStrategy("bbox");
+      assertFalse(strategy.getFieldType().stored());
     }
   }