svn commit: r1631630 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java

[ch...@apache.org]

Author: chetanm
Date: Tue Oct 14 06:11:03 2014
New Revision: 1631630

URL: http://svn.apache.org/r1631630
Log:
OAK-2005 - Use separate Lucene index for performing property related queries

For property index create Lucene document only if any of the property is indexed

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/LuceneIndexEditorTest.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=1631630&r1=1631629&r2=1631630&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 Tue Oct 14 06:11:03 2014
@@ -239,6 +239,13 @@ public class LuceneIndexEditor implement
             // updated the state but had no relevant changes
             return null;
         }
+
+        //For property index no use making an empty document if
+        //none of the properties are indexed
+        if(!context.isFullTextEnabled() && !dirty){
+            return null;
+        }
+
         Document document = new Document();
         document.add(newPathField(path));
         String name = getName(path);

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java?rev=1631630&r1=1631629&r2=1631630&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java Tue Oct 14 06:11:03 2014
@@ -129,6 +129,26 @@ public class LuceneIndexEditorTest {
                 dateToTime("05/05/2014"), dateToTime("05/07/2014"), true, true)));
     }
 
+    @Test
+    public void noOfDocsIndexedNonFullText() throws Exception{
+        NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
+        NodeBuilder nb = newLuceneIndexDefinition(index, "lucene",
+                of(TYPENAME_STRING));
+        nb.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
+        nb.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo"), STRINGS));
+
+        NodeState before = builder.getNodeState();
+        builder.child("test").setProperty("foo", "fox is jumping");
+        builder.child("test2").setProperty("bar", "kite is flying");
+        builder.child("test3").setProperty("foo", "wind is blowing");
+        NodeState after = builder.getNodeState();
+
+        NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
+        tracker.update(indexed);
+
+        assertEquals(2, getSearcher().getIndexReader().numDocs());
+    }
+
     @After
     public void releaseIndexNode(){
         if(indexNode != null){