SelectParser should import most of its constants from YqlParser

2 files changed, 124 insertions, 116 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
index 330f9a1fef2..2476f00f194 100644
--- a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
+++ b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
@@ -66,6 +66,65 @@ import static com.yahoo.slime.Type.LONG;
 import static com.yahoo.slime.Type.OBJECT;
 import static com.yahoo.slime.Type.STRING;
 
+import static com.yahoo.search.yql.YqlParser.ACCENT_DROP;
+import static com.yahoo.search.yql.YqlParser.ALTERNATIVES;
+import static com.yahoo.search.yql.YqlParser.AND_SEGMENTING;
+import static com.yahoo.search.yql.YqlParser.ANNOTATIONS;
+import static com.yahoo.search.yql.YqlParser.APPROXIMATE;
+import static com.yahoo.search.yql.YqlParser.ASCENDING_HITS_ORDER;
+import static com.yahoo.search.yql.YqlParser.BOUNDS;
+import static com.yahoo.search.yql.YqlParser.BOUNDS_LEFT_OPEN;
+import static com.yahoo.search.yql.YqlParser.BOUNDS_OPEN;
+import static com.yahoo.search.yql.YqlParser.BOUNDS_RIGHT_OPEN;
+import static com.yahoo.search.yql.YqlParser.CONNECTION_ID;
+import static com.yahoo.search.yql.YqlParser.CONNECTION_WEIGHT;
+import static com.yahoo.search.yql.YqlParser.CONNECTIVITY;
+import static com.yahoo.search.yql.YqlParser.DEFAULT_TARGET_NUM_HITS;
+import static com.yahoo.search.yql.YqlParser.DESCENDING_HITS_ORDER;
+import static com.yahoo.search.yql.YqlParser.DISTANCE;
+import static com.yahoo.search.yql.YqlParser.DOT_PRODUCT;
+import static com.yahoo.search.yql.YqlParser.END_ANCHOR;
+import static com.yahoo.search.yql.YqlParser.EQUIV;
+import static com.yahoo.search.yql.YqlParser.FILTER;
+import static com.yahoo.search.yql.YqlParser.GEO_LOCATION;
+import static com.yahoo.search.yql.YqlParser.HIT_LIMIT;
+import static com.yahoo.search.yql.YqlParser.HNSW_EXPLORE_ADDITIONAL_HITS;
+import static com.yahoo.search.yql.YqlParser.IMPLICIT_TRANSFORMS;
+import static com.yahoo.search.yql.YqlParser.LABEL;
+import static com.yahoo.search.yql.YqlParser.NEAR;
+import static com.yahoo.search.yql.YqlParser.NEAREST_NEIGHBOR;
+import static com.yahoo.search.yql.YqlParser.NFKC;
+import static com.yahoo.search.yql.YqlParser.NORMALIZE_CASE;
+import static com.yahoo.search.yql.YqlParser.ONEAR;
+import static com.yahoo.search.yql.YqlParser.ORIGIN;
+import static com.yahoo.search.yql.YqlParser.ORIGIN_LENGTH;
+import static com.yahoo.search.yql.YqlParser.ORIGIN_OFFSET;
+import static com.yahoo.search.yql.YqlParser.ORIGIN_ORIGINAL;
+import static com.yahoo.search.yql.YqlParser.PHRASE;
+import static com.yahoo.search.yql.YqlParser.PREDICATE;
+import static com.yahoo.search.yql.YqlParser.PREFIX;
+import static com.yahoo.search.yql.YqlParser.RANGE;
+import static com.yahoo.search.yql.YqlParser.RANK;
+import static com.yahoo.search.yql.YqlParser.RANKED;
+import static com.yahoo.search.yql.YqlParser.SAME_ELEMENT;
+import static com.yahoo.search.yql.YqlParser.SCORE_THRESHOLD;
+import static com.yahoo.search.yql.YqlParser.SIGNIFICANCE;
+import static com.yahoo.search.yql.YqlParser.START_ANCHOR;
+import static com.yahoo.search.yql.YqlParser.STEM;
+import static com.yahoo.search.yql.YqlParser.SUBSTRING;
+import static com.yahoo.search.yql.YqlParser.SUFFIX;
+import static com.yahoo.search.yql.YqlParser.TARGET_HITS;
+import static com.yahoo.search.yql.YqlParser.TARGET_NUM_HITS;
+import static com.yahoo.search.yql.YqlParser.THRESHOLD_BOOST_FACTOR;
+import static com.yahoo.search.yql.YqlParser.UNIQUE_ID;
+import static com.yahoo.search.yql.YqlParser.URI;
+import static com.yahoo.search.yql.YqlParser.USE_POSITION_DATA;
+import static com.yahoo.search.yql.YqlParser.USER_INPUT_LANGUAGE;
+import static com.yahoo.search.yql.YqlParser.WAND;
+import static com.yahoo.search.yql.YqlParser.WEAK_AND;
+import static com.yahoo.search.yql.YqlParser.WEIGHT;
+import static com.yahoo.search.yql.YqlParser.WEIGHTED_SET;
+
 /**
  * The Select query language.
  *
@@ -75,6 +134,14 @@ import static com.yahoo.slime.Type.STRING;
  */
 public class SelectParser implements Parser {
 
+    private static final String AND = "and";
+    private static final String AND_NOT = "and_not";
+    private static final String CALL = "call";
+    private static final String CONTAINS = "contains";
+    private static final String EQ = "equals";
+    private static final String MATCHES = "matches";
+    private static final String OR = "or";
+
     Parsable query;
     private final IndexFacts indexFacts;
     private final Map<Integer, TaggableItem> identifiedItems = LazyMap.newHashMap();
@@ -82,65 +149,6 @@ public class SelectParser implements Parser {
     private final Normalizer normalizer;
     private IndexFacts.Session indexFactsSession;
 
-    // YQL parameters and functions
-    private static final String DESCENDING_HITS_ORDER = "descending";
-    private static final String ASCENDING_HITS_ORDER = "ascending";
-    private static final Integer DEFAULT_TARGET_NUM_HITS = 10;
-    private static final String ORIGIN_LENGTH = "length";
-    private static final String ORIGIN_OFFSET = "offset";
-    private static final String ORIGIN = "origin";
-    private static final String ORIGIN_ORIGINAL = "original";
-    private static final String CONNECTION_ID = "id";
-    private static final String CONNECTION_WEIGHT = "weight";
-    private static final String CONNECTIVITY = "connectivity";
-    private static final String ANNOTATIONS = "annotations";
-    private static final String NFKC = "nfkc";
-    private static final String USER_INPUT_LANGUAGE = "language";
-    private static final String ACCENT_DROP = "accentDrop";
-    private static final String ALTERNATIVES = "alternatives";
-    private static final String AND_SEGMENTING = "andSegmenting";
-    private static final String APPROXIMATE = "approximate";
-    private static final String DISTANCE = "distance";
-    private static final String DOT_PRODUCT = "dotProduct";
-    private static final String EQUIV = "equiv";
-    private static final String FILTER = "filter";
-    private static final String GEO_LOCATION = "geoLocation";
-    private static final String HIT_LIMIT = "hitLimit";
-    private static final String HNSW_EXPLORE_ADDITIONAL_HITS = "hnsw.exploreAdditionalHits";
-    private static final String IMPLICIT_TRANSFORMS = "implicitTransforms";
-    private static final String LABEL = "label";
-    private static final String NEAR = "near";
-    private static final String NEAREST_NEIGHBOR = "nearestNeighbor";
-    private static final String NORMALIZE_CASE = "normalizeCase";
-    private static final String ONEAR = "onear";
-    private static final String PHRASE = "phrase";
-    private static final String PREDICATE = "predicate";
-    private static final String PREFIX = "prefix";
-    private static final String RANKED = "ranked";
-    private static final String RANK = "rank";
-    private static final String SAME_ELEMENT = "sameElement";
-    private static final String SCORE_THRESHOLD = "scoreThreshold";
-    private static final String SIGNIFICANCE = "significance";
-    private static final String STEM = "stem";
-    private static final String SUBSTRING = "substring";
-    private static final String SUFFIX = "suffix";
-    private static final String TARGET_HITS = "targetHits";
-    private static final String TARGET_NUM_HITS = "targetNumHits";
-    private static final String THRESHOLD_BOOST_FACTOR = "thresholdBoostFactor";
-    private static final String UNIQUE_ID = "id";
-    private static final String USE_POSITION_DATA = "usePositionData";
-    private static final String WAND = "wand";
-    private static final String WEAK_AND = "weakAnd";
-    private static final String WEIGHTED_SET = "weightedSet";
-    private static final String WEIGHT = "weight";
-    private static final String AND = "and";
-    private static final String AND_NOT = "and_not";
-    private static final String OR = "or";
-    private static final String EQ = "equals";
-    private static final String RANGE = "range";
-    private static final String CONTAINS = "contains";
-    private static final String MATCHES = "matches";
-    private static final String CALL = "call";
     private static final List<String> FUNCTION_CALLS = Arrays.asList(WAND, WEIGHTED_SET, DOT_PRODUCT, GEO_LOCATION, NEAREST_NEIGHBOR, PREDICATE, RANK, WEAK_AND);
 
     public SelectParser(ParserEnvironment environment) {
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
index 446e855cdce..5b77da8c3b3 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
@@ -98,8 +98,8 @@ import com.yahoo.search.query.parser.ParserFactory;
  */
 public class YqlParser implements Parser {
 
-    private static final String DESCENDING_HITS_ORDER = "descending";
-    private static final String ASCENDING_HITS_ORDER = "ascending";
+    public static final String DESCENDING_HITS_ORDER = "descending";
+    public static final String ASCENDING_HITS_ORDER = "ascending";
 
     private enum SegmentWhen {
         NEVER, POSSIBLY, ALWAYS;
@@ -109,14 +109,14 @@ public class YqlParser implements Parser {
         public String expand(String leaf) { return leaf; }
     }
 
-    private static final Integer DEFAULT_HITS = 10;
+    public static final Integer DEFAULT_HITS = 10;
     private static final Integer DEFAULT_OFFSET = 0;
-    private static final Integer DEFAULT_TARGET_NUM_HITS = 10;
+    public static final Integer DEFAULT_TARGET_NUM_HITS = 10;
     private static final String ACCENT_DROP_DESCRIPTION = "setting for whether to remove accents if field implies it";
-    private static final String ANNOTATIONS = "annotations";
+    public static final String ANNOTATIONS = "annotations";
     private static final String FILTER_DESCRIPTION = "term filter setting";
     private static final String IMPLICIT_TRANSFORMS_DESCRIPTION = "setting for whether built-in query transformers should touch the term";
-    private static final String NFKC = "nfkc";
+    public static final String NFKC = "nfkc";
     private static final String NORMALIZE_CASE_DESCRIPTION = "setting for whether to do case normalization if field implies it";
     private static final String ORIGIN_DESCRIPTION = "string origin for a term";
     private static final String RANKED_DESCRIPTION = "setting for whether to use term for ranking";
@@ -125,7 +125,7 @@ public class YqlParser implements Parser {
     private static final String USER_INPUT_ALLOW_EMPTY = "allowEmpty";
     private static final String USER_INPUT_DEFAULT_INDEX = "defaultIndex";
     private static final String USER_INPUT_GRAMMAR = "grammar";
-    private static final String USER_INPUT_LANGUAGE = "language";
+    public static final String USER_INPUT_LANGUAGE = "language";
     private static final String USER_INPUT_RAW = "raw";
     private static final String USER_INPUT_SEGMENT = "segment";
     private static final String USER_INPUT = "userInput";
@@ -138,56 +138,56 @@ public class YqlParser implements Parser {
     public static final String SORTING_LOCALE = "locale";
     public static final String SORTING_STRENGTH = "strength";
 
-    static final String ACCENT_DROP = "accentDrop";
-    static final String ALTERNATIVES = "alternatives";
-    static final String AND_SEGMENTING = "andSegmenting";
-    static final String APPROXIMATE = "approximate";
-    static final String BOUNDS = "bounds";
-    static final String BOUNDS_LEFT_OPEN = "leftOpen";
-    static final String BOUNDS_OPEN = "open";
-    static final String BOUNDS_RIGHT_OPEN = "rightOpen";
-    static final String CONNECTION_ID = "id";
-    static final String CONNECTION_WEIGHT = "weight";
-    static final String CONNECTIVITY = "connectivity";
-    static final String DISTANCE = "distance";
-    static final String DOT_PRODUCT = "dotProduct";
-    static final String EQUIV = "equiv";
-    static final String FILTER = "filter";
-    static final String GEO_LOCATION = "geoLocation";
-    static final String HIT_LIMIT = "hitLimit";
-    static final String HNSW_EXPLORE_ADDITIONAL_HITS = "hnsw.exploreAdditionalHits";
-    static final String IMPLICIT_TRANSFORMS = "implicitTransforms";
-    static final String LABEL = "label";
-    static final String NEAR = "near";
-    static final String NEAREST_NEIGHBOR = "nearestNeighbor";
-    static final String NORMALIZE_CASE = "normalizeCase";
-    static final String ONEAR = "onear";
-    static final String ORIGIN_LENGTH = "length";
-    static final String ORIGIN_OFFSET = "offset";
-    static final String ORIGIN = "origin";
-    static final String ORIGIN_ORIGINAL = "original";
-    static final String PHRASE = "phrase";
-    static final String PREDICATE = "predicate";
-    static final String PREFIX = "prefix";
-    static final String RANGE = "range";
-    static final String RANKED = "ranked";
-    static final String RANK = "rank";
-    static final String SAME_ELEMENT = "sameElement";
-    static final String SCORE_THRESHOLD = "scoreThreshold";
-    static final String SIGNIFICANCE = "significance";
-    static final String STEM = "stem";
-    static final String SUBSTRING = "substring";
-    static final String SUFFIX = "suffix";
-    static final String TARGET_HITS = "targetHits";
-    static final String TARGET_NUM_HITS = "targetNumHits";
-    static final String THRESHOLD_BOOST_FACTOR = "thresholdBoostFactor";
-    static final String UNIQUE_ID = "id";
-    static final String USE_POSITION_DATA = "usePositionData";
-    static final String WAND = "wand";
-    static final String WEAK_AND = "weakAnd";
-    static final String WEIGHTED_SET = "weightedSet";
-    static final String WEIGHT = "weight";
-    static final String URI = "uri";
+    public static final String ACCENT_DROP = "accentDrop";
+    public static final String ALTERNATIVES = "alternatives";
+    public static final String AND_SEGMENTING = "andSegmenting";
+    public static final String APPROXIMATE = "approximate";
+    public static final String BOUNDS = "bounds";
+    public static final String BOUNDS_LEFT_OPEN = "leftOpen";
+    public static final String BOUNDS_OPEN = "open";
+    public static final String BOUNDS_RIGHT_OPEN = "rightOpen";
+    public static final String CONNECTION_ID = "id";
+    public static final String CONNECTION_WEIGHT = "weight";
+    public static final String CONNECTIVITY = "connectivity";
+    public static final String DISTANCE = "distance";
+    public static final String DOT_PRODUCT = "dotProduct";
+    public static final String EQUIV = "equiv";
+    public static final String FILTER = "filter";
+    public static final String GEO_LOCATION = "geoLocation";
+    public static final String HIT_LIMIT = "hitLimit";
+    public static final String HNSW_EXPLORE_ADDITIONAL_HITS = "hnsw.exploreAdditionalHits";
+    public static final String IMPLICIT_TRANSFORMS = "implicitTransforms";
+    public static final String LABEL = "label";
+    public static final String NEAR = "near";
+    public static final String NEAREST_NEIGHBOR = "nearestNeighbor";
+    public static final String NORMALIZE_CASE = "normalizeCase";
+    public static final String ONEAR = "onear";
+    public static final String ORIGIN_LENGTH = "length";
+    public static final String ORIGIN_OFFSET = "offset";
+    public static final String ORIGIN = "origin";
+    public static final String ORIGIN_ORIGINAL = "original";
+    public static final String PHRASE = "phrase";
+    public static final String PREDICATE = "predicate";
+    public static final String PREFIX = "prefix";
+    public static final String RANGE = "range";
+    public static final String RANKED = "ranked";
+    public static final String RANK = "rank";
+    public static final String SAME_ELEMENT = "sameElement";
+    public static final String SCORE_THRESHOLD = "scoreThreshold";
+    public static final String SIGNIFICANCE = "significance";
+    public static final String STEM = "stem";
+    public static final String SUBSTRING = "substring";
+    public static final String SUFFIX = "suffix";
+    public static final String TARGET_HITS = "targetHits";
+    public static final String TARGET_NUM_HITS = "targetNumHits";
+    public static final String THRESHOLD_BOOST_FACTOR = "thresholdBoostFactor";
+    public static final String UNIQUE_ID = "id";
+    public static final String USE_POSITION_DATA = "usePositionData";
+    public static final String WAND = "wand";
+    public static final String WEAK_AND = "weakAnd";
+    public static final String WEIGHTED_SET = "weightedSet";
+    public static final String WEIGHT = "weight";
+    public static final String URI = "uri";
 
     private final IndexFacts indexFacts;
     private final List<ConnectedItem> connectedItems = new ArrayList<>();