You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/03/27 18:05:07 UTC
svn commit: r1582403 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/schema/
solr/core/src/test-files/solr/collection1/conf/
solr/core/src/test/org/apache/solr/schema/
Author: mikemccand
Date: Thu Mar 27 17:05:05 2014
New Revision: 1582403
URL: http://svn.apache.org/r1582403
Log:
SOLR-5915: get parserImpl=XXX working for PreAnalyzedField
Added:
lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
- copied unchanged from r1582397, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1582403&r1=1582402&r2=1582403&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Mar 27 17:05:05 2014
@@ -114,6 +114,9 @@ Bug Fixes
* SOLR-5893: On restarting overseer designate , move itself to front of the queue (Noble Paul)
+* SOLR-5915: Attempts to specify the parserImpl for
+ solr.PreAnalyzedField fieldtype failed. (Mike McCandless)
+
Optimizations
----------------------
* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java?rev=1582403&r1=1582402&r2=1582403&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java Thu Mar 27 17:05:05 2014
@@ -78,6 +78,7 @@ public class PreAnalyzedField extends Fi
parser = new JsonPreAnalyzedParser();
}
}
+ args.remove(PARSER_IMPL);
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java?rev=1582403&r1=1582402&r2=1582403&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java Thu Mar 27 17:05:05 2014
@@ -72,7 +72,7 @@ public class PreAnalyzedFieldTest extend
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig.xml","schema.xml");
+ initCore("solrconfig-minimal.xml","schema-preanalyzed.xml");
}
@Override
@@ -101,6 +101,12 @@ public class PreAnalyzedFieldTest extend
}
}
}
+
+ @Test
+ public void testValidSimple2() {
+ assertU(adoc("id", "1",
+ "pre", "{\"v\":\"1\",\"str\":\"document one\",\"tokens\":[{\"t\":\"one\"},{\"t\":\"two\"},{\"t\":\"three\",\"i\":100}]}"));
+ }
@Test
public void testInvalidSimple() {