You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/08/18 11:35:02 UTC

svn commit: r1805402 - in /jackrabbit/oak/branches/1.4: ./ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ oak-lucene/src/test/java/org/apache/j...

Author: chetanm
Date: Fri Aug 18 11:35:02 2017
New Revision: 1805402

URL: http://svn.apache.org/viewvc?rev=1805402&view=rev
Log:
OAK-5238 - IndexCopier causes concurrent update on NodeBuilder

Merge 1774256 after adapting for 1.4

Added:
    jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java
      - copied, changed from r1774256, jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java
Modified:
    jackrabbit/oak/branches/1.4/   (props changed)
    jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
    jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
    jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
    jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectoryTest.java
    jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectory_Segment_Test.java
    jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java

Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 18 11:35:02 2017
@@ -1,4 +1,4 @@
 /jackrabbit/oak/branches/1.0:1665962
 /jackrabbit/oak/branches/1.6:1802566
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
 ,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1772
 906,1773190,1774141,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
 ,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1772
 906,1773190,1774141,1774256,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026
 /jackrabbit/trunk:1345480

Modified: jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1805402&r1=1805401&r2=1805402&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Fri Aug 18 11:35:02 2017
@@ -88,7 +88,7 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NODE_TYPES_PATH;
 
-class IndexDefinition implements Aggregate.AggregateMapper {
+public class IndexDefinition implements Aggregate.AggregateMapper {
     /**
      * Name of the internal property that contains the child order defined in
      * org.apache.jackrabbit.oak.plugins.tree.impl.TreeConstants

Modified: jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1805402&r1=1805401&r2=1805402&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java Fri Aug 18 11:35:02 2017
@@ -33,6 +33,7 @@ import org.apache.jackrabbit.oak.api.Com
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
+import org.apache.jackrabbit.oak.plugins.index.lucene.directory.BufferedOakDirectory;
 import org.apache.jackrabbit.oak.plugins.index.lucene.util.FacetHelper;
 import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -60,6 +61,7 @@ import org.slf4j.LoggerFactory;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_PATH;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.VERSION;
 import static org.apache.lucene.store.NoLockFactory.getNoLockFactory;
@@ -100,11 +102,15 @@ public class LuceneIndexEditorContext {
         }
     }
 
-    static Directory newIndexDirectory(IndexDefinition indexDefinition, NodeBuilder definition)
+    static Directory newIndexDirectory(IndexDefinition indexDefinition, NodeBuilder definition, boolean buffered)
             throws IOException {
         String path = definition.getString(PERSISTENCE_PATH);
         if (path == null) {
-            return new OakDirectory(definition, indexDefinition, false);
+            if (buffered) {
+                return new BufferedOakDirectory(definition, INDEX_DATA_CHILD_NAME, indexDefinition,null);
+            } else {
+                return new OakDirectory(definition, indexDefinition, false);
+            }
         } else {
             // try {
             File file = new File(path);
@@ -188,7 +194,10 @@ public class LuceneIndexEditorContext {
     IndexWriter getWriter() throws IOException {
         if (writer == null) {
             final long start = PERF_LOGGER.start();
-            directory = newIndexDirectory(definition, definitionBuilder);
+            //When IndexCopier is enabled then use buffered directory
+            //as concurrent writes are possible
+            boolean buffered = indexCopier != null;
+            directory = newIndexDirectory(definition, definitionBuilder, buffered);
             IndexWriterConfig config;
             if (indexCopier != null){
                 directory = indexCopier.wrapForWrite(definition, directory, reindex);

Modified: jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java?rev=1805402&r1=1805401&r2=1805402&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java Fri Aug 18 11:35:02 2017
@@ -66,13 +66,14 @@ import static org.apache.jackrabbit.JcrC
 import static org.apache.jackrabbit.oak.api.Type.BINARIES;
 import static org.apache.jackrabbit.oak.api.Type.STRINGS;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
+import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
 import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
 
 /**
  * Implementation of the Lucene {@link Directory} (a flat list of files)
  * based on an Oak {@link NodeBuilder}.
  */
-class OakDirectory extends Directory {
+public class OakDirectory extends Directory {
     static final PerfLogger PERF_LOGGER = new PerfLogger(LoggerFactory.getLogger(OakDirectory.class.getName() + ".perf"));
     static final String PROP_DIR_LISTING = "dirListing";
     static final String PROP_BLOB_SIZE = "blobSize";
@@ -90,6 +91,7 @@ class OakDirectory extends Directory {
     private final boolean activeDeleteEnabled;
     private final String indexName;
     private final BlobFactory blobFactory;
+    private volatile boolean dirty;
 
     public OakDirectory(NodeBuilder builder, IndexDefinition definition, boolean readOnly) {
         this(builder, INDEX_DATA_CHILD_NAME, definition, readOnly);
@@ -237,6 +239,46 @@ class OakDirectory extends Directory {
         return "Directory for " + definition.getIndexName();
     }
 
+    /**
+     * Copies the file with the given {@code name} to the {@code dest}
+     * directory. The file is copied 'by reference'. That is, the file in the
+     * destination directory will reference the same blob values as the source
+     * file.
+     * <p>
+     * This method is a no-op if the file does not exist in this directory.
+     *
+     * @param dest the destination directory.
+     * @param name the name of the file to copy.
+     * @throws IOException if an error occurs while copying the file.
+     * @throws IllegalArgumentException if the destination directory does not
+     *          use the same {@link BlobFactory} as {@code this} directory.
+     */
+    public void copy(OakDirectory dest, String name)
+            throws IOException {
+        if (blobFactory != dest.blobFactory) {
+            throw new IllegalArgumentException("Source and destination " +
+                    "directory must reference the same BlobFactory");
+        }
+        NodeBuilder file = directoryBuilder.getChildNode(name);
+        if (file.exists()) {
+            // overwrite potentially already existing child
+            NodeBuilder destFile = dest.directoryBuilder.setChildNode(name, EMPTY_NODE);
+            for (PropertyState p : file.getProperties()) {
+                destFile.setProperty(p);
+            }
+            dest.fileNames.add(name);
+            dest.markDirty();
+        }
+    }
+
+    public boolean isDirty() {
+        return dirty;
+    }
+
+    private void markDirty() {
+        dirty = true;
+    }
+
     private Set<String> getListing(){
         long start = PERF_LOGGER.start();
         Iterable<String> fileNames = null;

Copied: jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java (from r1774256, jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java?p2=jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java&p1=jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java&r1=1774256&r2=1805402&rev=1805402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java Fri Aug 18 11:35:02 2017
@@ -88,7 +88,7 @@ public final class BufferedOakDirectory
 
     @Override
     public String[] listAll() throws IOException {
-        LOG.debug("[{}]listAll()", definition.getIndexPath());
+        LOG.debug("[{}]listAll()", getIndexPath());
         Set<String> all = Sets.newTreeSet();
         all.addAll(asList(base.listAll()));
         all.addAll(asList(buffered.listAll()));
@@ -98,7 +98,7 @@ public final class BufferedOakDirectory
 
     @Override
     public boolean fileExists(String name) throws IOException {
-        LOG.debug("[{}]fileExists({})", definition.getIndexPath(), name);
+        LOG.debug("[{}]fileExists({})", getIndexPath(), name);
         if (bufferedForDelete.contains(name)) {
             return false;
         }
@@ -107,7 +107,7 @@ public final class BufferedOakDirectory
 
     @Override
     public void deleteFile(String name) throws IOException {
-        LOG.debug("[{}]deleteFile({})", definition.getIndexPath(), name);
+        LOG.debug("[{}]deleteFile({})", getIndexPath(), name);
         if (base.fileExists(name)) {
             bufferedForDelete.add(name);
         }
@@ -119,10 +119,10 @@ public final class BufferedOakDirectory
 
     @Override
     public long fileLength(String name) throws IOException {
-        LOG.debug("[{}]fileLength({})", definition.getIndexPath(), name);
+        LOG.debug("[{}]fileLength({})", getIndexPath(), name);
         if (bufferedForDelete.contains(name)) {
             String msg = String.format("already deleted: [%s] %s",
-                    definition.getIndexPath(), name);
+                    getIndexPath(), name);
             throw new FileNotFoundException(msg);
         }
         Directory dir = base;
@@ -135,14 +135,14 @@ public final class BufferedOakDirectory
     @Override
     public IndexOutput createOutput(String name, IOContext context)
             throws IOException {
-        LOG.debug("[{}]createOutput({})", definition.getIndexPath(), name);
+        LOG.debug("[{}]createOutput({})", getIndexPath(), name);
         bufferedForDelete.remove(name);
         return buffered.createOutput(name, context);
     }
 
     @Override
     public void sync(Collection<String> names) throws IOException {
-        LOG.debug("[{}]sync({})", definition.getIndexPath(), names);
+        LOG.debug("[{}]sync({})", getIndexPath(), names);
         buffered.sync(names);
         base.sync(names);
     }
@@ -150,10 +150,10 @@ public final class BufferedOakDirectory
     @Override
     public IndexInput openInput(String name, IOContext context)
             throws IOException {
-        LOG.debug("[{}]openInput({})", definition.getIndexPath(), name);
+        LOG.debug("[{}]openInput({})", getIndexPath(), name);
         if (bufferedForDelete.contains(name)) {
             String msg = String.format("already deleted: [%s] %s",
-                    definition.getIndexPath(), name);
+                    getIndexPath(), name);
             throw new FileNotFoundException(msg);
         }
         Directory dir = base;
@@ -175,7 +175,7 @@ public final class BufferedOakDirectory
 
     @Override
     public void close() throws IOException {
-        LOG.debug("[{}]close()", definition.getIndexPath());
+        LOG.debug("[{}]close()", getIndexPath());
         buffered.close();
         // copy buffered files to base
         for (String name : buffered.listAll()) {
@@ -217,4 +217,8 @@ public final class BufferedOakDirectory
         buffered = new OakDirectory(bufferedBuilder, dataNodeName,
                 definition, false, blobFactory);
     }
+
+    private String getIndexPath() {
+        return definition.getIndexPathFromConfig();
+    }
 }

Modified: jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectoryTest.java?rev=1805402&r1=1805401&r2=1805402&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectoryTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectoryTest.java Fri Aug 18 11:35:02 2017
@@ -38,12 +38,10 @@ import org.apache.lucene.store.IOContext
 import org.apache.lucene.store.IndexOutput;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-@Ignore("OAK-5238")
 public class CopyOnWriteDirectoryTest {
 
     @Rule
@@ -92,7 +90,7 @@ public class CopyOnWriteDirectoryTest {
 
         IndexDefinition def = new IndexDefinition(ns.getRoot(), ns.getRoot().getChildNode("foo"));
         builder = ns.getRoot().builder();
-        Directory remote = LuceneIndexEditorContext.newIndexDirectory(def, builder.child("foo"));
+        Directory remote = LuceneIndexEditorContext.newIndexDirectory(def, builder.child("foo"), true);
         Directory dir = copier.wrapForWrite(def, remote, false);
         addFiles(dir);
         writeTree(builder);

Modified: jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectory_Segment_Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectory_Segment_Test.java?rev=1805402&r1=1805401&r2=1805402&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectory_Segment_Test.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/CopyOnWriteDirectory_Segment_Test.java Fri Aug 18 11:35:02 2017
@@ -29,8 +29,6 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
 import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
-import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
-import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
@@ -45,15 +43,12 @@ import org.apache.lucene.store.IOContext
 import org.apache.lucene.store.IndexOutput;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@Ignore("OAK-5238")
 public class CopyOnWriteDirectory_Segment_Test {
 
     @Rule
@@ -109,7 +104,7 @@ public class CopyOnWriteDirectory_Segmen
 
         IndexDefinition def = new IndexDefinition(ns.getRoot(), ns.getRoot().getChildNode("foo"));
         builder = ns.getRoot().builder();
-        Directory remote = LuceneIndexEditorContext.newIndexDirectory(def, builder.child("foo"));
+        Directory remote = LuceneIndexEditorContext.newIndexDirectory(def, builder.child("foo"), true);
         Directory dir = copier.wrapForWrite(def, remote, false);
         addFiles(dir);
 
@@ -128,7 +123,7 @@ public class CopyOnWriteDirectory_Segmen
 
         IndexDefinition def = new IndexDefinition(ns.getRoot(), ns.getRoot().getChildNode("foo"));
         builder = ns.getRoot().builder();
-        Directory remote = LuceneIndexEditorContext.newIndexDirectory(def, builder.child("foo"));
+        Directory remote = LuceneIndexEditorContext.newIndexDirectory(def, builder.child("foo"), true);
         Directory dir = copier.wrapForWrite(def, remote, false);
 
         byte[] data = randomBytes();

Modified: jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1805402&r1=1805401&r2=1805402&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java Fri Aug 18 11:35:02 2017
@@ -73,7 +73,6 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.spi.query.QueryIndex.IndexPlan;
 
 import com.google.common.base.Function;
-import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -120,7 +119,6 @@ import org.apache.lucene.queries.CustomS
 import org.apache.lucene.search.Query;
 import org.junit.After;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableList;
@@ -368,13 +366,13 @@ public class LuceneIndexTest {
     }
 
     private void purgeDeletedDocs(NodeBuilder idx, IndexDefinition definition) throws IOException {
-        IndexWriter writer = new IndexWriter(newIndexDirectory(definition, idx), getIndexWriterConfig(definition, true));
+        IndexWriter writer = new IndexWriter(newIndexDirectory(definition, idx, false), getIndexWriterConfig(definition, true));
         writer.forceMergeDeletes();
         writer.close();
     }
 
     public int getDeletedDocCount(NodeBuilder idx, IndexDefinition definition) throws IOException {
-        IndexReader reader = DirectoryReader.open(newIndexDirectory(definition, idx));
+        IndexReader reader = DirectoryReader.open(newIndexDirectory(definition, idx, false));
         int numDeletes = reader.numDeletedDocs();
         reader.close();
         return numDeletes;