-
Notifications
You must be signed in to change notification settings - Fork 24.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow [null] values in [null_value] #61798
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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
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
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
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
179 changes: 179 additions & 0 deletions
179
test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.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,179 @@ | ||
| /* | ||
| * 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.apache.lucene.analysis.standard.StandardAnalyzer; | ||
| import org.apache.lucene.index.IndexReader; | ||
| import org.apache.lucene.index.IndexWriterConfig; | ||
| import org.apache.lucene.index.RandomIndexWriter; | ||
| import org.apache.lucene.store.Directory; | ||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.metadata.IndexMetadata; | ||
| import org.elasticsearch.common.CheckedConsumer; | ||
| import org.elasticsearch.common.bytes.BytesReference; | ||
| import org.elasticsearch.common.compress.CompressedXContent; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.common.xcontent.XContentFactory; | ||
| import org.elasticsearch.common.xcontent.XContentType; | ||
| import org.elasticsearch.common.xcontent.json.JsonXContent; | ||
| import org.elasticsearch.index.IndexSettings; | ||
| import org.elasticsearch.index.analysis.AnalyzerScope; | ||
| import org.elasticsearch.index.analysis.IndexAnalyzers; | ||
| import org.elasticsearch.index.analysis.NamedAnalyzer; | ||
| import org.elasticsearch.index.query.QueryShardContext; | ||
| import org.elasticsearch.index.similarity.SimilarityService; | ||
| import org.elasticsearch.indices.IndicesModule; | ||
| import org.elasticsearch.indices.mapper.MapperRegistry; | ||
| import org.elasticsearch.plugins.MapperPlugin; | ||
| import org.elasticsearch.plugins.Plugin; | ||
| import org.elasticsearch.script.ScriptService; | ||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collection; | ||
| import java.util.Map; | ||
|
|
||
| import static java.util.Collections.emptyList; | ||
| import static java.util.Collections.emptyMap; | ||
| import static java.util.stream.Collectors.toList; | ||
| import static org.mockito.Matchers.anyObject; | ||
| import static org.mockito.Matchers.anyString; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| public abstract class MapperServiceTestCase extends ESTestCase { | ||
|
|
||
| protected static final Settings SETTINGS = Settings.builder().put("index.version.created", Version.CURRENT).build(); | ||
|
|
||
| protected Collection<? extends Plugin> getPlugins() { | ||
| return emptyList(); | ||
| } | ||
|
|
||
| protected Settings getIndexSettings() { | ||
| return SETTINGS; | ||
| } | ||
|
|
||
| protected IndexAnalyzers createIndexAnalyzers(IndexSettings indexSettings) { | ||
| return new IndexAnalyzers( | ||
| Map.of("default", new NamedAnalyzer("default", AnalyzerScope.INDEX, new StandardAnalyzer())), | ||
| Map.of(), | ||
| Map.of() | ||
| ); | ||
| } | ||
|
|
||
| protected final String randomIndexOptions() { | ||
| return randomFrom("docs", "freqs", "positions", "offsets"); | ||
| } | ||
|
|
||
| protected final DocumentMapper createDocumentMapper(XContentBuilder mappings) throws IOException { | ||
| return createMapperService(mappings).documentMapper(); | ||
| } | ||
|
|
||
| protected final MapperService createMapperService(XContentBuilder mappings) throws IOException { | ||
| return createMapperService(getIndexSettings(), mappings); | ||
| } | ||
|
|
||
| /** | ||
| * Create a {@link MapperService} like we would for an index. | ||
| */ | ||
| protected final MapperService createMapperService(Settings settings, XContentBuilder mapping) throws IOException { | ||
| IndexMetadata meta = IndexMetadata.builder("index") | ||
| .settings(Settings.builder().put("index.version.created", Version.CURRENT)) | ||
| .numberOfReplicas(0) | ||
| .numberOfShards(1) | ||
| .build(); | ||
| IndexSettings indexSettings = new IndexSettings(meta, settings); | ||
| MapperRegistry mapperRegistry = new IndicesModule( | ||
| getPlugins().stream().filter(p -> p instanceof MapperPlugin).map(p -> (MapperPlugin) p).collect(toList()) | ||
| ).getMapperRegistry(); | ||
| ScriptService scriptService = new ScriptService(settings, emptyMap(), emptyMap()); | ||
| SimilarityService similarityService = new SimilarityService(indexSettings, scriptService, Map.of()); | ||
| MapperService mapperService = new MapperService( | ||
| indexSettings, | ||
| createIndexAnalyzers(indexSettings), | ||
| xContentRegistry(), | ||
| similarityService, | ||
| mapperRegistry, | ||
| () -> { throw new UnsupportedOperationException(); }, | ||
| () -> true | ||
| ); | ||
| merge(mapperService, mapping); | ||
| return mapperService; | ||
| } | ||
|
|
||
| protected final void withLuceneIndex( | ||
| MapperService mapperService, | ||
| CheckedConsumer<RandomIndexWriter, IOException> builder, | ||
| CheckedConsumer<IndexReader, IOException> test | ||
| ) throws IOException { | ||
| try ( | ||
| Directory dir = newDirectory(); | ||
| RandomIndexWriter iw = new RandomIndexWriter(random(), dir, new IndexWriterConfig(mapperService.indexAnalyzer())) | ||
| ) { | ||
| builder.accept(iw); | ||
| try (IndexReader reader = iw.getReader()) { | ||
| test.accept(reader); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| protected final SourceToParse source(CheckedConsumer<XContentBuilder, IOException> build) throws IOException { | ||
| XContentBuilder builder = JsonXContent.contentBuilder().startObject(); | ||
| build.accept(builder); | ||
| builder.endObject(); | ||
| return new SourceToParse("test", "1", BytesReference.bytes(builder), XContentType.JSON); | ||
| } | ||
|
|
||
| /** | ||
| * Merge a new mapping into the one in the provided {@link MapperService}. | ||
| */ | ||
| protected final void merge(MapperService mapperService, XContentBuilder mapping) throws IOException { | ||
| mapperService.merge(null, new CompressedXContent(BytesReference.bytes(mapping)), MapperService.MergeReason.MAPPING_UPDATE); | ||
| } | ||
|
|
||
| protected final XContentBuilder mapping(CheckedConsumer<XContentBuilder, IOException> buildFields) throws IOException { | ||
| XContentBuilder builder = XContentFactory.jsonBuilder().startObject().startObject("_doc").startObject("properties"); | ||
| buildFields.accept(builder); | ||
| return builder.endObject().endObject().endObject(); | ||
| } | ||
|
|
||
| protected final XContentBuilder fieldMapping(CheckedConsumer<XContentBuilder, IOException> buildField) throws IOException { | ||
| return mapping(b -> { | ||
| b.startObject("field"); | ||
| buildField.accept(b); | ||
| b.endObject(); | ||
| }); | ||
| } | ||
|
|
||
| QueryShardContext createQueryShardContext(MapperService mapperService) { | ||
| QueryShardContext queryShardContext = mock(QueryShardContext.class); | ||
| when(queryShardContext.getMapperService()).thenReturn(mapperService); | ||
| when(queryShardContext.fieldMapper(anyString())).thenAnswer(inv -> mapperService.fieldType(inv.getArguments()[0].toString())); | ||
| when(queryShardContext.getIndexAnalyzers()).thenReturn(mapperService.getIndexAnalyzers()); | ||
| when(queryShardContext.getSearchQuoteAnalyzer(anyObject())).thenCallRealMethod(); | ||
| when(queryShardContext.getSearchAnalyzer(anyObject())).thenCallRealMethod(); | ||
| when(queryShardContext.getIndexSettings()).thenReturn(mapperService.getIndexSettings()); | ||
| when(queryShardContext.simpleMatchToIndexNames(anyObject())).thenAnswer( | ||
| inv -> mapperService.simpleMatchToFullName(inv.getArguments()[0].toString()) | ||
| ); | ||
| return queryShardContext; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 These are quite useful and I could see us wanting them, say, in the
AggregatorTestCaseto make it very easy to index with a mapping.