aboutsummaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 13:12:46 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:22:55 +0200
commit25f832e613bb6087327c293b527d5445babb4319 (patch)
tree8197a5b331e845bfe91f006d9cfe8bec9a28170f /container-search
parent4e6825b47270804a36e7d76b873ca6c2fe360eac (diff)
LogLevel.DEBUG -> Level.FINE
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/search/Query.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java4
-rw-r--r--container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java6
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java4
-rw-r--r--container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java10
6 files changed, 14 insertions, 14 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 0966ae3e4c0..9e3f6d20e36 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -726,7 +726,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
if (includeQuery)
message += ": [" + queryTreeText() + "]";
- log.log(LogLevel.DEBUG,message);
+ log.log(Level.FINE,message);
// Pass 0 as traceLevel as the trace level check is already done above,
// and it is not propagated to trace until execution has started
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
index 30860f9570b..dbde0ad409f 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
@@ -227,7 +227,7 @@ public class GroupingExecutor extends Searcher {
}
if (log.isLoggable(LogLevel.DEBUG)) {
for (Grouping grouping : passList) {
- log.log(LogLevel.DEBUG, "Pass(" + pass + "), Grouping(" + grouping.getId() + "): " + grouping);
+ log.log(Level.FINE, "Pass(" + pass + "), Grouping(" + grouping.getId() + "): " + grouping);
}
}
Item passRoot;
@@ -265,7 +265,7 @@ public class GroupingExecutor extends Searcher {
}
if (log.isLoggable(LogLevel.DEBUG)) {
for (Grouping grouping : groupingMap.values()) {
- log.log(LogLevel.DEBUG, "Result Grouping(" + grouping.getId() + "): " + grouping);
+ log.log(Level.FINE, "Result Grouping(" + grouping.getId() + "): " + grouping);
}
}
return ret;
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index ee81f2c819e..2a8eeaf8e7f 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -154,7 +154,7 @@ public class SearchHandler extends LoggingRequestHandler {
long numQueriesToTraceOnDebugAfterStartup,
Optional<String> hostResponseHeaderKey) {
super(executor, accessLog, metric, true);
- log.log(LogLevel.DEBUG, "SearchHandler.init " + System.identityHashCode(this));
+ log.log(Level.FINE, "SearchHandler.init " + System.identityHashCode(this));
this.queryProfileRegistry = queryProfileRegistry;
this.executionFactory = executionFactory;
@@ -426,7 +426,7 @@ public class SearchHandler extends LoggingRequestHandler {
} catch (ParseException e) {
ErrorMessage error = ErrorMessage.createIllegalQuery("Could not parse query [" + request + "]: "
+ Exceptions.toMessageString(e));
- log.log(LogLevel.DEBUG, error::getDetailedMessage);
+ log.log(Level.FINE, error::getDetailedMessage);
return new Result(query, error);
} catch (IllegalArgumentException e) {
if ("Comparison method violates its general contract!".equals(e.getMessage())) {
@@ -438,7 +438,7 @@ public class SearchHandler extends LoggingRequestHandler {
else {
ErrorMessage error = ErrorMessage.createBadRequest("Invalid search request [" + request + "]: "
+ Exceptions.toMessageString(e));
- log.log(LogLevel.DEBUG, error::getDetailedMessage);
+ log.log(Level.FINE, error::getDetailedMessage);
return new Result(query, error);
}
} catch (LinkageError | StackOverflowError e) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java
index d4db21c3810..d66aff7bcd7 100644
--- a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java
+++ b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java
@@ -289,7 +289,7 @@ public class RewriterUtils {
* @param msg Log message
*/
public static void log(Logger logger, String msg) {
- logger.log(LogLevel.DEBUG, logger.getName() + ": " + msg);
+ logger.log(Level.FINE, logger.getName() + ": " + msg);
}
/**
@@ -303,7 +303,7 @@ public class RewriterUtils {
if(query!=null) {
query.trace(logger.getName() + ": " + msg, true, TRACELEVEL);
}
- logger.log(LogLevel.DEBUG, logger.getName() + ": " + msg);
+ logger.log(Level.FINE, logger.getName() + ": " + msg);
}
/**
diff --git a/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java b/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java
index 7d9d3f147f5..65b3fc5a805 100644
--- a/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/searchers/InputCheckingSearcher.java
@@ -52,7 +52,7 @@ public class InputCheckingSearcher extends Searcher {
checkQuery(query);
} catch (IllegalArgumentException e) {
if (log.isLoggable(LogLevel.DEBUG)) {
- log.log(LogLevel.DEBUG, "Rejected query \"" + query.toString() + "\" on cause of: " + e.getMessage());
+ log.log(Level.FINE, "Rejected query \"" + query.toString() + "\" on cause of: " + e.getMessage());
}
return new Result(query, ErrorMessage.createIllegalQuery(e.getMessage()));
}
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index ad92512d1a1..f7c8c646bb4 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
@@ -330,20 +330,20 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
VisitorSession session = visitorSessionFactory.createVisitorSession(params);
try {
if ( !session.waitUntilDone(query.getTimeout())) {
- log.log(LogLevel.DEBUG, "Visitor returned from waitUntilDone without being completed for " + query + " with selection " + params.getDocumentSelection());
+ log.log(Level.FINE, "Visitor returned from waitUntilDone without being completed for " + query + " with selection " + params.getDocumentSelection());
session.abort();
throw new TimeoutException("Query timed out in " + VdsStreamingSearcher.class.getName());
}
} finally {
session.destroy();
sessionTrace = session.getTrace();
- log.log(LogLevel.DEBUG, () -> sessionTrace.toString());
+ log.log(Level.FINE, () -> sessionTrace.toString());
query.trace(sessionTrace.toString(), false, 9);
}
if (params.getControlHandler().getResult().code == VisitorControlHandler.CompletionCode.SUCCESS) {
if (log.isLoggable(LogLevel.DEBUG)) {
- log.log(LogLevel.DEBUG, "VdsVisitor completed successfully for " + query + " with selection " + params.getDocumentSelection());
+ log.log(Level.FINE, "VdsVisitor completed successfully for " + query + " with selection " + params.getDocumentSelection());
}
} else {
throw new IllegalArgumentException("Query failed: " // TODO: Is it necessary to use a runtime exception?
@@ -394,7 +394,7 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
final int hitCountTotal = sr.getTotalHitCount();
final int hitCount = sr.getHitCount();
if (log.isLoggable(LogLevel.DEBUG)) {
- log.log(LogLevel.DEBUG, "Got SearchResult with " + hitCountTotal + " in total and " + hitCount + " hits in real for query with selection " + params.getDocumentSelection());
+ log.log(Level.FINE, "Got SearchResult with " + hitCountTotal + " in total and " + hitCount + " hits in real for query with selection " + params.getDocumentSelection());
}
List<SearchResult.Hit> newHits = new ArrayList<>(hitCount);
@@ -449,7 +449,7 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
private void handleSummary(DocumentSummary ds) {
int summaryCount = ds.getSummaryCount();
if (log.isLoggable(LogLevel.DEBUG)) {
- log.log(LogLevel.DEBUG, "Got DocumentSummary with " + summaryCount + " summaries for query with selection " + params.getDocumentSelection());
+ log.log(Level.FINE, "Got DocumentSummary with " + summaryCount + " summaries for query with selection " + params.getDocumentSelection());
}
synchronized (summaryMap) {
for (int i = 0; i < summaryCount; i++) {