honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Percolator: Remove `index.percolator.allow_unmapped_fields` setting. 

There should be no option to opt out from strict field resolution for percolator query parsing.

Closes #8439
This commit is contained in:
Martijn van Groningen 2014-11-11 15:34:08 +00:00
parent 5714b0a7ad
commit 983a108776
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
View File

@ -68,8 +68,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/ */
public class PercolatorQueriesRegistry extends AbstractIndexShardComponent { public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
public final static String ALLOW_UNMAPPED_FIELDS = "index.percolator.allow_unmapped_fields";
// This is a shard level service, but these below are index level service: // This is a shard level service, but these below are index level service:
private final IndexQueryParserService queryParserService; private final IndexQueryParserService queryParserService;
private final MapperService mapperService; private final MapperService mapperService;
@ -85,7 +83,6 @@ public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
private final RealTimePercolatorOperationListener realTimePercolatorOperationListener = new RealTimePercolatorOperationListener(); private final RealTimePercolatorOperationListener realTimePercolatorOperationListener = new RealTimePercolatorOperationListener();
private final PercolateTypeListener percolateTypeListener = new PercolateTypeListener(); private final PercolateTypeListener percolateTypeListener = new PercolateTypeListener();
private final AtomicBoolean realTimePercolatorEnabled = new AtomicBoolean(false); private final AtomicBoolean realTimePercolatorEnabled = new AtomicBoolean(false);
private final boolean allowUnmappedFields;
private CloseableThreadLocal<QueryParseContext> cache = new CloseableThreadLocal<QueryParseContext>() { private CloseableThreadLocal<QueryParseContext> cache = new CloseableThreadLocal<QueryParseContext>() {
@Override @Override
@ -106,7 +103,6 @@ public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
this.indexCache = indexCache; this.indexCache = indexCache;
this.indexFieldDataService = indexFieldDataService; this.indexFieldDataService = indexFieldDataService;
this.shardPercolateService = shardPercolateService; this.shardPercolateService = shardPercolateService;
this.allowUnmappedFields = indexSettings.getAsBoolean(ALLOW_UNMAPPED_FIELDS, false);
indicesLifecycle.addListener(shardLifecycleListener); indicesLifecycle.addListener(shardLifecycleListener);
mapperService.addTypeListener(percolateTypeListener); mapperService.addTypeListener(percolateTypeListener);
@ -203,7 +199,16 @@ public class PercolatorQueriesRegistry extends AbstractIndexShardComponent {
QueryParseContext context = cache.get(); QueryParseContext context = cache.get();
try { try {
context.reset(parser); context.reset(parser);
context.setAllowUnmappedFields(allowUnmappedFields); // This means that fields in the query need to exist in the mapping prior to registering this query
// The reason that this is required, is that if a field doesn't exist then the query assumes defaults, which may be undesired.
//
// Even worse when fields mentioned in percolator queries do go added to map after the queries have been registered
// then the percolator queries don't work as expected any more.
//
// Query parsing can't introduce new fields in mappings (which happens when registering a percolator query),
// because field type can't be inferred from queries (like document do) so the best option here is to disallow
// the usage of unmapped fields in percolator queries to avoid unexpected behaviour
context.setAllowUnmappedFields(false);
return queryParserService.parseInnerQuery(context); return queryParserService.parseInnerQuery(context);
} catch (IOException e) { } catch (IOException e) {
throw new QueryParsingException(queryParserService.index(), "Failed to parse", e); throw new QueryParsingException(queryParserService.index(), "Failed to parse", e);