Author: frm
Date: Wed Apr 13 12:19:54 2016
New Revision: 1738929
URL: http://svn.apache.org/viewvc?rev=1738929&view=rev
Log:
OAK-4197 - Remove deprecated constructors from SegmentNodeStore
Removed:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBuilder.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/UpgradeTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactorTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/DepthFirstNodeIteratorTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfigurationTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/BrokenVersionableTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/LongNameTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/NodeStateTestUtils.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
Wed Apr 13 12:19:54 2016
@@ -50,7 +50,7 @@ public class OakTarMKRepositoryStub exte
File directory =
new File("target", "tarmk-" + System.currentTimeMillis());
this.store =
FileStore.builder(directory).withMaxFileSize(1).withMemoryMapping(false).build();
- Jcr jcr = new Jcr(new Oak(new SegmentNodeStore(store)));
+ Jcr jcr = new Jcr(new
Oak(SegmentNodeStore.builder(store).build()));
QueryEngineSettings qs = new QueryEngineSettings();
qs.setFullTextComparisonWithoutIndex(true);
jcr.with(qs);
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
Wed Apr 13 12:19:54 2016
@@ -93,7 +93,7 @@ public class RefreshOnGCTest {
.build()
.setCompactionStrategy(strategy);
- NodeStore nodeStore = new SegmentNodeStore(fileStore);
+ NodeStore nodeStore = SegmentNodeStore.builder(fileStore).build();
Oak oak = new Oak(nodeStore);
oak.with(whiteboard);
repository = new Jcr(oak).createRepository();
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/UpgradeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/UpgradeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/UpgradeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/UpgradeTest.java
Wed Apr 13 12:19:54 2016
@@ -42,7 +42,7 @@ import org.junit.Test;
import net.lingala.zip4j.core.ZipFile;
-import static
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore.newSegmentNodeStore;
+import static
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore.builder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -63,7 +63,7 @@ public class UpgradeTest {
tmpZip.delete();
SegmentStore store = FileStore.builder(repoHome).build();
- Repository repo = new
Jcr(newSegmentNodeStore(store).create()).createRepository();
+ Repository repo = new Jcr(builder(store).build()).createRepository();
Session s = repo.login(new SimpleCredentials("admin",
"admin".toCharArray()));
Node myType = s.getNode("/jcr:system/jcr:nodeTypes/test:MyType");
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
Wed Apr 13 12:19:54 2016
@@ -54,7 +54,7 @@ public class HiddenNodeTest {
@Before
public void before() throws Exception {
- store = new SegmentNodeStore(new MemoryStore());
+ store = SegmentNodeStore.builder(new MemoryStore()).build();
repo = new Jcr(store).createRepository();
session = repo.login(new SimpleCredentials("admin",
"admin".toCharArray()));
vMgr = session.getWorkspace().getVersionManager();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
Wed Apr 13 12:19:54 2016
@@ -43,7 +43,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Random;
-import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -67,7 +66,7 @@ public class LuceneBlobCacheTest {
.withBlobStore(new
DataStoreBlobStore(fileDataStore)).withMaxFileSize(256)
.withCacheSize(64).withMemoryMapping(false);
store = fileStoreBuilder.build();
- NodeStore nodeStore = new SegmentNodeStore(store);
+ NodeStore nodeStore = SegmentNodeStore.builder(store).build();
root = nodeStore.getRoot();
builder = root.builder();
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Wed Apr 13 12:19:54 2016
@@ -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;
@@ -88,6 +87,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
@@ -704,7 +704,7 @@ public class LuceneIndexTest {
//Issue is not reproducible with MemoryNodeBuilder and
//MemoryNodeState as they cannot determine change in childNode without
//entering
- NodeStore nodeStore = new SegmentNodeStore();
+ NodeStore nodeStore = SegmentNodeStore.builder(new
MemoryStore()).build();
final IndexTracker tracker = new IndexTracker();
((Observable)nodeStore).addObserver(new Observer() {
@Override
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
Wed Apr 13 12:19:54 2016
@@ -319,7 +319,7 @@ public class OakDirectoryTest {
.withMemoryMapping(false)
.withBlobStore(new BlackHoleBlobStore())
.build();
- SegmentNodeStore nodeStore =
SegmentNodeStore.newSegmentNodeStore(store).create();
+ SegmentNodeStore nodeStore = SegmentNodeStore.builder(store).build();
IndexDefinition defn = new IndexDefinition(INITIAL_CONTENT,
EmptyNodeState.EMPTY_NODE);
Directory directory = new OakDirectory(nodeStore.getRoot().builder(),
defn, false);
@@ -374,7 +374,7 @@ public class OakDirectoryTest {
.withMemoryMapping(false)
.withBlobStore(blobStore)
.build();
- SegmentNodeStore nodeStore =
SegmentNodeStore.newSegmentNodeStore(store).create();
+ SegmentNodeStore nodeStore = SegmentNodeStore.builder(store).build();
String indexPath = "/foo/bar";
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
Wed Apr 13 12:19:54 2016
@@ -156,7 +156,7 @@ public class Console {
private SegmentFixture(SegmentStore segmentStore) {
this.segmentStore = segmentStore;
- this.nodeStore = new SegmentNodeStore(segmentStore);
+ this.nodeStore = SegmentNodeStore.builder(segmentStore).build();
}
@Override
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
Wed Apr 13 12:19:54 2016
@@ -350,7 +350,7 @@ public abstract class OakFixture {
.withCacheSize(cacheSizeMB)
.withMemoryMapping(memoryMapping)
.build();
- return newOak(new SegmentNodeStore(fs));
+ return newOak(SegmentNodeStore.builder(fs).build());
}
@Override
@@ -375,7 +375,7 @@ public abstract class OakFixture {
.withCacheSize(cacheSizeMB)
.withMemoryMapping(memoryMapping)
.build();
- cluster[i] = newOak(new SegmentNodeStore(stores[i]));
+ cluster[i] =
newOak(SegmentNodeStore.builder(stores[i]).build());
}
return cluster;
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
Wed Apr 13 12:19:54 2016
@@ -304,7 +304,7 @@ public class TextExtractorMain {
}
FileStore fs = openFileStore(src, false, blobStore);
closer.register(asCloseable(fs));
- return SegmentNodeStore.newSegmentNodeStore(fs).create();
+ return SegmentNodeStore.builder(fs).build();
}
private static Closeable asCloseable(final FileStore fs) {
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
Wed Apr 13 12:19:54 2016
@@ -44,7 +44,7 @@ class BackupCommand implements Command {
fs = openReadOnlyFileStore(new File(args[0]));
}
closer.register(asCloseable(fs));
- NodeStore store =
SegmentNodeStore.newSegmentNodeStore(fs).create();
+ NodeStore store = SegmentNodeStore.builder(fs).build();
FileStoreBackup.backup(store, new File(args[1]));
} catch (Throwable e) {
throw closer.rethrow(e);
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
Wed Apr 13 12:19:54 2016
@@ -101,7 +101,7 @@ public class ResetClusterIdCommand imple
} else {
FileStore fs = openFileStore(args[0]);
closer.register(Utils.asCloseable(fs));
- store = SegmentNodeStore.newSegmentNodeStore(fs).create();
+ store = SegmentNodeStore.builder(fs).build();
}
deleteClusterId(store);
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
Wed Apr 13 12:19:54 2016
@@ -83,7 +83,7 @@ class Utils {
FileStore fs = openFileStore(src);
closer.register(asCloseable(fs));
- return SegmentNodeStore.newSegmentNodeStore(fs).create();
+ return SegmentNodeStore.builder(fs).build();
}
static Closeable asCloseable(final FileStore fs) {
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Wed Apr 13 12:19:54 2016
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.Maps.newHashMap;
import static java.lang.System.currentTimeMillis;
import static java.lang.Thread.currentThread;
@@ -27,6 +28,8 @@ import static java.util.concurrent.TimeU
import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.plugins.segment.Record.fastEquals;
+import static
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.GAIN_THRESHOLD_DEFAULT;
+import static
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.NO_COMPACTION;
import java.io.Closeable;
import java.io.IOException;
@@ -47,7 +50,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.commit.ChangeDispatcher;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
@@ -69,8 +72,82 @@ import org.slf4j.LoggerFactory;
*/
public class SegmentNodeStore implements NodeStore, Observable {
- private static final Logger log = LoggerFactory
- .getLogger(SegmentNodeStore.class);
+ public static class SegmentNodeStoreBuilder {
+
+ private final SegmentStore store;
+
+ private boolean isCreated;
+
+ private CompactionStrategy compactionStrategy = NO_COMPACTION;
+
+ private volatile SegmentNodeStore segmentNodeStore;
+
+ private SegmentNodeStoreBuilder(@Nonnull SegmentStore store) {
+ this.store = store;
+ }
+
+ SegmentNodeStoreBuilder withCompactionStrategy(CompactionStrategy
compactionStrategy) {
+ this.compactionStrategy = compactionStrategy;
+ return this;
+ }
+
+ SegmentNodeStoreBuilder withCompactionStrategy(
+ boolean pauseCompaction,
+ boolean cloneBinaries,
+ String cleanup,
+ long cleanupTs,
+ byte memoryThreshold,
+ final int lockWaitTime,
+ int retryCount,
+ boolean forceAfterFail,
+ boolean persistCompactionMap,
+ byte gainThreshold) {
+
+ compactionStrategy = new CompactionStrategy(
+ pauseCompaction,
+ cloneBinaries,
+ CompactionStrategy.CleanupType.valueOf(cleanup),
+ cleanupTs,
+ memoryThreshold) {
+
+ @Override
+ public boolean compacted(Callable<Boolean> setHead) throws
Exception {
+ // Need to guard against concurrent commits to avoid
+ // mixed segments. See OAK-2192.
+ return segmentNodeStore.locked(setHead, lockWaitTime,
SECONDS);
+ }
+
+ };
+
+ compactionStrategy.setRetryCount(retryCount);
+ compactionStrategy.setForceAfterFail(forceAfterFail);
+ compactionStrategy.setPersistCompactionMap(persistCompactionMap);
+ compactionStrategy.setGainThreshold(gainThreshold);
+
+ return this;
+ }
+
+ CompactionStrategy getCompactionStrategy() {
+ checkState(isCreated);
+ return compactionStrategy;
+ }
+
+ @Nonnull
+ public SegmentNodeStore build() {
+ checkState(!isCreated);
+ isCreated = true;
+ segmentNodeStore = new SegmentNodeStore(this);
+ return segmentNodeStore;
+ }
+
+ }
+
+ @Nonnull
+ public static SegmentNodeStoreBuilder builder(@Nonnull SegmentStore store)
{
+ return new SegmentNodeStoreBuilder(checkNotNull(store));
+ }
+
+ private static final Logger log =
LoggerFactory.getLogger(SegmentNodeStore.class);
static final String ROOT = "root";
@@ -107,35 +184,16 @@ public class SegmentNodeStore implements
private final boolean commitFairLock = Boolean
.getBoolean("oak.segmentNodeStore.commitFairLock");
- @Nonnull
- public static SegmentNodeStoreBuilder newSegmentNodeStore(
- @Nonnull SegmentStore store) {
- return
SegmentNodeStoreBuilder.newSegmentNodeStore(checkNotNull(store));
- }
-
- /**
- * @deprecated Use {@link
SegmentNodeStore#newSegmentNodeStore(SegmentStore)} instead
- *
- */
- @Deprecated
- public SegmentNodeStore(SegmentStore store) {
- this(store, false);
- }
-
- SegmentNodeStore(SegmentStore store, boolean internal) {
+ private SegmentNodeStore(SegmentNodeStoreBuilder builder) {
if (commitFairLock) {
log.info("initializing SegmentNodeStore with the commitFairLock
option enabled.");
}
this.commitSemaphore = new Semaphore(1, commitFairLock);
- this.store = store;
+ this.store = builder.store;
this.head = new AtomicReference<SegmentNodeState>(store.getHead());
this.changeDispatcher = new ChangeDispatcher(getRoot());
}
- public SegmentNodeStore() throws IOException {
- this(new MemoryStore());
- }
-
void setMaximumBackoff(long max) {
this.maximumBackoff = max;
}
@@ -589,4 +647,5 @@ public class SegmentNodeStore implements
void setCheckpointsLockWaitTime(int checkpointsLockWaitTime) {
this.checkpointsLockWaitTime = checkpointsLockWaitTime;
}
+
}
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Wed Apr 13 12:19:54 2016
@@ -530,9 +530,9 @@ public class SegmentNodeStoreService ext
OsgiWhiteboard whiteboard = new
OsgiWhiteboard(context.getBundleContext());
- SegmentNodeStoreBuilder nodeStoreBuilder =
SegmentNodeStore.newSegmentNodeStore(store);
+ SegmentNodeStore.SegmentNodeStoreBuilder nodeStoreBuilder =
SegmentNodeStore.builder(store);
nodeStoreBuilder.withCompactionStrategy(compactionStrategy);
- segmentNodeStore = nodeStoreBuilder.create();
+ segmentNodeStore = nodeStoreBuilder.build();
observerTracker = new ObserverTracker(segmentNodeStore);
observerTracker.start(context.getBundleContext());
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
Wed Apr 13 12:19:54 2016
@@ -145,7 +145,7 @@ public class ConsistencyChecker {
private String checkPath(String path, long binLen) {
try {
print("Checking {}", path);
- NodeState root = new SegmentNodeStore(store).getRoot();
+ NodeState root = SegmentNodeStore.builder(store).build().getRoot();
String parentPath = getParentPath(path);
String name = getName(path);
NodeState parent = getNode(root, parentPath);
@@ -173,7 +173,7 @@ public class ConsistencyChecker {
store.setRevision(revision);
nodeCount = 0;
propertyCount = 0;
- String result = traverse(new SegmentNodeStore(store).getRoot(),
"/", true, binLen);
+ String result =
traverse(SegmentNodeStore.builder(store).build().getRoot(), "/", true, binLen);
print("Traversed {} nodes and {} properties", nodeCount,
propertyCount);
return result;
} catch (RuntimeException e) {
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupTest.java
Wed Apr 13 12:19:54 2016
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.backup;
import static org.apache.commons.io.FileUtils.deleteQuietly;
-import static
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore.newSegmentNodeStore;
+import static
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore.builder;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
@@ -64,7 +64,7 @@ public class FileStoreBackupTest {
public void testBackup() throws Exception {
FileStore source = FileStore.builder(src).withMaxFileSize(8).build();
- NodeStore store = newSegmentNodeStore(source).create();
+ NodeStore store = builder(source).build();
init(store);
// initial content
@@ -83,7 +83,7 @@ public class FileStoreBackupTest {
public void testRestore() throws Exception {
FileStore source = FileStore.builder(src).withMaxFileSize(8).build();
- NodeStore store = newSegmentNodeStore(source).create();
+ NodeStore store = builder(source).build();
init(store);
FileStoreBackup.backup(store, destination);
addTestContent(store);
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
Wed Apr 13 12:19:54 2016
@@ -40,7 +40,7 @@ public class CheckpointTest {
@Test
public void testCheckpoint() throws CommitFailedException, IOException {
- SegmentNodeStore store = new SegmentNodeStore(new MemoryStore());
+ SegmentNodeStore store = SegmentNodeStore.builder(new
MemoryStore()).build();
addTestNode(store, "test-checkpoint");
verifyNS(store, true);
rmTestNode(store, "test-checkpoint");
@@ -52,7 +52,7 @@ public class CheckpointTest {
@Test
public void testRelease() throws CommitFailedException, IOException {
- SegmentNodeStore store = new SegmentNodeStore(new MemoryStore());
+ SegmentNodeStore store = SegmentNodeStore.builder(new
MemoryStore()).build();
addTestNode(store, "test-checkpoint");
String cp = verifyNS(store, true);
@@ -97,7 +97,7 @@ public class CheckpointTest {
*/
@Test
public void testShortWait() throws Exception {
- final SegmentNodeStore store = new SegmentNodeStore(new MemoryStore());
+ final SegmentNodeStore store = SegmentNodeStore.builder(new
MemoryStore()).build();
store.setCheckpointsLockWaitTime(1);
final Semaphore semaphore = new Semaphore(0);
@@ -146,7 +146,7 @@ public class CheckpointTest {
@Test
public void testLongWait() throws Exception {
final int blockTime = 1;
- final SegmentNodeStore store = new SegmentNodeStore(new MemoryStore());
+ final SegmentNodeStore store = SegmentNodeStore.builder(new
MemoryStore()).build();
store.setCheckpointsLockWaitTime(blockTime + 1);
final Semaphore semaphore = new Semaphore(0);
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
Wed Apr 13 12:19:54 2016
@@ -28,7 +28,7 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_MK;
import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
-import static
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore.newSegmentNodeStore;
+import static
org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore.builder;
import static
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_ALL;
import static
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_NONE;
import static
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD;
@@ -105,7 +105,7 @@ public class CompactionAndCleanupIT {
FileStore fileStore = FileStore.builder(directory)
.withMaxFileSize(1)
.build();
- final SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
+ final SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
CompactionStrategy custom = new CompactionStrategy(false, false,
CLEAN_OLD, TimeUnit.HOURS.toMillis(1), (byte) 0) {
@Override
@@ -212,7 +212,7 @@ public class CompactionAndCleanupIT {
final int dataNodes = 10000;
FileStore fileStore =
FileStore.builder(directory).withMaxFileSize(1).build();
- final SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
+ final SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
CompactionStrategy custom = new CompactionStrategy(false, false,
CLEAN_OLD, TimeUnit.HOURS.toMillis(1), (byte) 0) {
@Override
@@ -313,7 +313,7 @@ public class CompactionAndCleanupIT {
@Test
public void testMixedSegments() throws Exception {
FileStore store =
FileStore.builder(directory).withMaxFileSize(2).withMemoryMapping(true).build();
- final SegmentNodeStore nodeStore = new SegmentNodeStore(store);
+ final SegmentNodeStore nodeStore =
SegmentNodeStore.builder(store).build();
final AtomicBoolean compactionSuccess = new AtomicBoolean(true);
CompactionStrategy strategy = new CompactionStrategy(true, false,
CLEAN_NONE, 0, (byte) 5) {
@Override
@@ -445,7 +445,7 @@ public class CompactionAndCleanupIT {
for (String ref : new String[] {"merge-before-compact",
"merge-after-compact"}) {
File repoDir = new File(directory, ref);
FileStore fileStore =
FileStore.builder(repoDir).withMaxFileSize(2).build();
- final SegmentNodeStore nodeStore =
newSegmentNodeStore(fileStore).create();
+ final SegmentNodeStore nodeStore = builder(fileStore).build();
fileStore.setCompactionStrategy(new CompactionStrategy(true,
false, CLEAN_NONE, 0, (byte) 5) {
@Override
public boolean compacted(Callable<Boolean> setHead) throws
Exception {
@@ -606,7 +606,7 @@ public class CompactionAndCleanupIT {
public void propertyRetention() throws IOException, CommitFailedException {
FileStore fileStore =
FileStore.builder(directory).withMaxFileSize(1).build();
try {
- final SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
+ final SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
CompactionStrategy strategy = new CompactionStrategy(false, false,
CLEAN_ALL, 0, (byte) 0) {
@Override
public boolean compacted(@Nonnull Callable<Boolean> setHead)
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactorTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactorTest.java
Wed Apr 13 12:19:54 2016
@@ -51,7 +51,7 @@ public class CompactorTest {
@Test
public void testCompactor() throws Exception {
- NodeStore store = new SegmentNodeStore(segmentStore);
+ NodeStore store = SegmentNodeStore.builder(segmentStore).build();
init(store);
Compactor compactor = new Compactor(segmentStore.getTracker());
@@ -74,7 +74,7 @@ public class CompactorTest {
// early cancellation is the reason why the returned SegmentNodeState
// doesn't have the child named "b".
- NodeStore store =
SegmentNodeStore.newSegmentNodeStore(segmentStore).create();
+ NodeStore store = SegmentNodeStore.builder(segmentStore).build();
Compactor compactor = new Compactor(segmentStore.getTracker(),
Suppliers.ofInstance(true));
SegmentNodeState sns = compactor.compact(store.getRoot(),
addChild(store.getRoot(), "b"), store.getRoot());
assertFalse(sns.hasChildNode("b"));
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobIT.java
Wed Apr 13 12:19:54 2016
@@ -158,7 +158,7 @@ public class ExternalBlobIT {
protected SegmentNodeStore getNodeStore(BlobStore blobStore) throws
IOException {
if (nodeStore == null) {
store =
FileStore.builder(getWorkDir()).withBlobStore(blobStore).withMaxFileSize(256).withMemoryMapping(false).build();
- nodeStore = new SegmentNodeStore(store);
+ nodeStore = SegmentNodeStore.builder(store).build();
}
return nodeStore;
}
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/HeavyWriteIT.java
Wed Apr 13 12:19:54 2016
@@ -93,7 +93,7 @@ public class HeavyWriteIT {
@Test
public void heavyWrite() throws IOException, CommitFailedException,
InterruptedException {
final FileStore store =
FileStore.builder(directory).withMaxFileSize(128).withMemoryMapping(false).build();
- final SegmentNodeStore nodeStore = new SegmentNodeStore(store);
+ final SegmentNodeStore nodeStore =
SegmentNodeStore.builder(store).build();
CompactionStrategy custom = new CompactionStrategy(false, false,
CLEAN_OLD, 30000, (byte) 0) {
@Override
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java
Wed Apr 13 12:19:54 2016
@@ -34,7 +34,7 @@ public class InitializerTest {
@Test
public void testInitializerSegment() throws CommitFailedException,
IOException {
- NodeStore store = new SegmentNodeStore(new MemoryStore());
+ NodeStore store = SegmentNodeStore.builder(new MemoryStore()).build();
NodeBuilder builder = store.getRoot().builder();
new InitialContent().initialize(builder);
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java
Wed Apr 13 12:19:54 2016
@@ -40,7 +40,7 @@ public class MergeTest {
@Test
public void testSequentialMerge() throws CommitFailedException,
IOException {
- NodeStore store = new SegmentNodeStore(new MemoryStore());
+ NodeStore store = SegmentNodeStore.builder(new MemoryStore()).build();
assertFalse(store.getRoot().hasProperty("foo"));
assertFalse(store.getRoot().hasProperty("bar"));
@@ -62,7 +62,7 @@ public class MergeTest {
@Test
public void testOptimisticMerge() throws CommitFailedException,
IOException {
- NodeStore store = new SegmentNodeStore(new MemoryStore());
+ NodeStore store = SegmentNodeStore.builder(new MemoryStore()).build();
NodeBuilder a = store.getRoot().builder();
a.setProperty("foo", "abc");
@@ -86,7 +86,7 @@ public class MergeTest {
@Test
public void testPessimisticMerge() throws Exception {
- final SegmentNodeStore store = new SegmentNodeStore(new MemoryStore());
+ final SegmentNodeStore store = SegmentNodeStore.builder(new
MemoryStore()).build();
final Semaphore semaphore = new Semaphore(0);
final AtomicBoolean running = new AtomicBoolean(true);
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
Wed Apr 13 12:19:54 2016
@@ -234,8 +234,8 @@ public class SegmentCompactionIT {
.withMemoryMapping(true)
.withGCMonitor(gcMonitor)
.build();
- SegmentNodeStoreBuilder nodeStoreBuilder = SegmentNodeStore
- .newSegmentNodeStore(fileStore);
+ SegmentNodeStore.SegmentNodeStoreBuilder nodeStoreBuilder =
SegmentNodeStore
+ .builder(fileStore);
nodeStoreBuilder.withCompactionStrategy(false, false,
CLEAN_OLD.toString(), CompactionStrategy.TIMESTAMP_DEFAULT,
CompactionStrategy.MEMORY_THRESHOLD_DEFAULT, lockWaitTime,
@@ -243,7 +243,7 @@ public class SegmentCompactionIT {
CompactionStrategy.FORCE_AFTER_FAIL_DEFAULT,
PERSIST_COMPACTION_MAP,
CompactionStrategy.GAIN_THRESHOLD_DEFAULT);
- nodeStore = nodeStoreBuilder.create();
+ nodeStore = nodeStoreBuilder.build();
compactionStrategy = nodeStoreBuilder
.getCompactionStrategy();
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java
Wed Apr 13 12:19:54 2016
@@ -121,7 +121,7 @@ public class SegmentDataStoreBlobGCIT {
};
compactionStrategy.setPersistCompactionMap(usePersistedMap);
store.setCompactionStrategy(compactionStrategy);
- nodeStore = new SegmentNodeStore(store);
+ nodeStore = SegmentNodeStore.builder(store).build();
}
return nodeStore;
}
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java
Wed Apr 13 12:19:54 2016
@@ -110,7 +110,7 @@ public class SegmentOverflowExceptionIT
public void run() throws IOException, CommitFailedException,
InterruptedException {
FileStore fileStore =
FileStore.builder(directory).withGCMonitor(gcMonitor).build();
try {
- final SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
+ final SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
fileStore.setCompactionStrategy(new CompactionStrategy(false,
false, CLEAN_OLD, 1000, MEMORY_THRESHOLD_DEFAULT) {
@Override
public boolean compacted(@Nonnull Callable<Boolean> setHead)
throws Exception {
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java
Wed Apr 13 12:19:54 2016
@@ -215,7 +215,7 @@ public class SegmentVersionTest {
@SuppressWarnings("deprecation")
private static NodeState addTestContent(FileStore fs, String nodeName)
throws CommitFailedException {
- NodeStore store = new SegmentNodeStore(fs);
+ NodeStore store = SegmentNodeStore.builder(fs).build();
NodeBuilder builder = store.getRoot().builder();
NodeBuilder content = builder.child(nodeName);
@@ -232,7 +232,7 @@ public class SegmentVersionTest {
}
private static void verifyContent(FileStore fs, String nodeName) {
- NodeStore store = new SegmentNodeStore(fs);
+ NodeStore store = SegmentNodeStore.builder(fs).build();
SegmentNodeState content = (SegmentNodeState) store.getRoot()
.getChildNode(nodeName);
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java
Wed Apr 13 12:19:54 2016
@@ -61,7 +61,7 @@ public class CompactionEstimatorTest {
final int blobSize = 2 * MB;
FileStore fileStore =
FileStore.builder(directory).withMaxFileSize(2).withMemoryMapping(false).build();
- SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
+ SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
// 1. Create some blob properties
NodeBuilder builder = nodeStore.getRoot().builder();
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java
Wed Apr 13 12:19:54 2016
@@ -47,7 +47,7 @@ public class JournalEntryTest {
FileStore fileStore =
FileStore.builder(tempFolder.getRoot()).withMaxFileSize(5)
.withNoCache().withMemoryMapping(true).build();
- SegmentNodeStore nodeStore =
SegmentNodeStore.newSegmentNodeStore(fileStore).create();
+ SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
long startTime = System.currentTimeMillis();
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java
Wed Apr 13 12:19:54 2016
@@ -78,7 +78,7 @@ public class LargeNumberOfPropertiesTest
public void corruption() throws Exception {
FileStore fileStore = FileStore.builder(directory).withMaxFileSize(5)
.withNoCache().withMemoryMapping(true).build();
- SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
+ SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
NodeBuilder root = nodeStore.getRoot().builder();
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java
Wed Apr 13 12:19:54 2016
@@ -86,7 +86,7 @@ public class SegmentReferenceLimitTestIT
public void corruption() throws IOException, CommitFailedException,
ExecutionException, InterruptedException {
FileStore fileStore = FileStore.builder(directory).withMaxFileSize(1)
.withNoCache().withMemoryMapping(true).build();
- SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
+ SegmentNodeStore nodeStore =
SegmentNodeStore.builder(fileStore).build();
NodeBuilder root = nodeStore.getRoot().builder();
root.setChildNode("test");
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
Wed Apr 13 12:19:54 2016
@@ -24,6 +24,7 @@ import java.io.IOException;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
public class SegmentFixture extends NodeStoreFixture {
@@ -42,12 +43,12 @@ public class SegmentFixture extends Node
public NodeStore createNodeStore() {
if (store == null) {
try {
- return new SegmentNodeStore();
+ return SegmentNodeStore.builder(new MemoryStore()).build();
} catch (IOException e) {
throw new RuntimeException(e);
}
} else {
- return SegmentNodeStore.newSegmentNodeStore(store).create();
+ return SegmentNodeStore.builder(store).build();
}
}
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/DepthFirstNodeIteratorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/DepthFirstNodeIteratorTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/DepthFirstNodeIteratorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/DepthFirstNodeIteratorTest.java
Wed Apr 13 12:19:54 2016
@@ -44,7 +44,7 @@ public class DepthFirstNodeIteratorTest
@Before
public void setup() throws CommitFailedException, IOException {
- store = SegmentNodeStore.newSegmentNodeStore(new
MemoryStore()).create();
+ store = SegmentNodeStore.builder(new MemoryStore()).build();
NodeBuilder rootBuilder = store.getRoot().builder();
NodeBuilder countries = rootBuilder.child("countries");
countries.child("uk").child("cities").child("london").child("districts").child("frognal");
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java
Wed Apr 13 12:19:54 2016
@@ -38,7 +38,7 @@ public class ExternalToExternalMigration
protected NodeStore createNodeStore(BlobStore blobStore, File repository)
throws IOException {
File segmentDir = new File(repository, "segmentstore");
segmentStore =
FileStore.builder(segmentDir).withBlobStore(blobStore).build();
- return SegmentNodeStore.newSegmentNodeStore(segmentStore).create();
+ return SegmentNodeStore.builder(segmentStore).build();
}
@Override
Modified:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java
Wed Apr 13 12:19:54 2016
@@ -42,7 +42,7 @@ public class SegmentToExternalMigrationT
builder.withBlobStore(blobStore);
}
segmentStore = builder.build();
- return SegmentNodeStore.newSegmentNodeStore(segmentStore).create();
+ return SegmentNodeStore.builder(segmentStore).build();
}
@Override
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java
Wed Apr 13 12:19:54 2016
@@ -30,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -51,7 +52,7 @@ public abstract class SolrBaseTest {
@Before
public void setUp() throws Exception {
- store = new SegmentNodeStore();
+ store = SegmentNodeStore.builder(new MemoryStore()).build();
provider = new TestUtils();
server = provider.getSolrServer();
configuration = provider.getConfiguration();
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfigurationTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfigurationTest.java
Wed Apr 13 12:19:54 2016
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -37,7 +38,7 @@ public class OakSolrNodeStateConfigurati
@Before
public void setUp() throws Exception {
- store = new SegmentNodeStore();
+ store = SegmentNodeStore.builder(new MemoryStore()).build();
NodeBuilder builder = store.getRoot().builder();
builder.setProperty("a", 1)
.setProperty("b", 2)
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java
Wed Apr 13 12:19:54 2016
@@ -119,7 +119,7 @@ public class BrokenNetworkTest extends T
p.flipByte(flipPosition);
p.run();
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
final StandbyServer server = new StandbyServer(port, storeS, ssl);
server.start();
addTestContent(store, "server");
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java
Wed Apr 13 12:19:54 2016
@@ -97,7 +97,7 @@ public class BulkTest extends TestBase {
private void test(int number, int minExpectedSegments, int
maxExpectedSegments, long minExpectedBytes, long maxExpectedBytes,
boolean useSSL) throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
NodeBuilder rootbuilder = store.getRoot().builder();
NodeBuilder b = rootbuilder.child("store");
for (int j=0; j<=number / 1000; j++) {
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
Wed Apr 13 12:19:54 2016
@@ -92,7 +92,7 @@ public class DataStoreTestBase extends T
FileStore primary = getPrimary();
FileStore secondary = getSecondary();
- NodeStore store = new SegmentNodeStore(primary);
+ NodeStore store = SegmentNodeStore.builder(primary).build();
final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize);
@@ -168,7 +168,7 @@ public class DataStoreTestBase extends T
p.flipByte(flipPosition);
p.run();
- NodeStore store = new SegmentNodeStore(primary);
+ NodeStore store = SegmentNodeStore.builder(primary).build();
final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize);
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java
Wed Apr 13 12:19:54 2016
@@ -144,7 +144,7 @@ public class FailoverIPRangeTest extends
}
private void createTestWithConfig(String host, String[] ipRanges, boolean
expectedToWork) throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
final StandbyServer server = new StandbyServer(port, storeS, ipRanges);
server.start();
addTestContent(store, "server");
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java
Wed Apr 13 12:19:54 2016
@@ -44,7 +44,7 @@ public class FailoverMultipleClientsTest
@Test
public void testMultipleClients() throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
final StandbyServer server = new StandbyServer(port, storeS);
server.start();
SegmentTestUtils.addTestContent(store, "server");
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java
Wed Apr 13 12:19:54 2016
@@ -45,7 +45,7 @@ public class FailoverSslTestIT extends T
@Test
public void testFailoverSecure() throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
final StandbyServer server = new StandbyServer(port, storeS, true);
server.start();
addTestContent(store, "server");
@@ -65,7 +65,7 @@ public class FailoverSslTestIT extends T
@Test
public void testFailoverSecureServerPlainClient() throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
final StandbyServer server = new StandbyServer(port, storeS, true);
server.start();
addTestContent(store, "server");
@@ -85,7 +85,7 @@ public class FailoverSslTestIT extends T
@Test
public void testFailoverPlainServerSecureClient() throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
final StandbyServer server = new StandbyServer(port, storeS);
server.start();
addTestContent(store, "server");
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java
Wed Apr 13 12:19:54 2016
@@ -47,7 +47,7 @@ public class RecoverTestIT extends TestB
@Test
public void testBrokenConnection() throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
+ NodeStore store = SegmentNodeStore.builder(storeS).build();
DebugSegmentStore s = new DebugSegmentStore(storeS);
addTestContent(store, "server");
storeS.flush();
@@ -74,12 +74,12 @@ public class RecoverTestIT extends TestB
@Test
public void testLocalChanges() throws Exception {
- NodeStore store = new SegmentNodeStore(storeC);
+ NodeStore store = SegmentNodeStore.builder(storeC).build();
addTestContent(store, "client");
final StandbyServer server = new StandbyServer(port, storeS);
server.start();
- store = new SegmentNodeStore(storeS);
+ store = SegmentNodeStore.builder(storeS).build();
addTestContent(store, "server");
storeS.flush();
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java
Wed Apr 13 12:19:54 2016
@@ -18,14 +18,12 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.standby;
-import static
org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.IOException;
import java.util.Random;
@@ -66,7 +64,7 @@ public class StandbyTest extends TestBas
FileStore primary = getPrimary();
FileStore secondary = getSecondary();
- NodeStore store = new SegmentNodeStore(primary);
+ NodeStore store = SegmentNodeStore.builder(primary).build();
final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize, 150);
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java
Wed Apr 13 12:19:54 2016
@@ -91,7 +91,7 @@ public class StandbyTestIT extends TestB
FileStore primary = getPrimary();
FileStore secondary = getSecondary();
- NodeStore store = new SegmentNodeStore(primary);
+ NodeStore store = SegmentNodeStore.builder(primary).build();
final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize, dataNodes);
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
Wed Apr 13 12:19:54 2016
@@ -51,7 +51,7 @@ public class SegmentFactory implements N
builder.withMaxFileSize(256).withMemoryMapping(mmap);
FileStore fs = builder.build();
closer.register(asCloseable(fs));
- return SegmentNodeStore.newSegmentNodeStore(fs).create();
+ return SegmentNodeStore.builder(fs).build();
}
public File getRepositoryDir() {
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java
Wed Apr 13 12:19:54 2016
@@ -41,6 +41,7 @@ import org.apache.jackrabbit.core.config
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.After;
@@ -72,7 +73,7 @@ public abstract class AbstractRepository
protected NodeStore createTargetNodeStore() {
try {
- return new SegmentNodeStore();
+ return SegmentNodeStore.builder(new MemoryStore()).build();
} catch (IOException e) {
throw new RuntimeException(e);
}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/BrokenVersionableTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/BrokenVersionableTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/BrokenVersionableTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/BrokenVersionableTest.java
Wed Apr 13 12:19:54 2016
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.jcr.repository.RepositoryImpl;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -60,7 +61,7 @@ public class BrokenVersionableTest {
@Before
public synchronized void upgradeRepository() throws Exception {
- targetNodeStore = new SegmentNodeStore();
+ targetNodeStore = SegmentNodeStore.builder(new MemoryStore()).build();
targetRepository = (RepositoryImpl) new Jcr(new
Oak(targetNodeStore)).createRepository();
NodeStore source = createSourceContent();
RepositorySidegrade sidegrade = new RepositorySidegrade(source,
targetNodeStore);
@@ -76,7 +77,7 @@ public class BrokenVersionableTest {
}
private NodeStore createSourceContent() throws Exception {
- SegmentNodeStore source = new SegmentNodeStore();
+ SegmentNodeStore source = SegmentNodeStore.builder(new
MemoryStore()).build();
RepositoryImpl repository = (RepositoryImpl) new Jcr(new
Oak(source)).createRepository();
Session session = repository.login(CREDENTIALS);
List<String> versionHistoryPaths = new ArrayList<String>();
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
Wed Apr 13 12:19:54 2016
@@ -23,6 +23,7 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.jcr.repository.RepositoryImpl;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.upgrade.util.VersionCopyTestUtils;
import
org.apache.jackrabbit.oak.upgrade.util.VersionCopyTestUtils.VersionCopySetup;
@@ -241,7 +242,7 @@ public class CopyVersionHistoryTest exte
protected Session performCopy(VersionCopySetup setup) throws
RepositoryException, IOException {
final RepositoryConfig sourceConfig = RepositoryConfig.create(source);
final RepositoryContext sourceContext =
RepositoryContext.create(sourceConfig);
- final NodeStore targetNodeStore = new SegmentNodeStore();
+ final NodeStore targetNodeStore = SegmentNodeStore.builder(new
MemoryStore()).build();
try {
final RepositoryUpgrade upgrade = new
RepositoryUpgrade(sourceContext, targetNodeStore);
setup.setup(upgrade.versionCopyConfiguration);
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java
Wed Apr 13 12:19:54 2016
@@ -39,7 +39,7 @@ public class IncludeExcludeSidegradeTest
File source = new File(directory, "source");
source.mkdirs();
FileStore fileStore = FileStore.builder(source).build();
- SegmentNodeStore segmentNodeStore =
SegmentNodeStore.newSegmentNodeStore(fileStore).create();
+ SegmentNodeStore segmentNodeStore =
SegmentNodeStore.builder(fileStore).build();
RepositoryImpl repository = (RepositoryImpl) new Jcr(new
Oak(segmentNodeStore)).createRepository();
Session session = repository.login(CREDENTIALS);
try {
@@ -59,7 +59,7 @@ public class IncludeExcludeSidegradeTest
@Override
protected void doUpgradeRepository(File source, NodeStore target) throws
RepositoryException, IOException {
FileStore fileStore = FileStore.builder(source).build();
- SegmentNodeStore segmentNodeStore =
SegmentNodeStore.newSegmentNodeStore(fileStore).create();
+ SegmentNodeStore segmentNodeStore =
SegmentNodeStore.builder(fileStore).build();
try {
final RepositorySidegrade sidegrade = new
RepositorySidegrade(segmentNodeStore, target);
sidegrade.setIncludes(
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/LongNameTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/LongNameTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/LongNameTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/LongNameTest.java
Wed Apr 13 12:19:54 2016
@@ -125,7 +125,7 @@ public class LongNameTest {
public void longNameOnSegmentStoreWorksFine() throws RepositoryException,
IOException {
SegmentStore memoryStore = new MemoryStore();
try {
- SegmentNodeStore nodeStore =
SegmentNodeStore.newSegmentNodeStore(memoryStore).create();
+ SegmentNodeStore nodeStore =
SegmentNodeStore.builder(memoryStore).build();
upgrade(nodeStore, false);
NodeState parent = getParent(nodeStore.getRoot());
