Extend grouping parser to handle map syntax with indirect key via attribute vector.

1 files changed, 22 insertions, 5 deletions

diff --git a/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj b/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj
index 0678b030bc5..6a55a32eb8a 100644
--- a/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj
+++ b/container-search/src/main/javacc/com/yahoo/search/grouping/request/parser/GroupingParser.jj
@@ -404,14 +404,31 @@ AndFunction andFunction(GroupingOperation grp) :
 
 AttributeValue attributeValue() :
 {
-    StringBuilder ret = new StringBuilder();
+    StringBuilder prefix = new StringBuilder();
+    StringBuilder suffix = new StringBuilder();
     String str;
+    String key = null;
+    AttributeFunction keySourceAttr = null;
 }
 {
-    ( str = identifier() { ret.append(str); }
-    ( ( <DOT> { ret.append(token.image); } ( str = identifier() { ret.append(str); } ) ) |
-      ( lcurly() str = string() { ret.append("{\"").append(str).append("\"}"); } rcurly() ) )* )
-    { return new AttributeValue(ret.toString()); }
+    ( str = identifier() { prefix.append(str); }
+      ( LOOKAHEAD(2) <DOT> { prefix.append(token.image); } ( str = identifier() { prefix.append(str); } ) )*
+      ( LOOKAHEAD(3)
+          ( lcurly() key = string() rcurly() ) |
+          ( lcurly() keySourceAttr = attributeFunction() rcurly() )
+      )?
+      ( <DOT> { suffix.append(token.image); } ( str = identifier() { suffix.append(str); } ) )*
+    )
+    {
+        if (key != null) {
+            return AttributeMapLookupValue.fromKey(prefix.toString(), key, suffix.toString());
+        } else if (keySourceAttr != null) {
+            return AttributeMapLookupValue.fromKeySourceAttribute(prefix.toString(), keySourceAttr.getAttributeName(), suffix.toString());
+        } else {
+            prefix.append(suffix.toString());
+            return new AttributeValue(prefix.toString());
+        }
+    }
 }
 
 AttributeFunction attributeFunction() :