Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5650CD03F for ; Fri, 1 Feb 2013 15:58:17 +0000 (UTC) Received: (qmail 17885 invoked by uid 500); 1 Feb 2013 15:58:17 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 17858 invoked by uid 500); 1 Feb 2013 15:58:16 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 17687 invoked by uid 99); 1 Feb 2013 15:58:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 15:58:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 15:58:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D1515238896F; Fri, 1 Feb 2013 15:57:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441498 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: query/Query.java query/index/FilterImpl.java spi/query/Filter.java Date: Fri, 01 Feb 2013 15:57:52 -0000 To: oak-commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130201155752.D1515238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: alexparvulescu Date: Fri Feb 1 15:57:52 2013 New Revision: 1441498 URL: http://svn.apache.org/viewvc?rev=1441498&view=rev Log: OAK-600 Query log tweaks Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java?rev=1441498&r1=1441497&r2=1441498&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java Fri Feb 1 15:57:52 2013 @@ -75,7 +75,7 @@ public class Query { */ public static final String JCR_SCORE = "jcr:score"; - private static final Logger LOG = LoggerFactory.getLogger(QueryEngineImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(Query.class); final SourceImpl source; final String statement; @@ -317,7 +317,8 @@ public class Query { it = Arrays.asList(r).iterator(); } else { if (LOG.isDebugEnabled()) { - LOG.debug("plan: " + getPlan()); + LOG.debug("query execute {} ", statement); + LOG.debug("query plan {}", getPlan()); } if (orderings == null) { // can apply limit and offset directly Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1441498&r1=1441497&r2=1441498&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java Fri Feb 1 15:57:52 2013 @@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.query. import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map.Entry; @@ -273,17 +274,29 @@ public class FilterImpl implements Filte @Override public String toString() { + if (alwaysFalse) { + return "Filter(always false)"; + } StringBuilder buff = new StringBuilder(); + buff.append("Filter("); if (queryStatement != null) { - buff.append("query ").append(queryStatement).append('\n'); - } - if (alwaysFalse) { - return "(always false)"; + buff.append("query=").append(queryStatement); } - buff.append("path: ").append(path).append(pathRestriction).append('\n'); - for (Entry p : propertyRestrictions.entrySet()) { - buff.append("property ").append(p.getKey()).append(": ").append(p.getValue()).append('\n'); + buff.append(", path=").append(path).append(pathRestriction); + if (!propertyRestrictions.isEmpty()) { + buff.append(", property=["); + Iterator> iterator = propertyRestrictions + .entrySet().iterator(); + while (iterator.hasNext()) { + Entry p = iterator.next(); + buff.append(p.getKey()).append("=").append(p.getValue()); + if (iterator.hasNext()) { + buff.append(", "); + } + } + buff.append("]"); } + buff.append(")"); return buff.toString(); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java?rev=1441498&r1=1441497&r2=1441498&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java Fri Feb 1 15:57:52 2013 @@ -144,8 +144,13 @@ public interface Filter { @Override public String toString() { - return (first == null ? "" : ((firstIncluding ? "[" : "(") + first)) + ".." + - (last == null ? "" : last + (lastIncluding ? "]" : ")")); + String f = first == null ? "" : first.toString(); + String l = last == null ? "" : last.toString(); + if (f.equals(l)) { + return f; + } + return (firstIncluding ? "[" : "(") + f + ".." + l + + (lastIncluding ? "]" : ")"); } }