Author: alexparvulescu Date: Wed Sep 4 15:16:53 2013 New Revision: 1520048
URL: http://svn.apache.org/r1520048 Log: OAK-828 Full-text support for index aggregates - add node name to the lucene index Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1520048&r1=1520047&r2=1520048&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Wed Sep 4 15:16:53 2013 @@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin import static org.apache.jackrabbit.JcrConstants.JCR_DATA; import static org.apache.jackrabbit.oak.commons.PathUtils.concat; +import static org.apache.jackrabbit.oak.commons.PathUtils.getName; import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.getString; import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldFactory.newFulltextField; import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldFactory.newPathField; @@ -32,7 +33,6 @@ import org.apache.jackrabbit.oak.api.Blo import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.index.IndexEditor; import org.apache.jackrabbit.oak.spi.commit.Editor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -157,7 +157,7 @@ public class LuceneIndexEditor implement @Override public Editor childNodeDeleted(String name, NodeState before) throws CommitFailedException { - String path = PathUtils.concat(getPath(), name); + String path = concat(getPath(), name); try { IndexWriter writer = context.getWriter(); @@ -176,6 +176,10 @@ public class LuceneIndexEditor implement private Document makeDocument(String path, NodeState state) { Document document = new Document(); document.add(newPathField(path)); + String name = getName(path); + if (name != null) { + document.add(newFulltextField(name)); + } for (PropertyState property : state.getProperties()) { String pname = property.getName(); Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java?rev=1520048&r1=1520047&r2=1520048&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java Wed Sep 4 15:16:53 2013 @@ -41,8 +41,6 @@ import org.apache.jackrabbit.oak.spi.sec import org.junit.Test; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; public class LuceneIndexAggregationTest extends AbstractQueryTest {
