-
Notifications
You must be signed in to change notification settings - Fork 24.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mappings: Fix document parsing to properly ignore entire type when di…
…sabled Currently when an entire type is disabled, our document parser will end parsing on the first field of the document. This blows up the recently added check that parsing did not silently skip any tokens (ie whether there was garbage leftover). This change fixes the parser to correctly skip the entire document when the type is disabled. closes #13017
- Loading branch information
Showing
2 changed files
with
90 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
core/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.index.mapper; | ||
|
||
import org.elasticsearch.common.bytes.BytesArray; | ||
import org.elasticsearch.common.bytes.BytesReference; | ||
import org.elasticsearch.common.xcontent.XContentFactory; | ||
import org.elasticsearch.common.xcontent.XContentParser; | ||
import org.elasticsearch.common.xcontent.json.JsonXContent; | ||
import org.elasticsearch.common.xcontent.json.JsonXContentParser; | ||
import org.elasticsearch.test.ESSingleNodeTestCase; | ||
|
||
// TODO: make this a real unit test | ||
public class DocumentParserTests extends ESSingleNodeTestCase { | ||
|
||
public void testTypeDisabled() throws Exception { | ||
DocumentMapperParser mapperParser = createIndex("test").mapperService().documentMapperParser(); | ||
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") | ||
.field("enabled", false).endObject().endObject().string(); | ||
DocumentMapper mapper = mapperParser.parse(mapping); | ||
|
||
BytesReference bytes = XContentFactory.jsonBuilder() | ||
.startObject() | ||
.field("field", "1234") | ||
.endObject().bytes(); | ||
ParsedDocument doc = mapper.parse("test", "type", "1", bytes); | ||
assertNull(doc.rootDoc().getField("field")); | ||
} | ||
|
||
public void testFieldDisabled() throws Exception { | ||
DocumentMapperParser mapperParser = createIndex("test").mapperService().documentMapperParser(); | ||
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").startObject("properties") | ||
.startObject("foo").field("enabled", false).endObject() | ||
.startObject("bar").field("type", "integer").endObject() | ||
.endObject().endObject().endObject().string(); | ||
DocumentMapper mapper = mapperParser.parse(mapping); | ||
|
||
BytesReference bytes = XContentFactory.jsonBuilder() | ||
.startObject() | ||
.field("foo", "1234") | ||
.field("bar", 10) | ||
.endObject().bytes(); | ||
ParsedDocument doc = mapper.parse("test", "type", "1", bytes); | ||
assertNull(doc.rootDoc().getField("foo")); | ||
assertNotNull(doc.rootDoc().getField("bar")); | ||
} | ||
} |