From 673655cc7b7ab115257f75e64be4c9d918fc9144 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Tue, 18 Oct 2011 01:26:53 +0200
Subject: [PATCH] When searching against an index/type, use the type
 information to derive different search aspects, closes #1391.

---
 .../index/mapper/MapperService.java           | 30 +++++++++++++++++++
 .../index/query/NestedFilterParser.java       |  2 +-
 .../index/query/NestedQueryParser.java        |  2 +-
 .../index/query/QueryParseContext.java        |  5 ++++
 .../search/facet/FacetParseElement.java       |  2 +-
 .../search/internal/SearchContext.java        |  4 +++
 6 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index 102f8619a06..5474d4a9480 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -446,6 +446,36 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
         return fields;
     }
 
+    public SmartNameObjectMapper smartNameObjectMapper(String smartName, @Nullable String[] types) {
+        if (types == null || types.length == 0) {
+            return smartNameObjectMapper(smartName);
+        }
+        for (String type : types) {
+            DocumentMapper possibleDocMapper = mappers.get(type);
+            if (possibleDocMapper != null) {
+                ObjectMapper mapper = possibleDocMapper.objectMappers().get(smartName);
+                if (mapper != null) {
+                    return new SmartNameObjectMapper(mapper, possibleDocMapper);
+                }
+            }
+        }
+        // did not find one, see if its prefixed by type
+        int dotIndex = smartName.indexOf('.');
+        if (dotIndex != -1) {
+            String possibleType = smartName.substring(0, dotIndex);
+            DocumentMapper possibleDocMapper = mappers.get(possibleType);
+            if (possibleDocMapper != null) {
+                String possiblePath = smartName.substring(dotIndex + 1);
+                ObjectMapper mapper = possibleDocMapper.objectMappers().get(possiblePath);
+                if (mapper != null) {
+                    return new SmartNameObjectMapper(mapper, possibleDocMapper);
+                }
+            }
+        }
+        // did not explicitly find one under the types provided, or prefixed by type...
+        return null;
+    }
+
     public SmartNameObjectMapper smartNameObjectMapper(String smartName) {
         int dotIndex = smartName.indexOf('.');
         if (dotIndex != -1) {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterParser.java
index d234d335641..fce19c47587 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterParser.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterParser.java
@@ -105,7 +105,7 @@ public class NestedFilterParser implements FilterParser {
 
         query.setBoost(boost);
 
-        MapperService.SmartNameObjectMapper mapper = parseContext.mapperService().smartNameObjectMapper(path);
+        MapperService.SmartNameObjectMapper mapper = parseContext.smartObjectMapper(path);
         if (mapper == null) {
             throw new QueryParsingException(parseContext.index(), "[nested] failed to find nested object under path [" + path + "]");
         }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
index 5eb8e9d362d..e1e63692ce5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
@@ -110,7 +110,7 @@ public class NestedQueryParser implements QueryParser {
 
         query.setBoost(boost);
 
-        MapperService.SmartNameObjectMapper mapper = parseContext.mapperService().smartNameObjectMapper(path);
+        MapperService.SmartNameObjectMapper mapper = parseContext.smartObjectMapper(path);
         if (mapper == null) {
             throw new QueryParsingException(parseContext.index(), "[nested] failed to find nested object under path [" + path + "]");
         }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
index ee195f28aca..4b4e382b3dc 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
@@ -223,4 +223,9 @@ public class QueryParseContext {
         SearchContext searchContext = SearchContext.current();
         return indexQueryParser.mapperService.smartName(name, searchContext == null ? null : searchContext.types());
     }
+
+    public MapperService.SmartNameObjectMapper smartObjectMapper(String name) {
+        SearchContext searchContext = SearchContext.current();
+        return indexQueryParser.mapperService.smartNameObjectMapper(name, searchContext == null ? null : searchContext.types());
+    }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetParseElement.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetParseElement.java
index 36128b82efb..f9ae99f97e3 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetParseElement.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetParseElement.java
@@ -113,7 +113,7 @@ public class FacetParseElement implements SearchParseElement {
 
                 if (nestedPath != null) {
                     // its a nested facet, wrap the collector with a facet one...
-                    MapperService.SmartNameObjectMapper mapper = context.mapperService().smartNameObjectMapper(nestedPath);
+                    MapperService.SmartNameObjectMapper mapper = context.smartNameObjectMapper(nestedPath);
                     if (mapper == null) {
                         throw new SearchParseException(context, "facet nested path [" + nestedPath + "] not found");
                     }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
index 099fa4c92f3..7e6727fcf13 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
@@ -546,4 +546,8 @@ public class SearchContext implements Releasable {
     public FieldMapper smartNameFieldMapper(String name) {
         return mapperService().smartNameFieldMapper(name, types);
     }
+
+    public MapperService.SmartNameObjectMapper smartNameObjectMapper(String name) {
+        return mapperService().smartNameObjectMapper(name, types);
+    }
 }