svn commit: r1760839 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java

[chetanm]

Author: chetanm
Date: Thu Sep 15 07:15:55 2016
New Revision: 1760839

URL: http://svn.apache.org/viewvc?rev=1760839&view=rev
Log:
OAK-4412 - Lucene hybrid index

Avoid adding deleted doc to the list as they get created for any deleted path 
and for local indexing are anyway dropped later in DocumentQueue processing

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java
    
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java?rev=1760839&r1=1760838&r2=1760839&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java
 Thu Sep 15 07:15:55 2016
@@ -76,7 +76,9 @@ public class LocalIndexWriterFactory imp
 
         @Override
         public void deleteDocuments(String path) throws IOException {
-            
addLuceneDoc(LuceneDoc.forDelete(definition.getIndexPathFromConfig(), path));
+            //Hybrid index logic drops the deletes. So no use to
+            //add them to the list
+            
//addLuceneDoc(LuceneDoc.forDelete(definition.getIndexPathFromConfig(), path));
         }
 
         @Override

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java?rev=1760839&r1=1760838&r2=1760839&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactoryTest.java
 Thu Sep 15 07:15:55 2016
@@ -113,8 +113,8 @@ public class LocalIndexWriterFactoryTest
         LuceneDocumentHolder holder = getHolder();
         assertNotNull(holder);
 
-        //2 add and 1 delete
-        assertEquals(3, 
holder.getAsyncIndexedDocList("/oak:index/fooIndex").size());
+        //2 add none for delete
+        assertEquals(2, 
holder.getAsyncIndexedDocList("/oak:index/fooIndex").size());
     }
 
     @Test
@@ -130,11 +130,11 @@ public class LocalIndexWriterFactoryTest
         LuceneDocumentHolder holder = getHolder();
         assertNotNull(holder);
 
-        //1 add and 1 delete - bar
-        assertEquals(2, 
holder.getAsyncIndexedDocList("/oak:index/fooIndex").size());
+        //1 add  - bar
+        assertEquals(1, 
holder.getAsyncIndexedDocList("/oak:index/fooIndex").size());
 
-        //1 add and 1 delete - bar
-        assertEquals(2, 
holder.getAsyncIndexedDocList("/oak:index/barIndex").size());
+        //1 add  - bar
+        assertEquals(1, 
holder.getAsyncIndexedDocList("/oak:index/barIndex").size());
 
     }