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

smart search analyzer should try both fullName and then indexName, and not just indexName.

This commit is contained in:
kimchy 2010-02-14 02:20:34 +02:00
parent 5ac51ee93f
commit 604c407e91
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
View File

@ -255,6 +255,17 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
return indexName(smartName); return indexName(smartName);
} }
/**
* Returns smart field mappers based on a smart name. A smart name is one that can optioannly be prefixed
* with a type (and then a '.'). If it is, then the {@link MapperService.SmartNameFieldMappers}
* will have the doc mapper set.
*
* <p>It also (without the optional type prefix) try and find the {@link FieldMappers} for the specific
* name. It will first try to find it based on the full name (with the dots if its a compound name). If
* it is not found, will try and find it based on the indexName (which can be controlled in the mapping).
*
* <p>If nothing is found, returns null.
*/
public SmartNameFieldMappers smartName(String smartName) { public SmartNameFieldMappers smartName(String smartName) {
int dotIndex = smartName.indexOf('.'); int dotIndex = smartName.indexOf('.');
if (dotIndex != -1) { if (dotIndex != -1) {
@ -336,7 +347,12 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
return possibleDocMapper.mappers().searchAnalyzer().tokenStream(fieldName, reader); return possibleDocMapper.mappers().searchAnalyzer().tokenStream(fieldName, reader);
} }
} }
FieldMappers mappers = indexNameFieldMappers.get(fieldName); FieldMappers mappers = fullNameFieldMappers.get(fieldName);
if (mappers != null && mappers.mapper() != null && mappers.mapper().searchAnalyzer() != null) {
return mappers.mapper().searchAnalyzer().tokenStream(fieldName, reader);
}
mappers = indexNameFieldMappers.get(fieldName);
if (mappers != null && mappers.mapper() != null && mappers.mapper().searchAnalyzer() != null) { if (mappers != null && mappers.mapper() != null && mappers.mapper().searchAnalyzer() != null) {
return mappers.mapper().searchAnalyzer().tokenStream(fieldName, reader); return mappers.mapper().searchAnalyzer().tokenStream(fieldName, reader);
} }
@ -352,7 +368,12 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
return possibleDocMapper.mappers().searchAnalyzer().reusableTokenStream(fieldName, reader); return possibleDocMapper.mappers().searchAnalyzer().reusableTokenStream(fieldName, reader);
} }
} }
FieldMappers mappers = indexNameFieldMappers.get(fieldName); FieldMappers mappers = fullNameFieldMappers.get(fieldName);
if (mappers != null && mappers.mapper() != null && mappers.mapper().searchAnalyzer() != null) {
return mappers.mapper().searchAnalyzer().reusableTokenStream(fieldName, reader);
}
mappers = indexNameFieldMappers.get(fieldName);
if (mappers != null && mappers.mapper() != null && mappers.mapper().searchAnalyzer() != null) { if (mappers != null && mappers.mapper() != null && mappers.mapper().searchAnalyzer() != null) {
return mappers.mapper().searchAnalyzer().reusableTokenStream(fieldName, reader); return mappers.mapper().searchAnalyzer().reusableTokenStream(fieldName, reader);
} }