-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit introduces XContentFieldFilter, which applies field includes/excludes to XContent without having to realise the xcontent itself as a java map. SourceFieldMapper and ShardGetService are cut over to use this class.
- Loading branch information
Showing
5 changed files
with
685 additions
and
34 deletions.
There are no files selected for viewing
101 changes: 101 additions & 0 deletions
101
server/src/main/java/org/elasticsearch/common/xcontent/XContentFieldFilter.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,101 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.common.xcontent; | ||
|
|
||
| import org.elasticsearch.common.bytes.BytesReference; | ||
| import org.elasticsearch.common.io.stream.BytesStreamOutput; | ||
| import org.elasticsearch.common.util.CollectionUtils; | ||
| import org.elasticsearch.common.xcontent.support.XContentMapValues; | ||
| import org.elasticsearch.core.CheckedFunction; | ||
| import org.elasticsearch.core.Nullable; | ||
| import org.elasticsearch.core.Tuple; | ||
| import org.elasticsearch.xcontent.XContentBuilder; | ||
| import org.elasticsearch.xcontent.XContentFactory; | ||
| import org.elasticsearch.xcontent.XContentParser; | ||
| import org.elasticsearch.xcontent.XContentParserConfiguration; | ||
| import org.elasticsearch.xcontent.XContentType; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.function.Function; | ||
|
|
||
| /** | ||
| * A filter that filter fields away from source | ||
| */ | ||
| public interface XContentFieldFilter { | ||
| /** | ||
| * filter source in {@link BytesReference} format and in {@link XContentType} content type | ||
| * note that xContentType may be null in some case, we should guess xContentType from sourceBytes in such cases | ||
| */ | ||
| BytesReference apply(BytesReference sourceBytes, @Nullable XContentType xContentType) throws IOException; | ||
|
|
||
| /** | ||
| * Construct {@link XContentFieldFilter} using given includes and excludes | ||
| * | ||
| * @param includes fields to keep, wildcard supported | ||
| * @param excludes fields to remove, wildcard supported | ||
| * @return filter that filter {@link org.elasticsearch.xcontent.XContent} with given includes and excludes | ||
| */ | ||
| static XContentFieldFilter newFieldFilter(String[] includes, String[] excludes) { | ||
| final CheckedFunction<XContentType, BytesReference, IOException> emptyValueSupplier = xContentType -> { | ||
| BytesStreamOutput bStream = new BytesStreamOutput(); | ||
| XContentBuilder builder = XContentFactory.contentBuilder(xContentType, bStream).map(Collections.emptyMap()); | ||
| builder.close(); | ||
| return bStream.bytes(); | ||
| }; | ||
| // Use the old map-based filtering mechanism if there are wildcards in the excludes. | ||
| // TODO: Remove this if block once: https://github.com/elastic/elasticsearch/pull/80160 is merged | ||
| if ((CollectionUtils.isEmpty(excludes) == false) && Arrays.stream(excludes).filter(field -> field.contains("*")).count() > 0) { | ||
| return (originalSource, contentType) -> { | ||
| if (originalSource == null || originalSource.length() <= 0) { | ||
| if (contentType == null) { | ||
| throw new IllegalStateException("originalSource and contentType can not be null at the same time"); | ||
| } | ||
| return emptyValueSupplier.apply(contentType); | ||
| } | ||
| Function<Map<String, ?>, Map<String, Object>> mapFilter = XContentMapValues.filter(includes, excludes); | ||
| Tuple<XContentType, Map<String, Object>> mapTuple = XContentHelper.convertToMap(originalSource, true, contentType); | ||
| Map<String, Object> filteredSource = mapFilter.apply(mapTuple.v2()); | ||
| BytesStreamOutput bStream = new BytesStreamOutput(); | ||
| XContentType actualContentType = mapTuple.v1(); | ||
| XContentBuilder builder = XContentFactory.contentBuilder(actualContentType, bStream).map(filteredSource); | ||
| builder.close(); | ||
| return bStream.bytes(); | ||
| }; | ||
| } else { | ||
| final XContentParserConfiguration parserConfig = XContentParserConfiguration.EMPTY.withFiltering( | ||
| Set.of(includes), | ||
| Set.of(excludes), | ||
| true | ||
| ); | ||
| return (originalSource, contentType) -> { | ||
| if (originalSource == null || originalSource.length() <= 0) { | ||
| if (contentType == null) { | ||
| throw new IllegalStateException("originalSource and contentType can not be null at the same time"); | ||
| } | ||
| return emptyValueSupplier.apply(contentType); | ||
| } | ||
| if (contentType == null) { | ||
| contentType = XContentHelper.xContentTypeMayCompressed(originalSource); | ||
| } | ||
| BytesStreamOutput streamOutput = new BytesStreamOutput(Math.min(1024, originalSource.length())); | ||
| XContentBuilder builder = new XContentBuilder(contentType.xContent(), streamOutput); | ||
| XContentParser parser = contentType.xContent().createParser(parserConfig, originalSource.streamInput()); | ||
| if ((parser.currentToken() == null) && (parser.nextToken() == null)) { | ||
| return emptyValueSupplier.apply(contentType); | ||
| } | ||
| builder.copyCurrentStructure(parser); | ||
| return BytesReference.bytes(builder); | ||
| }; | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.