Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D29CB10808 for ; Fri, 10 Apr 2015 03:37:51 +0000 (UTC) Received: (qmail 21539 invoked by uid 500); 10 Apr 2015 03:37:51 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 21530 invoked by uid 99); 10 Apr 2015 03:37:51 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 03:37:51 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 7816BAC019D for ; Fri, 10 Apr 2015 03:37:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Fri, 10 Apr 2015 03:37:51 -0000 To: commits@lucene.apache.org From: ryan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150410033751.7816BAC019D@hades.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()); } }