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 fr...@apache.org on 2016/08/15 12:35:20 UTC
svn commit: r1756374 [2/2] - in /jackrabbit/oak/trunk:
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/
oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/
oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/
oak-run/src/main/java/org/...
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -31,6 +31,7 @@ import org.apache.jackrabbit.oak.api.Blo
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
@@ -108,8 +109,7 @@ public class FileStoreBackupTest {
return nodeStore.createBlob(new ByteArrayInputStream(data));
}
- private static void compare(FileStore store, File destination)
- throws IOException {
+ private static void compare(FileStore store, File destination) throws IOException, InvalidFileStoreVersionException {
FileStore backup = FileStore.builder(destination).withMaxFileSize(8).build();
assertEquals(store.getHead(), backup.getHead());
backup.close();
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -375,7 +375,7 @@ public class CompactionAndCleanupIT {
* This is a regression introduced with OAK-1828.
*/
@Test
- public void cleanupCyclicGraph() throws IOException, ExecutionException, InterruptedException {
+ public void cleanupCyclicGraph() throws Exception {
FileStore fileStore = FileStore.builder(getFileStoreFolder()).build();
final SegmentWriter writer = fileStore.getTracker().getWriter();
final SegmentNodeState oldHead = fileStore.getHead();
@@ -428,7 +428,7 @@ public class CompactionAndCleanupIT {
*/
@Test
@Ignore("OAK-3348") // FIXME OAK-3348
- public void preCompactionReferences() throws IOException, CommitFailedException, InterruptedException {
+ public void preCompactionReferences() throws Exception {
for (String ref : new String[] {"merge-before-compact", "merge-after-compact"}) {
File repoDir = new File(getFileStoreFolder(), ref);
FileStore fileStore = FileStore.builder(repoDir).withMaxFileSize(2).build();
@@ -590,7 +590,7 @@ public class CompactionAndCleanupIT {
}
@Test
- public void propertyRetention() throws IOException, CommitFailedException {
+ public void propertyRetention() throws Exception {
FileStore fileStore = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).build();
try {
final SegmentNodeStore nodeStore = SegmentNodeStore.builder(fileStore).build();
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -159,7 +159,7 @@ public class ExternalBlobIT {
}
}
- protected SegmentNodeStore getNodeStore(BlobStore blobStore) throws IOException {
+ protected SegmentNodeStore getNodeStore(BlobStore blobStore) throws Exception {
if (nodeStore == null) {
store = FileStore.builder(getWorkDir()).withBlobStore(blobStore).withMaxFileSize(256).withMemoryMapping(false).build();
nodeStore = SegmentNodeStore.builder(store).build();
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -82,7 +82,7 @@ public class HeavyWriteIT {
}
@Test
- public void heavyWrite() throws IOException, CommitFailedException, InterruptedException {
+ public void heavyWrite() throws Exception {
final FileStore store = FileStore.builder(getFileStoreFolder()).withMaxFileSize(128).withMemoryMapping(false).build();
final SegmentNodeStore nodeStore = SegmentNodeStore.builder(store).build();
CompactionStrategy custom = new CompactionStrategy(false, false,
Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/PartialCompactionMapTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/PartialCompactionMapTest.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/PartialCompactionMapTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/PartialCompactionMapTest.java Mon Aug 15 12:35:19 2016
@@ -97,7 +97,7 @@ public class PartialCompactionMapTest {
}
@Before
- public void setup() throws IOException {
+ public void setup() throws Exception {
segmentStore = FileStore.builder(folder.getRoot()).build();
}
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -217,8 +217,7 @@ public class SegmentCompactionIT {
}
@Before
- public void setUp() throws IOException, MalformedObjectNameException, NotCompliantMBeanException,
- InstanceAlreadyExistsException, MBeanRegistrationException {
+ public void setUp() throws Exception {
assumeTrue(ENABLED);
scheduler.scheduleAtFixedRate(new Runnable() {
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -114,7 +114,7 @@ public class SegmentDataStoreBlobGCIT {
this.usePersistedMap = usePersistedMap;
}
- protected SegmentNodeStore getNodeStore(BlobStore blobStore) throws IOException {
+ protected SegmentNodeStore getNodeStore(BlobStore blobStore) throws Exception {
if (nodeStore == null) {
FileStore.Builder builder = FileStore.builder(getWorkDir())
.withBlobStore(blobStore).withMaxFileSize(256)
Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java Mon Aug 15 12:35:19 2016
@@ -105,7 +105,7 @@ public class SegmentGraphTest {
}
@Test
- public void testSegmentGraph() throws IOException {
+ public void testSegmentGraph() throws Exception {
ReadOnlyStore store = FileStore.builder(getStoreFolder()).buildReadOnly();
try {
Graph<UUID> segmentGraph = parseSegmentGraph(store, Predicates.<UUID>alwaysTrue());
@@ -121,7 +121,7 @@ public class SegmentGraphTest {
}
@Test
- public void testSegmentGraphWithFilter() throws IOException {
+ public void testSegmentGraphWithFilter() throws Exception {
ReadOnlyStore store = FileStore.builder(getStoreFolder()).buildReadOnly();
try {
Predicate<UUID> filter = createRegExpFilter(".*testWriter.*", store.getTracker());
@@ -138,7 +138,7 @@ public class SegmentGraphTest {
}
@Test
- public void testGCGraph() throws IOException {
+ public void testGCGraph() throws Exception {
ReadOnlyStore store = FileStore.builder(getStoreFolder()).buildReadOnly();
try {
Graph<String> gcGraph = SegmentGraph.parseGCGraph(store);
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -100,7 +100,7 @@ public class SegmentOverflowExceptionIT
};
@Test
- public void run() throws IOException, CommitFailedException, InterruptedException {
+ public void run() throws Exception {
FileStore fileStore = FileStore.builder(getFileStoreFolder()).withGCMonitor(gcMonitor).build();
try {
final SegmentNodeStore nodeStore = SegmentNodeStore.builder(fileStore).build();
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -138,7 +138,7 @@ public class SegmentVersionTest {
}
@Test
- public void mixedVersions() throws IOException, CommitFailedException {
+ public void mixedVersions() throws Exception {
FileStore fileStoreV10 = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).withSegmentVersion(V_10).build();
try {
NodeState content10 = addTestContent(fileStoreV10, "content10");
@@ -159,7 +159,7 @@ public class SegmentVersionTest {
}
@Test
- public void migrate() throws IOException, CommitFailedException {
+ public void migrate() throws Exception {
FileStore fileStoreV10 = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).withSegmentVersion(V_10).build();
try {
addTestContent(fileStoreV10, "content10");
Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreIT.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreIT.java Mon Aug 15 12:35:19 2016
@@ -67,16 +67,16 @@ public class FileStoreIT {
}
@Test
- public void testRestartAndGCWithoutMM() throws IOException {
+ public void testRestartAndGCWithoutMM() throws Exception {
testRestartAndGC(false);
}
@Test
- public void testRestartAndGCWithMM() throws IOException {
+ public void testRestartAndGCWithMM() throws Exception {
testRestartAndGC(true);
}
- public void testRestartAndGC(boolean memoryMapping) throws IOException {
+ public void testRestartAndGC(boolean memoryMapping) throws Exception {
FileStore store = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).withMemoryMapping(memoryMapping).build();
store.close();
@@ -102,7 +102,7 @@ public class FileStoreIT {
}
@Test
- public void testCompaction() throws IOException {
+ public void testCompaction() throws Exception {
int largeBinarySize = 10 * 1024 * 1024;
FileStore store = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).withMemoryMapping(false).build();
@@ -167,7 +167,7 @@ public class FileStoreIT {
}
@Test
- public void testRecovery() throws IOException {
+ public void testRecovery() throws Exception {
FileStore store = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).withMemoryMapping(false).build();
store.flush();
@@ -237,7 +237,7 @@ public class FileStoreIT {
}
@Test // See OAK-2049
- public void segmentOverflow() throws IOException {
+ public void segmentOverflow() throws Exception {
for (int n = 1; n < 255; n++) { // 255 = ListRecord.LEVEL_SIZE
FileStore store = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).withMemoryMapping(false).build();
SegmentWriter writer = store.getTracker().getWriter();
@@ -270,7 +270,7 @@ public class FileStoreIT {
}
@Test
- public void nonBlockingROStore() throws IOException {
+ public void nonBlockingROStore() throws Exception {
FileStore store = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1).withMemoryMapping(false).build();
store.flush(); // first 1kB
SegmentNodeState base = store.getHead();
Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java Mon Aug 15 12:35:19 2016
@@ -20,7 +20,6 @@
package org.apache.jackrabbit.oak.plugins.segment.file;
import java.io.File;
-import java.io.IOException;
import org.apache.jackrabbit.oak.plugins.segment.SegmentId;
import org.junit.Ignore;
@@ -39,7 +38,7 @@ public class FileStoreTest {
@Ignore("OAK-4054") // FIXME OAK-4054
@Test
- public void containsSegment() throws IOException {
+ public void containsSegment() throws Exception {
FileStore fileStore = FileStore.builder(getFileStoreFolder()).build();
try {
SegmentId id = new SegmentId(fileStore.getTracker(), 0, 0);
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -73,7 +73,7 @@ public class SegmentReferenceLimitTestIT
}
@Test
- public void corruption() throws IOException, CommitFailedException, ExecutionException, InterruptedException {
+ public void corruption() throws Exception {
FileStore fileStore = FileStore.builder(getFileStoreFolder()).withMaxFileSize(1)
.withNoCache().withMemoryMapping(true).build();
SegmentNodeStore nodeStore = SegmentNodeStore.builder(fileStore).build();
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.FileBlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -37,7 +38,13 @@ public class ExternalToExternalMigration
@Override
protected NodeStore createNodeStore(BlobStore blobStore, File repository) throws IOException {
File segmentDir = new File(repository, "segmentstore");
- segmentStore = FileStore.builder(segmentDir).withBlobStore(blobStore).build();
+
+ try {
+ segmentStore = FileStore.builder(segmentDir).withBlobStore(blobStore).build();
+ } catch (InvalidFileStoreVersionException e) {
+ throw new IllegalStateException(e);
+ }
+
return SegmentNodeStore.builder(segmentStore).build();
}
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.FileBlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -41,7 +42,13 @@ public class SegmentToExternalMigrationT
if (blobStore != null) {
builder.withBlobStore(blobStore);
}
- segmentStore = builder.build();
+
+ try {
+ segmentStore = builder.build();
+ } catch (InvalidFileStoreVersionException e) {
+ throw new IllegalStateException(e);
+ }
+
return SegmentNodeStore.builder(segmentStore).build();
}
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java Mon Aug 15 12:35:19 2016
@@ -48,7 +48,7 @@ public final class SegmentTestUtils {
return r;
}
- public static void assertEqualStores(File d1, File d2) throws IOException {
+ public static void assertEqualStores(File d1, File d2) throws Exception {
FileStore f1 = FileStore.builder(d1).withMaxFileSize(1).withMemoryMapping(false).build();
FileStore f2 = FileStore.builder(d2).withMaxFileSize(1).withMemoryMapping(false).build();
try {
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -57,7 +57,7 @@ public class DataStoreTestBase extends T
setUpServerAndClient();
}
- protected FileStore setupFileDataStore(File d, String path) throws IOException {
+ protected FileStore setupFileDataStore(File d, String path) throws Exception {
FileDataStore fds = new FileDataStore();
fds.setMinRecordLength(4092);
fds.init(path);
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalPrivateStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalPrivateStoreIT.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalPrivateStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalPrivateStoreIT.java Mon Aug 15 12:35:19 2016
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
-
import org.junit.After;
@@ -45,13 +44,13 @@ public class ExternalPrivateStoreIT exte
}
@Override
- protected FileStore setupPrimary(File d) throws IOException {
+ protected FileStore setupPrimary(File d) throws Exception {
primaryStore = createTmpTargetDir("ExternalStoreITPrimary");
return setupFileDataStore(d, primaryStore.getAbsolutePath());
}
@Override
- protected FileStore setupSecondary(File d) throws IOException {
+ protected FileStore setupSecondary(File d) throws Exception {
secondaryStore = createTmpTargetDir("ExternalStoreITSecondary");
return setupFileDataStore(d, secondaryStore.getAbsolutePath());
}
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java Mon Aug 15 12:35:19 2016
@@ -45,13 +45,13 @@ public class ExternalSharedStoreIT exten
}
@Override
- protected FileStore setupPrimary(File d) throws IOException {
+ protected FileStore setupPrimary(File d) throws Exception {
externalStore = createTmpTargetDir("ExternalCommonStoreIT");
return setupFileDataStore(d, externalStore.getAbsolutePath());
}
@Override
- protected FileStore setupSecondary(File d) throws IOException {
+ protected FileStore setupSecondary(File d) throws Exception {
return setupFileDataStore(d, externalStore.getAbsolutePath());
}
}
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java Mon Aug 15 12:35:19 2016
@@ -69,7 +69,7 @@ public class TestBase {
assumeTrue(FIXTURES.contains(Fixture.SEGMENT_MK));
}
- public void setUpServerAndClient() throws IOException {
+ public void setUpServerAndClient() throws Exception {
// server
directoryS = createTmpTargetDir(getClass().getSimpleName()+"-Server");
storeS = setupPrimary(directoryS);
@@ -79,7 +79,7 @@ public class TestBase {
storeC = setupSecondary(directoryC);
}
- private static FileStore newFileStore(File directory) throws IOException {
+ private static FileStore newFileStore(File directory) throws Exception {
return FileStore.builder(directory)
.withMaxFileSize(1)
.withMemoryMapping(false)
@@ -87,7 +87,7 @@ public class TestBase {
.build();
}
- protected FileStore setupPrimary(File directory) throws IOException {
+ protected FileStore setupPrimary(File directory) throws Exception {
return newFileStore(directory);
}
@@ -95,7 +95,7 @@ public class TestBase {
return storeS;
}
- protected FileStore setupSecondary(File directory) throws IOException {
+ protected FileStore setupSecondary(File directory) throws Exception {
return newFileStore(directoryC);
}
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=1756374&r1=1756373&r2=1756374&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 Mon Aug 15 12:35:19 2016
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore.Builder;
+import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -62,7 +63,14 @@ public class SegmentFactory implements N
builder.withBlobStore(blobStore);
}
builder.withMaxFileSize(256).withMemoryMapping(mmap);
- final FileStore fs = builder.build();
+ final FileStore fs;
+
+ try {
+ fs = builder.build();
+ } catch (InvalidFileStoreVersionException e) {
+ throw new IllegalStateException(e);
+ }
+
closer.register(asCloseable(fs));
return new TarNodeStore(SegmentNodeStore.builder(fs).build(), new TarNodeStore.SuperRootProvider() {
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java?rev=1756374&r1=1756373&r2=1756374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java Mon Aug 15 12:35:19 2016
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import com.google.common.io.Files;
@@ -56,7 +57,13 @@ public class SegmentNodeStoreContainer i
if (blob != null) {
builder.withBlobStore(blob.open());
}
- fs = builder.build();
+
+ try {
+ fs = builder.build();
+ } catch (InvalidFileStoreVersionException e) {
+ throw new IllegalStateException(e);
+ }
+
return SegmentNodeStore.builder(fs).build();
}