Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9411: Better validation of dynamic field for Schema API

This commit is contained in:
Jan Høydahl 2016-09-27 12:17:38 +02:00
parent 6b28af0c7d
commit 8046fe29e5
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -129,6 +129,8 @@ Bug Fixes
* SOLR-9330: Fix AlreadyClosedException on admin/mbeans?stats=true (Mikhail Khludnev)
* SOLR-9411: Better validation for Schema REST API add-dynamic-field (janhoy)
Optimizations
----------------------

2
solr/core/src/java/org/apache/solr/schema/SchemaManager.java
View File

@ -254,7 +254,7 @@ public class SchemaManager {
return false;
}
try {
SchemaField field = SchemaField.create(name, ft, op.getValuesExcluding(NAME, TYPE));
SchemaField field = mgr.managedIndexSchema.newDynamicField(name, type, op.getValuesExcluding(NAME, TYPE));
mgr.managedIndexSchema
= mgr.managedIndexSchema.addDynamicFields(singletonList(field), Collections.emptyMap(), false);
return true;

22
solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
View File

@ -195,6 +195,28 @@ public class TestBulkSchemaAPI extends RestTestBase {
assertNotNull("Field '" + newFieldName + "' is not in the schema", map);
}
public void testAddIllegalDynamicField() throws Exception {
RestTestHarness harness = restTestHarness;
String newFieldName = "illegal";
String payload = "{\n" +
" 'add-dynamic-field' : {\n" +
" 'name':'" + newFieldName + "',\n" +
" 'type':'string',\n" +
" 'stored':true,\n" +
" 'indexed':true\n" +
" }\n" +
" }";
String response = harness.post("/schema?wt=json", json(payload));
Map map = (Map)ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
assertNotNull(response, map.get("errors"));
map = getObj(harness, newFieldName, "dynamicFields");
assertNull(newFieldName + " illegal dynamic field should not have been added to schema", map);
}
public void testAddFieldWithExistingCatchallDynamicField() throws Exception {
RestTestHarness harness = restTestHarness;

11
solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
View File

@ -54,8 +54,8 @@ import static org.hamcrest.CoreMatchers.is;
*/
public class SchemaTest extends RestTestBase {
private static void assertValidSchemaResponse(SolrResponseBase schemaResponse) {
assertEquals(0, schemaResponse.getStatus());
assertNull(schemaResponse.getResponse().get("errors"));
assertEquals("Response contained errors: " + schemaResponse.toString(), 0, schemaResponse.getStatus());
assertNull("Response contained errors: " + schemaResponse.toString(), schemaResponse.getResponse().get("errors"));
}
private static void createStoredStringField(String fieldName, SolrClient solrClient) throws Exception {
@ -391,8 +391,7 @@ public class SchemaTest extends RestTestBase {
fieldAttributes.put("type", "string");
fieldAttributes.put("stored", false);
fieldAttributes.put("indexed", true);
fieldAttributes.put("default", "accuracy");
fieldAttributes.put("required", true);
// Dynamic fields cannot be required or have a default value
SchemaRequest.AddDynamicField addFieldUpdateSchemaRequest =
new SchemaRequest.AddDynamicField(fieldAttributes);
SchemaResponse.UpdateResponse addFieldResponse = addFieldUpdateSchemaRequest.process(getSolrClient());
@ -412,8 +411,6 @@ public class SchemaTest extends RestTestBase {
assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
assertThat(false, is(equalTo(newFieldAttributes.get("stored"))));
assertThat(true, is(equalTo(newFieldAttributes.get("indexed"))));
assertThat("accuracy", is(equalTo(newFieldAttributes.get("default"))));
assertThat(true, is(equalTo(newFieldAttributes.get("required"))));
}
@Test
@ -481,7 +478,6 @@ public class SchemaTest extends RestTestBase {
fieldAttributes.put("type", "string");
fieldAttributes.put("stored", false);
fieldAttributes.put("indexed", true);
fieldAttributes.put("required", true);
SchemaRequest.AddDynamicField addDFieldUpdateSchemaRequest =
new SchemaRequest.AddDynamicField(fieldAttributes);
SchemaResponse.UpdateResponse addFieldResponse = addDFieldUpdateSchemaRequest.process(getSolrClient());
@ -506,7 +502,6 @@ public class SchemaTest extends RestTestBase {
assertThat("string", is(equalTo(newFieldAttributes.get("type"))));
assertThat(true, is(equalTo(newFieldAttributes.get("stored"))));
assertThat(false, is(equalTo(newFieldAttributes.get("indexed"))));
assertThat(true, is(equalTo(newFieldAttributes.get("required"))));
}
@Test