Skip to content

Empty mapping to hold null meta #72709

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 4, 2021
Merged

Empty mapping to hold null meta #72709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41b9e46
Empty mapping to hold null meta
javanna May 4, 2021
d62c1f1
add tests
javanna May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.analysis.IndexAnalyzers;

import java.util.Collections;

public class DocumentMapper {
private final String type;
private final CompressedXContent mappingSource;
Expand All @@ -28,7 +26,7 @@ public class DocumentMapper {
public static DocumentMapper createEmpty(MapperService mapperService) {
RootObjectMapper root = new RootObjectMapper.Builder(MapperService.SINGLE_MAPPING_NAME, Version.CURRENT).build(new ContentPath(1));
MetadataFieldMapper[] metadata = mapperService.getMetadataMappers().values().toArray(new MetadataFieldMapper[0]);
Mapping mapping = new Mapping(root, metadata, Collections.emptyMap());
Mapping mapping = new Mapping(root, metadata, null);
return new DocumentMapper(
mapperService.getIndexSettings(), mapperService.getIndexAnalyzers(), mapperService.documentParser(), mapping);
}
Expand Down
5 changes: 1 addition & 4 deletions server/src/main/java/org/elasticsearch/index/mapper/Mapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -37,9 +36,7 @@
public final class Mapping implements ToXContentFragment {

public static final Mapping EMPTY = new Mapping(
new RootObjectMapper.Builder("_doc", Version.CURRENT).build(new ContentPath()),
new MetadataFieldMapper[0],
Collections.emptyMap());
new RootObjectMapper.Builder("_doc", Version.CURRENT).build(new ContentPath()), new MetadataFieldMapper[0], null);

private final RootObjectMapper root;
private final Map<String, Object> meta;
Expand Down
13 changes: 13 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.elasticsearch.Version;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexSettings;
Expand Down Expand Up @@ -276,4 +277,16 @@ public void testMergeMetaForIndexTemplate() throws IOException {
"object", Map.of("field1", "value1", "field2", "new_value", "field3", "value3"));
assertThat(merged.getMeta(), equalTo(expected));
}

public void testEmptyDocumentMapper() {
MapperService mapperService = createMapperService(Version.CURRENT, Settings.EMPTY, () -> false);
DocumentMapper documentMapper = DocumentMapper.createEmpty(mapperService);
assertEquals("{\"_doc\":{}}", Strings.toString(documentMapper.mapping()));
assertTrue(documentMapper.mappers().hasMappings());
assertNotNull(documentMapper.idFieldMapper());
assertNotNull(documentMapper.sourceMapper());
assertNotNull(documentMapper.IndexFieldMapper());
assertEquals(10, documentMapper.mappers().getMapping().getMetadataMappersMap().size());
assertEquals(10, documentMapper.mappers().fieldTypes().size());
}
}
11 changes: 11 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/MappingLookupTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.elasticsearch.Version;
import org.elasticsearch.common.Explicit;
import org.elasticsearch.common.Strings;
import org.elasticsearch.index.analysis.AnalyzerScope;
import org.elasticsearch.index.analysis.NamedAnalyzer;
import org.elasticsearch.index.query.SearchExecutionContext;
Expand Down Expand Up @@ -97,6 +98,16 @@ public void testAnalyzers() throws IOException {
}).tokenStream("field3", "blah"));
}

public void testEmptyMappingLookup() {
MappingLookup mappingLookup = MappingLookup.EMPTY;
assertEquals("{\"_doc\":{}}", Strings.toString(mappingLookup.getMapping()));
assertFalse(mappingLookup.hasMappings());
assertNull(mappingLookup.getMapping().getMeta());
assertEquals(0, mappingLookup.getMapping().getMetadataMappersMap().size());
assertFalse(mappingLookup.fieldMappers().iterator().hasNext());
assertEquals(0, mappingLookup.fieldTypes().size());
}

private void assertAnalyzes(Analyzer analyzer, String field, String output) throws IOException {
try (TokenStream tok = analyzer.tokenStream(field, new StringReader(""))) {
CharTermAttribute term = tok.addAttribute(CharTermAttribute.class);
Expand Down
4 changes: 1 addition & 3 deletions ...n/core/src/internalClusterTest/java/org/elasticsearch/snapshots/SourceOnlySnapshotIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ public List<Setting<?>> getSettings() {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/72695")
public void testSnapshotAndRestore() throws Exception {
final String sourceIdx = "test-idx";
boolean requireRouting = randomBoolean();
Expand Down Expand Up @@ -129,7 +128,6 @@ public void testSnapshotAndRestore() throws Exception {
assertHits(sourceIdx, builders.length, sourceHadDeletions);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/72695")
public void testSnapshotAndRestoreWithNested() throws Exception {
final String sourceIdx = "test-idx";
boolean requireRouting = randomBoolean();
Expand Down Expand Up @@ -187,7 +185,7 @@ public void testSnapshotWithDanglingLocalSegment() throws Exception {
assertSuccessful(startFullSnapshot(repo, "snapshot-3"));
}

private void assertMappings(String sourceIdx, boolean requireRouting, boolean useNested) {
private static void assertMappings(String sourceIdx, boolean requireRouting, boolean useNested) {
GetMappingsResponse getMappingsResponse = client().admin().indices().prepareGetMappings(sourceIdx).get();
MappingMetadata mapping = getMappingsResponse.getMappings().get(sourceIdx);
String nested = useNested ?
Expand Down