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 A67C8D1A6 for ; Fri, 5 Oct 2012 14:11:49 +0000 (UTC) Received: (qmail 84048 invoked by uid 500); 5 Oct 2012 14:11:49 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 84025 invoked by uid 500); 5 Oct 2012 14:11:49 -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 83981 invoked by uid 99); 5 Oct 2012 14:11:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2012 14:11:49 +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, 05 Oct 2012 14:11:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 024C62388A3D; Fri, 5 Oct 2012 14:11:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1394538 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Date: Fri, 05 Oct 2012 14:11:02 -0000 To: oak-commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121005141103.024C62388A3D@eris.apache.org> Author: alexparvulescu Date: Fri Oct 5 14:11:02 2012 New Revision: 1394538 URL: http://svn.apache.org/viewvc?rev=1394538&view=rev Log: OAK-367 Lucene index cannot handle child properties in queries Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1394538&r1=1394537&r2=1394538&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Fri Oct 5 14:11:02 2012 @@ -192,6 +192,10 @@ public class LuceneIndex implements Quer for (PropertyRestriction pr : filter.getPropertyRestrictions()) { String name = pr.propertyName; + if (name.contains("/")) { + // lucene cannot handle child-level property restrictions + continue; + } String first = null; String last = null; boolean isLike = pr.isLike; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1394538&r1=1394537&r2=1394538&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Fri Oct 5 14:11:02 2012 @@ -26,8 +26,6 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.CompositeHook; import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; -import org.junit.Ignore; -import org.junit.Test; /** * Tests the query engine using the default index implementation: the @@ -55,10 +53,4 @@ public class LuceneIndexQueryTest extend return new Oak(mk).with(qip).with(ch).createContentRepository(); } - @Test - @Ignore("OAK-367") - public void sql2() throws Exception { - test("sql2.txt"); - } - } \ No newline at end of file