Merge pull request #23097 from vespa-engine/bratseth/trace

Bratseth/trace 

8 files changed, 17 insertions, 17 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index 496e057a243..729aebf2fc2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -204,7 +204,7 @@ public class ClusterSearcher extends Searcher {
     private void validateQueryTimeout(Query query) {
         if (query.getTimeout() <= maxQueryTimeout) return;
 
-        if (query.isTraceable(2)) {
+        if (query.getTrace().isTraceable(2)) {
             query.trace("Query timeout (" + query.getTimeout() + " ms) > max query timeout (" +
                         maxQueryTimeout + " ms). Setting timeout to " + maxQueryTimeout + " ms.", 2);
         }
@@ -215,7 +215,7 @@ public class ClusterSearcher extends Searcher {
         if ( ! query.getRanking().getQueryCache() ) return;
         if (query.getTimeout() <= maxQueryCacheTimeout) return;
 
-        if (query.isTraceable(2)) {
+        if (query.getTrace().isTraceable(2)) {
             query.trace("Query timeout (" + query.getTimeout() + " ms) > max query cache timeout (" +
                         maxQueryCacheTimeout + " ms). Disabling query cache.", 2);
         }
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
index 33ad8d8c9a8..edd11974f8c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
@@ -106,7 +106,7 @@ public class FastSearcher extends VespaBackEndSearcher {
             return new Result(query,ErrorMessage.createTimeout(e.getMessage()));
         } catch (IOException e) {
             Result result = new Result(query);
-            if (query.getTraceLevel() >= 1)
+            if (query.getTrace().getLevel() >= 1)
                 query.trace(getName() + " error response: " + result, false, 1);
             result.hits().addError(ErrorMessage.createBackendCommunicationError(getName() + " failed: "+ e.getMessage()));
             return result;
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
index 584249fa1f3..e184037bc90 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
@@ -190,7 +190,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
 
         Result result = doSearch2(query, execution);
 
-        if (query.getTraceLevel() >= 1)
+        if (query.getTrace().getLevel() >= 1)
             query.trace(getName() + " dispatch response: " + result, false, 1);
         result.trace(getName());
         return result;
@@ -243,7 +243,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
     }
 
     void traceQuery(String sourceName, String type, Query query, int offset, int hits, int level, Optional<String> quotedSummaryClass) {
-        if ((query.getTraceLevel()<level) || query.properties().getBoolean(TRACE_DISABLE)) return;
+        if ((query.getTrace().getLevel()<level) || query.properties().getBoolean(TRACE_DISABLE)) return;
 
         StringBuilder s = new StringBuilder();
         s.append(sourceName).append(" ").append(type).append(" to dispatch: ")
@@ -314,12 +314,12 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
         }
 
         query.trace(s.toString(), false, level);
-        if (query.isTraceable(level + 1)) {
+        if (query.getTrace().isTraceable(level + 1)) {
             query.trace("Current state of query tree: "
                             + new TextualQueryRepresentation(query.getModel().getQueryTree().getRoot()),
                     false, level+1);
         }
-        if (query.isTraceable(level + 2)) {
+        if (query.getTrace().isTraceable(level + 2)) {
             query.trace("YQL+ representation: " + query.yqlRepresentation(), level+2);
         }
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
index 8cc820d8f76..545bb8e777f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
@@ -21,7 +21,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.MINUS;
 import static com.yahoo.prelude.query.parser.Token.Kind.SPACE;
 
 /**
- * Parser for queries of type all.
+ * Parser for queries of type all and weakAnd.
  *
  * @author Steinar Knutsen
  * @author bratseth
@@ -31,9 +31,9 @@ public class AllParser extends SimpleParser {
     private final boolean weakAnd;
 
     /**
-     * Creates an And parser
+     * Creates an all/weakAnd parser
      *
-     * @param weakAnd false to parse into AndItem (by default), true to parse to WeakAnd
+     * @param weakAnd false to parse into AndItem (by default), true to parse to WeakAndItem
      */
     public AllParser(ParserEnvironment environment, boolean weakAnd) {
         super(environment);
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/LiteralBoostSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/LiteralBoostSearcher.java
index 47a5213c041..28d4d9dff67 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/LiteralBoostSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/LiteralBoostSearcher.java
@@ -44,7 +44,7 @@ public class LiteralBoostSearcher extends Searcher {
         if (newRankTerms.getItemCount() > 0)
             addTopLevelRankTerms(newRankTerms, query);
 
-        if (query.getTraceLevel() >= 2 && newRankTerms.getItemCount() > 0)
+        if (query.getTrace().getLevel() >= 2 && newRankTerms.getItemCount() > 0)
             query.trace("Added rank terms for possible literal field matches.", true, 2);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java
index a847a84e134..b7fd1069a6b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java
@@ -53,11 +53,11 @@ public class NormalizingSearcher extends Searcher {
     }
 
     protected void normalize(Query query, IndexFacts.Session indexFacts) {
-        String oldQuery = (query.getTraceLevel() >= 2) ? query.getModel().getQueryTree().getRoot().toString() : null;
+        String oldQuery = (query.getTrace().getLevel() >= 2) ? query.getModel().getQueryTree().getRoot().toString() : null;
 
         normalizeBody(query, indexFacts);
 
-        if (query.getTraceLevel() >= 2 && ! query.getModel().getQueryTree().getRoot().toString().equals(oldQuery))
+        if (query.getTrace().getLevel() >= 2 && ! query.getModel().getQueryTree().getRoot().toString().equals(oldQuery))
             query.trace(getFunctionName(), true, 2);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java
index 4980b035876..5a168d42779 100644
--- a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java
+++ b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java
@@ -312,14 +312,14 @@ public class RuleBase {
      *         If there is an error, this query is destroyed (unusable)
      */
     public String analyze(Query query, int traceLevel) {
-        int queryTraceLevel = query.getTraceLevel();
+        int queryTraceLevel = query.getTrace().getLevel();
         if (traceLevel > 0 && queryTraceLevel == 0)
-            query.setTraceLevel(1);
+            query.getTrace().setLevel(1);
 
         matchAutomata(query, traceLevel);
         String error = analyzer.evaluate(query, traceLevel);
 
-        query.setTraceLevel(queryTraceLevel);
+        query.getTrace().setLevel(queryTraceLevel);
         return error;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java b/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java
index e25f00bdc80..42a2b4f4e9b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java
@@ -84,7 +84,7 @@ public class SemanticSearcher extends Searcher {
         if (query.properties().getBoolean(rulesOff))
             return execution.search(query);
 
-        int traceLevel = query.properties().getInteger(tracelevelRules, query.getTraceLevel() - 2);
+        int traceLevel = query.properties().getInteger(tracelevelRules, query.getTrace().getLevel() - 2);
         if (traceLevel < 0) traceLevel = 0;
         RuleBase ruleBase = resolveRuleBase(query);
         if (ruleBase == null)