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 8A9A9DA87 for ; Wed, 3 Oct 2012 20:03:15 +0000 (UTC) Received: (qmail 16974 invoked by uid 500); 3 Oct 2012 20:03:15 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 16945 invoked by uid 500); 3 Oct 2012 20:03:15 -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 16935 invoked by uid 99); 3 Oct 2012 20:03:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2012 20:03: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; Wed, 03 Oct 2012 20:03:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CD94C23889F7; Wed, 3 Oct 2012 20:02:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1393740 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene: LuceneEditor.java LuceneIndex.java Date: Wed, 03 Oct 2012 20:02:28 -0000 To: oak-commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121003200228.CD94C23889F7@eris.apache.org> Author: alexparvulescu Date: Wed Oct 3 20:02:28 2012 New Revision: 1393740 URL: http://svn.apache.org/viewvc?rev=1393740&view=rev Log: OAK-340 Basic reindex support in the lucene index - setting the path to Iterable was a bad idea, it can get consumed and future iteration will just get an empty iterator Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditor.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditor.java?rev=1393740&r1=1393739&r2=1393740&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneEditor.java Wed Oct 3 20:02:28 2012 @@ -73,10 +73,10 @@ class LuceneEditor implements CommitHook } } - private final Iterable path; + private final IndexDefinition index; public LuceneEditor(IndexDefinition indexDefinition) { - this.path = elements(indexDefinition.getPath()); + this.index = indexDefinition; } /* @@ -89,7 +89,7 @@ class LuceneEditor implements CommitHook throws CommitFailedException { NodeBuilder rootBuilder = after.getBuilder(); NodeBuilder builder = rootBuilder; - for (String name : path) { + for (String name : elements(index.getPath())) { builder = builder.getChildBuilder(name); } builder = builder.getChildBuilder(INDEX_DATA_CHILD_NAME); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java?rev=1393740&r1=1393739&r2=1393740&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java Wed Oct 3 20:02:28 2012 @@ -80,11 +80,8 @@ public class LuceneIndex implements Quer private final IndexDefinition index; - private final Iterable path; - public LuceneIndex(IndexDefinition indexDefinition) { this.index = indexDefinition; - this.path = elements(indexDefinition.getPath()); } @Override @@ -106,7 +103,7 @@ public class LuceneIndex implements Quer public Cursor query(Filter filter, NodeState root) { NodeBuilder builder = new ReadOnlyBuilder(root); - for (String name : path) { + for (String name : elements(index.getPath())) { builder = builder.getChildBuilder(name); } if (!builder.hasChildNode(INDEX_DATA_CHILD_NAME)) {