Author: mkataria
Date: Tue Nov 3 12:28:06 2020
New Revision: 1883085
URL: http://svn.apache.org/viewvc?rev=1883085&view=rev
Log:
OAK-9268: change default back to traversal of nodes even if no index with
indexing lane is present
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfoServiceImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1883085&r1=1883084&r2=1883085&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Tue Nov 3 12:28:06 2020
@@ -198,10 +198,10 @@ public class AsyncIndexUpdate implements
/**
* Setting this to true lead to lane execution (node traversal) even if
there
- * is no index assigned to this lane under /oak:index.
+ * is no index assigned to this lane under /oak:index. (Default value is
true).
*/
private final boolean traverseNodesIfLaneNotPresentInIndex
- =
Boolean.getBoolean("oak.async.traverseNodesIfLaneNotPresentInIndex");
+ =
!Boolean.getBoolean("oak.async.traverseNodesIfLanePresentInIndex");
/**
* The time in minutes since the epoch when the last checkpoint cleanup
ran.
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfoServiceImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfoServiceImplTest.java?rev=1883085&r1=1883084&r2=1883085&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfoServiceImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfoServiceImplTest.java
Tue Nov 3 12:28:06 2020
@@ -43,18 +43,6 @@ public class AsyncIndexInfoServiceImplTe
private PropertyIndexEditorProvider provider = new
PropertyIndexEditorProvider();
private AsyncIndexInfoServiceImpl service = new
AsyncIndexInfoServiceImpl(store);
- private Properties systemProperties;
-
- @Before
- public void setup(){
- systemProperties =(Properties) System.getProperties().clone();
- System.setProperty("oak.async.traverseNodesIfLaneNotPresentInIndex",
"true");
- }
-
- @After
- public void shutDown(){
- System.setProperties(systemProperties);
- }
@Test
public void names() throws Exception{
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1883085&r1=1883084&r2=1883085&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Tue Nov 3 12:28:06 2020
@@ -110,17 +110,8 @@ public class AsyncIndexUpdateTest {
private MetricStatisticsProvider statsProvider =
new
MetricStatisticsProvider(ManagementFactory.getPlatformMBeanServer(),executor);
- private Properties systemProperties;
-
- @Before
- public void setup(){
- systemProperties =(Properties) System.getProperties().clone();
- System.setProperty("oak.async.traverseNodesIfLaneNotPresentInIndex",
"true");
- }
-
@After
public void shutDown(){
- System.setProperties(systemProperties);
statsProvider.close();
new ExecutorCloser(executor).close();
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java?rev=1883085&r1=1883084&r2=1883085&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
Tue Nov 3 12:28:06 2020
@@ -89,19 +89,6 @@ public class IndexImporterTest {
private NodeStore store = new MemoryNodeStore();
private IndexEditorProvider provider = new PropertyIndexEditorProvider();
- private Properties systemProperties;
-
- @Before
- public void setup(){
- systemProperties =(Properties) System.getProperties().clone();
- System.setProperty("oak.async.traverseNodesIfLaneNotPresentInIndex",
"true");
- }
-
- @After
- public void shutDown(){
- System.setProperties(systemProperties);
- }
-
@Test(expected = IllegalArgumentException.class)
public void importIndex_NoMeta() throws Exception{
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java?rev=1883085&r1=1883084&r2=1883085&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java
Tue Nov 3 12:28:06 2020
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.api.Con
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
import org.apache.jackrabbit.oak.plugins.index.TrackingCorruptIndexHandler;
@@ -50,6 +51,7 @@ import org.junit.Before;
import org.junit.Test;
import java.util.List;
+import java.util.Properties;
import java.util.concurrent.TimeUnit;
import static com.google.common.collect.Lists.newArrayList;
@@ -74,9 +76,12 @@ public class IndexlaneRepositoryTraversa
NodeStore nodeStore;
LogCustomizer customLogger;
+ private Properties systemProperties;
@Before
public void before() throws Exception {
+ systemProperties =(Properties) System.getProperties().clone();
+ System.setProperty("oak.async.traverseNodesIfLanePresentInIndex",
"true");
ContentSession session = createRepository().login(null, null);
root = session.getLatestRoot();
customLogger = LogCustomizer
@@ -88,6 +93,7 @@ public class IndexlaneRepositoryTraversa
@After
public void after() {
customLogger.finished();
+ System.setProperties(systemProperties);
}
protected ContentRepository createRepository() {
