You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/01/17 19:10:33 UTC
svn commit: r1652651 - in /lucene/dev/branches/lucene_solr_5_0/solr: ./
core/src/java/org/apache/solr/update/processor/
server/solr/configsets/data_driven_schema_configs/conf/
solrj/src/test/org/apache/solr/client/solrj/
Author: noble
Date: Sat Jan 17 18:10:33 2015
New Revision: 1652651
URL: http://svn.apache.org/r1652651
Log:
reverting SOLR-6937
Removed:
lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java
Modified:
lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt
lucene/dev/branches/lucene_solr_5_0/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
lucene/dev/branches/lucene_solr_5_0/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java
Modified: lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt?rev=1652651&r1=1652650&r2=1652651&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/CHANGES.txt Sat Jan 17 18:10:33 2015
@@ -260,8 +260,6 @@ New Features
* SOLR-6581: Efficient DocValues support and numeric collapse field implementations
for Collapse and Expand (Joel Bernstein)
-* SOLR-6937: In schemaless mode ,replace spaces and special characters with underscore (Noble Paul)
-
* SOLR-5147: Support child documents in DIH
(Vadim Kirilchuk, Shawn Heisey, Thomas Champagne, Mikhail Khludnev via Noble Paul)
Modified: lucene/dev/branches/lucene_solr_5_0/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml?rev=1652651&r1=1652650&r2=1652651&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml Sat Jan 17 18:10:33 2015
@@ -1324,10 +1324,6 @@
<processor class="solr.LogUpdateProcessorFactory"/>
<processor class="solr.DistributedUpdateProcessorFactory"/>
<processor class="solr.RemoveBlankFieldUpdateProcessorFactory"/>
- <processor class="solr.FieldNameMutatingUpdateProcessorFactory">
- <str name="pattern">[^\w-\.]</str>
- <str name="replacement">_</str>
- </processor>
<processor class="solr.ParseBooleanFieldUpdateProcessorFactory"/>
<processor class="solr.ParseLongFieldUpdateProcessorFactory"/>
<processor class="solr.ParseDoubleFieldUpdateProcessorFactory"/>
Modified: lucene/dev/branches/lucene_solr_5_0/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java?rev=1652651&r1=1652650&r2=1652651&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java Sat Jan 17 18:10:33 2015
@@ -25,8 +25,6 @@ import org.apache.http.entity.InputStrea
import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
import org.apache.solr.client.solrj.impl.BinaryResponseParser;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
import org.apache.solr.util.ExternalPaths;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,11 +34,7 @@ import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.OutputStreamWriter;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
import java.util.Properties;
-import java.util.Set;
public class SolrSchemalessExampleTest extends SolrExampleTestsBase {
private static Logger log = LoggerFactory.getLogger(SolrSchemalessExampleTest.class);
@@ -89,46 +83,6 @@ public class SolrSchemalessExampleTest e
assertNumFound("*:*", 2);
}
- @Test
- public void testFieldMutating() throws Exception {
- HttpSolrClient client = (HttpSolrClient) getSolrClient();
- client.deleteByQuery("*:*");
- client.commit();
- assertNumFound("*:*", 0); // make sure it got in
- // two docs, one with uniqueKey, another without it
- String json = "{\"name one\": \"name\"} " +
- "{\"name two\" : \"name\"}" +
- "{\"first-second\" : \"name\"}" +
- "{\"x+y\" : \"name\"}" +
- "{\"p%q\" : \"name\"}" +
- "{\"p.q\" : \"name\"}" +
- "{\"a&b\" : \"name\"}"
- ;
- HttpClient httpClient = client.getHttpClient();
- HttpPost post = new HttpPost(client.getBaseURL() + "/update/json/docs");
- post.setHeader("Content-Type", "application/json");
- post.setEntity(new InputStreamEntity(new ByteArrayInputStream(json.getBytes("UTF-8")), -1));
- HttpResponse response = httpClient.execute(post);
- assertEquals(200, response.getStatusLine().getStatusCode());
- client.commit();
- List<String> expected = Arrays.asList(
- "name_one",
- "name__two",
- "first-second",
- "a_b",
- "p_q",
- "p.q",
- "x_y");
- HashSet set = new HashSet();
- QueryResponse rsp = assertNumFound("*:*", expected.size());
- for (SolrDocument doc : rsp.getResults()) set.addAll(doc.getFieldNames());
- for (String s : expected) {
- assertTrue(s+" not created "+ rsp ,set.contains(s) );
- }
-
- }
-
-
@Override
public SolrClient createNewSolrClient() {