honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-28 02:48:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Two different indexes with the same nested object name causing ArrayIndexOutOfBoundsException, closes #1575.

Browse Source
This commit is contained in:
Shay Banon 2011-12-28 22:20:09 +02:00
parent cb0284f802
commit bb63d38a65
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/elasticsearch/index/query/NestedFilterParser.java
View File

@ -125,10 +125,11 @@ public class NestedFilterParser implements FilterParser {
Filter parentFilter = currentParentFilterContext; Filter parentFilter = currentParentFilterContext;
if (parentFilter == null) { if (parentFilter == null) {
parentFilter = NonNestedDocsFilter.INSTANCE; parentFilter = NonNestedDocsFilter.INSTANCE;
if (mapper.hasDocMapper()) { // don't do special parent filtering, since we might have same nested mapping on two different types
// filter based on the type... //if (mapper.hasDocMapper()) {
parentFilter = mapper.docMapper().typeFilter(); // // filter based on the type...
} // parentFilter = mapper.docMapper().typeFilter();
//}
parentFilter = parseContext.cacheFilter(parentFilter, null); parentFilter = parseContext.cacheFilter(parentFilter, null);
} }

9
src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
View File

@ -131,10 +131,11 @@ public class NestedQueryParser implements QueryParser {
Filter parentFilter = currentParentFilterContext; Filter parentFilter = currentParentFilterContext;
if (parentFilter == null) { if (parentFilter == null) {
parentFilter = NonNestedDocsFilter.INSTANCE; parentFilter = NonNestedDocsFilter.INSTANCE;
if (mapper.hasDocMapper()) { // don't do special parent filtering, since we might have same nested mapping on two different types
// filter based on the type... //if (mapper.hasDocMapper()) {
parentFilter = mapper.docMapper().typeFilter(); // // filter based on the type...
} // parentFilter = mapper.docMapper().typeFilter();
//}
parentFilter = parseContext.cacheFilter(parentFilter, null); parentFilter = parseContext.cacheFilter(parentFilter, null);
} }