You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:24:24 UTC
[sling-org-apache-sling-tracer] 24/30: SLING-5507 - Collect more
details around query execution
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.tracer-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tracer.git
commit b62cf457ca2b5069132c094307a2ce3b012e74d8
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Thu Feb 11 04:49:24 2016 +0000
SLING-5507 - Collect more details around query execution
Handle case for union queries
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/tracer@1729762 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/tracer/internal/JSONRecording.java | 58 +++++++++++++++-------
.../sling/tracer/internal/JSONRecordingTest.java | 7 ++-
2 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java b/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java
index c0aec8a..f508e9e 100644
--- a/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java
+++ b/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java
@@ -59,6 +59,7 @@ class JSONRecording implements Recording, Comparable<JSONRecording> {
"org.apache.sling.resourceresolver", //Sling package would come first in stack so listed first
"org.apache.jackrabbit.oak"
};
+ private static final Object[] EMPTY = new Object[0];
private static final Logger log = LoggerFactory.getLogger(JSONRecording.class);
public static final String OAK_QUERY_PKG = "org.apache.jackrabbit.oak.query";
private final String method;
@@ -300,7 +301,6 @@ class JSONRecording implements Recording, Comparable<JSONRecording> {
* The MDC key is used in org.apache.jackrabbit.oak.query.QueryEngineImpl
*/
static final String MDC_QUERY_ID = "oak.query.id";
- static final String QE_LOGGER = "org.apache.jackrabbit.oak.query.QueryImpl";
String query;
String plan;
String id;
@@ -319,17 +319,32 @@ class JSONRecording implements Recording, Comparable<JSONRecording> {
id = idFromMDC;
}
+ //TODO Query time. Change Oak to provide this information via some
+ //dedicated Audit logging such that below reliance on impl details
+ //can be avoided
String msg = tuple.getMessage();
- if (Level.DEBUG == level
- && QE_LOGGER.equals(logger)
- && msg != null){
-
- //The Log stmt are as present in org.apache.jackrabbit.oak.query.QueryImpl
- if (msg.startsWith("query execute ")){
- query = msg.substring("query execute ".length());
- caller = determineCaller();
- } else if (msg.startsWith("query plan ")){
- plan = msg.substring("query plan ".length());
+ if (Level.DEBUG == level && msg != null) {
+ Object[] args = tuple.getArgArray() == null ? EMPTY : tuple.getArgArray();
+ if (query == null){
+ if ("org.apache.jackrabbit.oak.query.QueryEngineImpl".equals(logger)
+ && msg.contains("Parsing") && args.length == 2){
+ //LOG.debug("Parsing {} statement: {}", language, statement);
+ query = nullSafeString(args[1]);
+ caller = determineCaller();
+ }
+ }
+
+ //Plan for union query are logged separately
+ if (plan == null){
+ if ("org.apache.jackrabbit.oak.query.QueryImpl".equals(logger)
+ && msg.startsWith("query plan ")){
+ //logDebug("query execute " + statement);
+ plan = msg.substring("query plan ".length());
+ } else if ("org.apache.jackrabbit.oak.query.UnionQueryImpl".equals(logger)
+ && msg.contains("query union plan") && args.length > 0){
+ // LOG.debug("query union plan {}", getPlan());
+ plan = nullSafeString(args[0]);
+ }
}
}
}
@@ -343,8 +358,8 @@ class JSONRecording implements Recording, Comparable<JSONRecording> {
}
public void addQueryEntry(){
- if (query != null){
- queries.add(new QueryEntry(safeTrim(query), safeTrim(plan), caller));
+ if (query != null && plan != null){
+ queries.add(new QueryEntry(nullSafeTrim(query), nullSafeTrim(plan), caller));
plan = query = null;
}
}
@@ -353,13 +368,20 @@ class JSONRecording implements Recording, Comparable<JSONRecording> {
//Push any last pending entry i.e. last query
addQueryEntry();
}
+ }
- private String safeTrim(String s){
- if(s == null){
- return "";
- }
- return s.trim();
+ private static String nullSafeTrim(String s){
+ if(s == null){
+ return "";
+ }
+ return s.trim();
+ }
+
+ private static String nullSafeString(Object o){
+ if (o != null){
+ return o.toString();
}
+ return null;
}
}
diff --git a/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java b/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java
index e0a2476..14ab480 100644
--- a/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java
+++ b/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java
@@ -53,7 +53,8 @@ public class JSONRecordingTest {
JSONRecording r = new JSONRecording("abc", request, true);
MDC.put(MDC_QUERY_ID, "1");
- r.log(tc, Level.DEBUG, QE_LOGGER, tuple("query execute SELECT FOO"));
+ r.log(tc, Level.DEBUG, "org.apache.jackrabbit.oak.query.QueryEngineImpl",
+ tuple("Parsing {} statement: {}", "XPATH", "SELECT FOO"));
r.log(tc, Level.DEBUG, QE_LOGGER, tuple("query plan FOO PLAN"));
r.done();
@@ -112,4 +113,8 @@ public class JSONRecordingTest {
private static FormattingTuple tuple(String msg){
return MessageFormatter.format(msg, null);
}
+
+ private static FormattingTuple tuple(String msg, String ... params){
+ return MessageFormatter.arrayFormat(msg, params);
+ }
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.