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=1785274&r1=1785273&r2=1785274&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 Fri Mar 3 11:56:40 2017 @@ -22,7 +22,6 @@ import java.net.UnknownHostException; import javax.sql.DataSource; -import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.plugins.document.DocumentMK; import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore; @@ -30,11 +29,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore; import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions; import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection; -import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; -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.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; @@ -51,12 +46,6 @@ public abstract class OakFixture { public static final String OAK_RDB = "Oak-RDB"; public static final String OAK_RDB_DS = "Oak-RDB-DS"; - @Deprecated - public static final String OAK_TAR = "Oak-Tar"; - - @Deprecated - public static final String OAK_TAR_DS = "Oak-Tar-DS"; - public static final String OAK_SEGMENT_TAR = "Oak-Segment-Tar"; public static final String OAK_SEGMENT_TAR_DS = "Oak-Segment-Tar-DS"; @@ -261,26 +250,12 @@ public abstract class OakFixture { }; } - @Deprecated - public static OakFixture getTar( - final String name, final File base, final int maxFileSizeMB, final int cacheSizeMB, - final boolean memoryMapping, final boolean useBlobStore) { - return getTar(name, base, maxFileSizeMB, cacheSizeMB, memoryMapping, useBlobStore, 0); - } - public static OakFixture getSegmentTar(final String name, final File base, final int maxFileSizeMB, final int cacheSizeMB, final boolean memoryMapping, final boolean useBlobStore) { return getSegmentTar(name, base, maxFileSizeMB, cacheSizeMB, memoryMapping, useBlobStore, 0); } - @Deprecated - public static OakFixture getTar( - final String name, final File base, final int maxFileSizeMB, final int cacheSizeMB, - final boolean memoryMapping, final boolean useBlobStore, int dsCacheInMB) { - return new SegmentFixture(name, base, maxFileSizeMB, cacheSizeMB, memoryMapping, useBlobStore, dsCacheInMB); - } - public static OakFixture getSegmentTar(final String name, final File base, final int maxFileSizeMB, final int cacheSizeMB, final boolean memoryMapping, final boolean useBlobStore, final int dsCacheInMB) { @@ -405,91 +380,8 @@ public abstract class OakFixture { } - @Deprecated - public static class SegmentFixture extends OakFixture { - private FileStore[] stores; - private BlobStoreFixture[] blobStoreFixtures = new BlobStoreFixture[0]; - private final File base; - private final int maxFileSizeMB; - private final int cacheSizeMB; - private final boolean memoryMapping; - private final boolean useBlobStore; - private final int dsCacheSizeInMB; - - public SegmentFixture(String name, File base, int maxFileSizeMB, int cacheSizeMB, - boolean memoryMapping, boolean useBlobStore, int dsCacheSizeInMB) { - super(name); - this.base = base; - this.maxFileSizeMB = maxFileSizeMB; - this.cacheSizeMB = cacheSizeMB; - this.memoryMapping = memoryMapping; - this.useBlobStore = useBlobStore; - this.dsCacheSizeInMB = dsCacheSizeInMB; - } - - @Override - public Oak getOak(int clusterId) throws Exception { - FileStore fs = FileStore.builder(base) - .withMaxFileSize(maxFileSizeMB) - .withCacheSize(cacheSizeMB) - .withMemoryMapping(memoryMapping) - .build(); - return newOak(SegmentNodeStore.builder(fs).build()); - } - - @Override - public Oak[] setUpCluster(int n, StatisticsProvider statsProvider) throws Exception { - Oak[] cluster = new Oak[n]; - stores = new FileStore[cluster.length]; - if (useBlobStore) { - blobStoreFixtures = new BlobStoreFixture[cluster.length]; - } - - for (int i = 0; i < cluster.length; i++) { - BlobStore blobStore = null; - if (useBlobStore) { - blobStoreFixtures[i] = - BlobStoreFixture.create(base, true, dsCacheSizeInMB, statsProvider); - blobStore = blobStoreFixtures[i].setUp(); - } - - FileStore.Builder builder = FileStore.builder(new File(base, unique)); - if (blobStore != null) { - builder.withBlobStore(blobStore); - } - stores[i] = builder.withRoot(EmptyNodeState.EMPTY_NODE) - .withStatisticsProvider(statsProvider) - .withMaxFileSize(maxFileSizeMB) - .withCacheSize(cacheSizeMB) - .withMemoryMapping(memoryMapping) - .build(); - cluster[i] = newOak(SegmentNodeStore.builder(stores[i]).build()); - } - return cluster; - } - - @Override - public void tearDownCluster() { - for (SegmentStore store : stores) { - store.close(); - } - for (BlobStoreFixture blobStore : blobStoreFixtures) { - blobStore.tearDown(); - } - FileUtils.deleteQuietly(new File(base, unique)); - } - - public BlobStoreFixture[] getBlobStoreFixtures() { - return blobStoreFixtures; - } - - public FileStore[] getStores() { - return stores; - } - } - static Oak newOak(NodeStore nodeStore) { return new Oak(nodeStore).with(ManagementFactory.getPlatformMBeanServer()); } -} +} \ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java Fri Mar 3 11:56:40 2017 @@ -94,21 +94,6 @@ public class OakRepositoryFixture implem dropDBAfterTest, cacheSize, true, base, fdsCacheInMB)); } - @Deprecated - public static RepositoryFixture getTar(File base, int maxFileSizeMB, int cacheSizeMB, - boolean memoryMapping) { - return new OakRepositoryFixture(OakFixture - .getTar(OakFixture.OAK_TAR, base, maxFileSizeMB, cacheSizeMB, memoryMapping, false)); - } - - @Deprecated - public static RepositoryFixture getTarWithBlobStore(File base, int maxFileSizeMB, - int cacheSizeMB, boolean memoryMapping, int dsCacheInMB) { - return new OakRepositoryFixture(OakFixture - .getTar(OakFixture.OAK_TAR_DS, base, maxFileSizeMB, cacheSizeMB, memoryMapping, true, - dsCacheInMB)); - } - public static RepositoryFixture getSegmentTar(File base, int maxFileSizeMB, int cacheSizeMB, boolean memoryMapping) { return new OakRepositoryFixture(OakFixture @@ -194,4 +179,4 @@ public class OakRepositoryFixture implem private void configureStatsProvider(Oak oak) { oak.getWhiteboard().register(StatisticsProvider.class, statisticsProvider, Collections.emptyMap()); } -} +} \ No newline at end of file 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=1785274&r1=1785273&r2=1785274&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 Fri Mar 3 11:56:40 2017 @@ -32,13 +32,6 @@ import java.util.Map; import java.util.Properties; import java.util.UUID; -import com.google.common.collect.Maps; -import com.google.common.io.Closer; -import com.mongodb.MongoClientURI; -import com.mongodb.MongoURI; -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import joptsimple.OptionSpec; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.aws.ext.ds.S3DataStore; @@ -51,13 +44,20 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.DocumentMK; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection; -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.state.NodeStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.Maps; +import com.google.common.io.Closer; +import com.mongodb.MongoClientURI; +import com.mongodb.MongoURI; + +import joptsimple.OptionParser; +import joptsimple.OptionSet; +import joptsimple.OptionSpec; + public class TextExtractorMain { private static final Logger log = LoggerFactory.getLogger(TextExtractorMain.class); @@ -78,8 +78,6 @@ public class TextExtractorMain { .withRequiredArg() .ofType(String.class); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); - OptionSpec<String> pathSpec = parser .accepts("path", "Path in repository under which the binaries would be searched") .withRequiredArg() @@ -216,7 +214,7 @@ public class TextExtractorMain { checkNotNull(blobStore, "BlobStore found to be null. FileDataStore directory " + "must be specified via %s", fdsDirSpec.options()); checkNotNull(dataFile, "Data file path not provided"); - NodeStore nodeStore = bootStrapNodeStore(src, options.has(segment), blobStore, closer); + NodeStore nodeStore = bootStrapNodeStore(src, blobStore, closer); BinaryResourceProvider brp = new NodeStoreBinaryResourceProvider(nodeStore, blobStore); CSVFileGenerator generator = new CSVFileGenerator(dataFile); generator.generate(brp.getBinaries(path)); @@ -286,7 +284,7 @@ public class TextExtractorMain { return props; } - private static NodeStore bootStrapNodeStore(String src, boolean segment, BlobStore blobStore, Closer closer) throws IOException, InvalidFileStoreVersionException { + private static NodeStore bootStrapNodeStore(String src, BlobStore blobStore, Closer closer) throws IOException { if (src.startsWith(MongoURI.MONGODB_PREFIX)) { MongoClientURI uri = new MongoClientURI(src); if (uri.getDatabase() == null) { @@ -303,22 +301,9 @@ public class TextExtractorMain { return store; } - if (segment) { - return SegmentUtils.bootstrap(src, blobStore, closer); - } - return SegmentTarUtils.bootstrap(src, blobStore, closer); } - private static Closeable asCloseable(final FileStore fs) { - return new Closeable() { - @Override - public void close() throws IOException { - fs.close(); - } - }; - } - private static Closeable asCloseable(final DataStore ds) { return new Closeable() { @Override @@ -349,4 +334,4 @@ public class TextExtractorMain { } }; } -} +} \ No newline at end of file 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=1785274&r1=1785273&r2=1785274&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 Fri Mar 3 11:56:40 2017 @@ -21,14 +21,12 @@ import java.io.File; import joptsimple.OptionParser; import joptsimple.OptionSet; -import joptsimple.OptionSpec; class BackupCommand implements Command { @Override public void execute(String... args) throws Exception { OptionParser parser = new OptionParser(); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); if (options.nonOptionArguments().size() < 2) { @@ -39,12 +37,7 @@ class BackupCommand implements Command { File source = new File(options.nonOptionArguments().get(0).toString()); File target = new File(options.nonOptionArguments().get(1).toString()); - if (options.has(segment)) { - SegmentUtils.backup(source, target); - } else { - SegmentTarUtils.backup(source, target); - - } + SegmentTarUtils.backup(source, target); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java Fri Mar 3 11:56:40 2017 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.run; -import static org.apache.jackrabbit.oak.plugins.segment.FileStoreHelper.isValidFileStoreOrFail; +import static org.apache.jackrabbit.oak.segment.FileStoreHelper.isValidFileStoreOrFail; import java.io.File; import java.io.IOException; @@ -44,7 +44,6 @@ class CheckCommand implements Command { "notify", "number of seconds between progress notifications") .withRequiredArg().ofType(Long.class).defaultsTo(Long.MAX_VALUE); OptionSpec<?> bin = parser.accepts("bin", "read the content of binary properties"); - OptionSpec<?> segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); ArgumentAcceptingOptionSpec<String> filter = parser.accepts( "filter", "comma separated content paths to be checked") .withRequiredArg().ofType(String.class).withValuesSeparatedBy(',').defaultsTo("/"); @@ -69,11 +68,7 @@ class CheckCommand implements Command { , "A deep scan of the content tree, traversing every node, will be performed by default."); } - if (options.has(segment)) { - SegmentUtils.check(dir, journalFileName, debugLevel, options.has(bin)); - } else { - SegmentTarUtils.check(dir, journalFileName, debugLevel, options.has(bin), filterPaths, options.has(ioStatistics), out, err); - } + SegmentTarUtils.check(dir, journalFileName, debugLevel, options.has(bin), filterPaths, options.has(ioStatistics), out, err); } private void printUsage(OptionParser parser, PrintWriter err, String... messages) throws IOException { @@ -86,4 +81,4 @@ class CheckCommand implements Command { System.exit(1); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java Fri Mar 3 11:56:40 2017 @@ -20,23 +20,23 @@ package org.apache.jackrabbit.oak.run; import java.io.File; import java.sql.Timestamp; +import org.apache.jackrabbit.oak.checkpoint.Checkpoints; +import org.apache.jackrabbit.oak.plugins.document.DocumentMK; +import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; + import com.google.common.io.Closer; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; import com.mongodb.MongoURI; + import joptsimple.OptionParser; import joptsimple.OptionSet; -import joptsimple.OptionSpec; -import org.apache.jackrabbit.oak.checkpoint.Checkpoints; -import org.apache.jackrabbit.oak.plugins.document.DocumentMK; -import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; class CheckpointsCommand implements Command { @Override public void execute(String... args) throws Exception { OptionParser parser = new OptionParser(); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); if (options.nonOptionArguments().isEmpty()) { @@ -65,8 +65,6 @@ class CheckpointsCommand implements Comm .getNodeStore(); closer.register(Utils.asCloseable(store)); cps = Checkpoints.onDocumentMK(store); - } else if (options.has(segment)) { - cps = Checkpoints.onSegment(new File(connection), closer); } else { cps = Checkpoints.onSegmentTar(new File(connection), closer); } @@ -135,4 +133,4 @@ class CheckpointsCommand implements Comm throw new RuntimeException(message); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java Fri Mar 3 11:56:40 2017 @@ -42,7 +42,6 @@ class CompactCommand implements Command "Path to segment store (required)").ofType(String.class); OptionSpec<Void> forceFlag = parser.accepts( "force", "Force compaction and ignore non matching segment version"); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); String path = directoryArg.value(options); @@ -70,11 +69,7 @@ class CompactCommand implements Command System.out.println(" -> compacting"); try { - if (options.has(segment)) { - SegmentUtils.compact(directory, force); - } else { - SegmentTarUtils.compact(directory, force); - } + SegmentTarUtils.compact(directory, force); success = true; } catch (Throwable e) { System.out.println("Compaction failure stack trace:"); @@ -111,4 +106,4 @@ class CompactCommand implements Command return files; } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java Fri Mar 3 11:56:40 2017 @@ -16,6 +16,15 @@ */ package org.apache.jackrabbit.oak.run; +import static com.google.common.base.StandardSystemProperty.JAVA_IO_TMPDIR; +import static com.google.common.base.Stopwatch.createStarted; +import static com.google.common.io.Closeables.close; +import static java.util.Arrays.asList; +import static org.apache.commons.io.FileUtils.forceDelete; +import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort; +import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeAsLine; +import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings; + import java.io.BufferedWriter; import java.io.Closeable; import java.io.File; @@ -28,6 +37,16 @@ import java.util.concurrent.atomic.Atomi import javax.annotation.Nullable; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.apache.jackrabbit.oak.commons.FileIOUtils.FileLineDifferenceIterator; +import org.apache.jackrabbit.oak.plugins.blob.BlobReferenceRetriever; +import org.apache.jackrabbit.oak.plugins.blob.ReferenceCollector; +import org.apache.jackrabbit.oak.plugins.document.DocumentBlobReferenceRetriever; +import org.apache.jackrabbit.oak.plugins.document.DocumentMK; +import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; +import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; + import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -38,32 +57,12 @@ import com.google.common.io.Files; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; import com.mongodb.MongoURI; + import joptsimple.ArgumentAcceptingOptionSpec; import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; import joptsimple.OptionSpecBuilder; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; -import org.apache.jackrabbit.oak.commons.FileIOUtils.FileLineDifferenceIterator; -import org.apache.jackrabbit.oak.plugins.blob.BlobReferenceRetriever; -import org.apache.jackrabbit.oak.plugins.blob.ReferenceCollector; -import org.apache.jackrabbit.oak.plugins.document.DocumentBlobReferenceRetriever; -import org.apache.jackrabbit.oak.plugins.document.DocumentMK; -import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.SegmentBlobReferenceRetriever; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; -import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; - -import static com.google.common.base.StandardSystemProperty.JAVA_IO_TMPDIR; -import static com.google.common.base.Stopwatch.createStarted; -import static com.google.common.io.Closeables.close; -import static java.util.Arrays.asList; -import static org.apache.commons.io.FileUtils.forceDelete; -import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort; -import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeAsLine; -import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings; -import static org.apache.jackrabbit.oak.plugins.segment.FileStoreHelper.openFileStore; /** * Command to check data store consistency and also optionally retrieve ids @@ -94,7 +93,6 @@ public class DataStoreCheckCommand imple // Optional argument to specify the dump path ArgumentAcceptingOptionSpec<String> dump = parser.accepts("dump", "Dump Path") .withRequiredArg().ofType(String.class); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); // Optional argument to specify tracking ArgumentAcceptingOptionSpec<String> track = parser.accepts("track", "Local repository home folder") @@ -139,10 +137,6 @@ public class DataStoreCheckCommand imple closer.register(Utils.asCloseable(nodeStore)); blobStore = (GarbageCollectableBlobStore) nodeStore.getBlobStore(); marker = new DocumentBlobReferenceRetriever(nodeStore); - } else if (options.has(segment)) { - FileStore fileStore = openFileStore(source); - closer.register(Utils.asCloseable(fileStore)); - marker = new SegmentBlobReferenceRetriever(fileStore.getTracker()); } else { marker = SegmentTarUtils.newBlobReferenceRetriever(source, closer); } @@ -310,4 +304,4 @@ public class DataStoreCheckCommand imple System.out.println(count + " blob ids found"); System.out.println("Finished in " + watch.elapsed(TimeUnit.SECONDS) + " seconds"); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DebugCommand.java Fri Mar 3 11:56:40 2017 @@ -26,7 +26,6 @@ class DebugCommand implements Command { @Override public void execute(String... args) throws Exception { OptionParser parser = new OptionParser(); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSpec<String> nonOptions = parser.nonOptions().ofType(String.class); OptionSet options = parser.parse(args); @@ -37,11 +36,7 @@ class DebugCommand implements Command { String[] nonOptionsArray = options.valuesOf(nonOptions).toArray(new String[0]); - if (options.has(segment)) { - SegmentUtils.debug(nonOptionsArray); - } else { - SegmentTarUtils.debug(nonOptionsArray); - } + SegmentTarUtils.debug(nonOptionsArray); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FileStoreDiffCommand.java Fri Mar 3 11:56:40 2017 @@ -38,7 +38,6 @@ class FileStoreDiffCommand implements Co OptionSpec<?> incrementalO = parser.accepts("incremental", "Runs diffs between each subsequent revisions in the provided interval"); OptionSpec<String> pathO = parser.accepts("path", "Filter diff by given path").withRequiredArg().ofType(String.class).defaultsTo("/"); OptionSpec<?> ignoreSNFEsO = parser.accepts("ignore-snfes", "Ignores SegmentNotFoundExceptions and continues running the diff (experimental)"); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); if (options.has(help)) { @@ -61,15 +60,11 @@ class FileStoreDiffCommand implements Co String path = pathO.value(options); boolean ignoreSNFEs = options.has(ignoreSNFEsO); - if (options.has(segment)) { - SegmentUtils.diff(store, out, listOnly, interval, incremental, path, ignoreSNFEs); - } else { - SegmentTarUtils.diff(store, out, listOnly, interval, incremental, path, ignoreSNFEs); - } + SegmentTarUtils.diff(store, out, listOnly, interval, incremental, path, ignoreSNFEs); } private File defaultOutFile() { return new File("diff_" + System.currentTimeMillis() + ".log"); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java Fri Mar 3 11:56:40 2017 @@ -44,4 +44,4 @@ class GarbageCommand implements Command } } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GraphCommand.java Fri Mar 3 11:56:40 2017 @@ -45,7 +45,6 @@ class GraphCommand implements Command { "pattern", "Regular exception specifying which nodes to include (optional). " + "Ignore when --gc is specified.") .withRequiredArg().ofType(String.class); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); @@ -82,11 +81,7 @@ class GraphCommand implements Command { boolean gcGraph = options.has(gcGraphArg); - if (options.has(segment)) { - SegmentUtils.graph(directory, gcGraph, epoch, regExp, out); - } else { - SegmentTarUtils.graph(directory, gcGraph, epoch, regExp, out); - } + SegmentTarUtils.graph(directory, gcGraph, epoch, regExp, out); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HelpCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HelpCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HelpCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HelpCommand.java Fri Mar 3 11:56:40 2017 @@ -28,4 +28,4 @@ class HelpCommand implements Command { System.exit(1); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/HistoryCommand.java Fri Mar 3 11:56:40 2017 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.run; -import static org.apache.jackrabbit.oak.plugins.segment.FileStoreHelper.isValidFileStoreOrFail; +import static org.apache.jackrabbit.oak.segment.FileStoreHelper.isValidFileStoreOrFail; import java.io.File; @@ -41,7 +41,6 @@ class HistoryCommand implements Command OptionSpec<Integer> depthArg = parser.accepts( "depth", "Depth up to which to dump node states").withRequiredArg().ofType(Integer.class) .defaultsTo(0); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); File directory = directoryArg.value(options); @@ -56,11 +55,7 @@ class HistoryCommand implements Command String journalName = journalArg.value(options); File journal = new File(isValidFileStoreOrFail(directory), journalName); - if (options.has(segment)) { - SegmentUtils.history(directory, journal, path, depth); - } else { - SegmentTarUtils.history(directory, journal, path, depth); - } + SegmentTarUtils.history(directory, journal, path, depth); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Mode.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Mode.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Mode.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Mode.java Fri Mar 3 11:56:40 2017 @@ -38,7 +38,6 @@ enum Mode { TIKA("tika", new TikaCommand()), GARBAGE("garbage", new GarbageCommand()), TARMKDIFF("tarmkdiff", new FileStoreDiffCommand()), - TARMKRECOVERY("tarmkrecovery", new FileStoreRevisionRecoveryCommand()), DATASTORECHECK("datastorecheck", new DataStoreCheckCommand()), RESETCLUSTERID("resetclusterid", new ResetClusterIdCommand()), PERSISTENTCACHE("persistentcache", new PersistentCacheCommand()), @@ -65,4 +64,4 @@ enum Mode { command.execute(args); } -} +} \ No newline at end of file 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=1785274&r1=1785273&r2=1785274&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 Fri Mar 3 11:56:40 2017 @@ -16,27 +16,24 @@ */ package org.apache.jackrabbit.oak.run; -import static org.apache.jackrabbit.oak.plugins.segment.FileStoreHelper.openFileStore; - -import com.google.common.io.Closer; -import com.mongodb.MongoClient; -import com.mongodb.MongoClientURI; -import com.mongodb.MongoURI; -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import joptsimple.OptionSpec; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.document.DocumentMK; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.identifier.ClusterRepositoryInfo; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import com.google.common.io.Closer; +import com.mongodb.MongoClient; +import com.mongodb.MongoClientURI; +import com.mongodb.MongoURI; + +import joptsimple.OptionParser; +import joptsimple.OptionSet; + /** * OFFLINE utility to delete the clusterId stored as hidden * property as defined by ClusterRepositoryInfo. @@ -84,7 +81,6 @@ class ResetClusterIdCommand implements C @Override public void execute(String... args) throws Exception { OptionParser parser = new OptionParser(); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); if (options.nonOptionArguments().isEmpty()) { @@ -105,10 +101,6 @@ class ResetClusterIdCommand implements C .getNodeStore(); closer.register(Utils.asCloseable(dns)); store = dns; - } else if (options.has(segment)) { - FileStore fs = openFileStore(source); - closer.register(Utils.asCloseable(fs)); - store = SegmentNodeStore.builder(fs).build(); } else { store = SegmentTarUtils.bootstrapNodeStore(source, closer); } @@ -122,4 +114,4 @@ class ResetClusterIdCommand implements C } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java Fri Mar 3 11:56:40 2017 @@ -21,15 +21,12 @@ import java.io.File; import joptsimple.OptionParser; import joptsimple.OptionSet; -import joptsimple.OptionSpec; -import org.apache.jackrabbit.oak.plugins.backup.FileStoreRestore; class RestoreCommand implements Command { @Override public void execute(String... args) throws Exception { OptionParser parser = new OptionParser(); - OptionSpec segment = parser.accepts("segment", "Use oak-segment instead of oak-segment-tar"); OptionSet options = parser.parse(args); if (options.nonOptionArguments().size() < 2) { @@ -40,12 +37,7 @@ class RestoreCommand implements Command File target = new File(options.nonOptionArguments().get(0).toString()); File source = new File(options.nonOptionArguments().get(1).toString()); - if (options.has(segment)) { - SegmentUtils.restore(source, target); - } else { - SegmentTarUtils.restore(source, target); - } - + SegmentTarUtils.restore(source, target); } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java Fri Mar 3 11:56:40 2017 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.run; -import static org.apache.jackrabbit.oak.plugins.segment.FileStoreHelper.isValidFileStoreOrFail; +import static org.apache.jackrabbit.oak.segment.FileStoreHelper.isValidFileStoreOrFail; import static org.apache.jackrabbit.oak.segment.SegmentVersion.LATEST_VERSION; import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder; Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ServerCommand.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ServerCommand.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ServerCommand.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ServerCommand.java Fri Mar 3 11:56:40 2017 @@ -116,13 +116,6 @@ class ServerCommand implements Command { host.value(options), port.value(options), db, false, cacheSize * MB); } - - } else if (fix.equals(OakFixture.OAK_TAR)) { - File baseFile = base.value(options); - if (baseFile == null) { - throw new IllegalArgumentException("Required argument base missing."); - } - oakFixture = OakFixture.getTar(OakFixture.OAK_TAR, baseFile, 256, cacheSize, mmap.value(options), false); } else if (fix.equals(OakFixture.OAK_SEGMENT_TAR)) { File baseFile = base.value(options); if (baseFile == null) { @@ -139,4 +132,4 @@ class ServerCommand implements Command { startOakServer(oakFixture, uri, cIds); } -} +} \ No newline at end of file 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=1785274&r1=1785273&r2=1785274&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 Fri Mar 3 11:56:40 2017 @@ -31,33 +31,33 @@ import java.util.Properties; import javax.annotation.Nullable; import javax.jcr.RepositoryException; -import com.google.common.collect.Maps; -import com.google.common.io.Closer; -import com.mongodb.MongoClientURI; -import com.mongodb.MongoURI; -import joptsimple.ArgumentAcceptingOptionSpec; -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import joptsimple.OptionSpec; import org.apache.felix.cm.file.ConfigurationHandler; import org.apache.jackrabbit.core.data.DataStore; import org.apache.jackrabbit.core.data.DataStoreException; +import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore; -import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore; import org.apache.jackrabbit.oak.plugins.document.DocumentMK; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection; -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.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import com.google.common.collect.Maps; +import com.google.common.io.Closer; +import com.mongodb.MongoClientURI; +import com.mongodb.MongoURI; + +import joptsimple.ArgumentAcceptingOptionSpec; +import joptsimple.OptionParser; +import joptsimple.OptionSet; +import joptsimple.OptionSpec; + class Utils { private static final long MB = 1024 * 1024; - public static NodeStore bootstrapNodeStore(String[] args, Closer closer, String h) throws IOException, InvalidFileStoreVersionException { + public static NodeStore bootstrapNodeStore(String[] args, Closer closer, String h) throws IOException { //TODO add support for other NodeStore flags OptionParser parser = new OptionParser(); OptionSpec<Integer> clusterId = parser @@ -68,7 +68,6 @@ class Utils { OptionSpec<Integer> cacheSizeSpec = parser. accepts("cacheSize", "cache size").withRequiredArg(). ofType(Integer.class).defaultsTo(0); - OptionSpec<?> segmentTar = parser.accepts("segment-tar", "Use oak-segment-tar instead of oak-segment"); OptionSpec<?> help = parser.acceptsAll(asList("h", "?", "help"), "show help").forHelp(); OptionSpec<String> nonOption = parser @@ -114,11 +113,7 @@ class Utils { return store; } - if (options.has(segmentTar)) { - return SegmentTarUtils.bootstrapNodeStore(src, closer); - } - - return SegmentUtils.bootstrapNodeStore(src, closer); + return SegmentTarUtils.bootstrapNodeStore(src, closer); } @Nullable @@ -159,16 +154,6 @@ class Utils { return blobStore; } - static Closeable asCloseable(final FileStore fs) { - return new Closeable() { - - @Override - public void close() throws IOException { - fs.close(); - } - }; - } - static Closeable asCloseable(final DocumentNodeStore dns) { return new Closeable() { @@ -214,4 +199,4 @@ class Utils { } return props; } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java Fri Mar 3 11:56:40 2017 @@ -28,16 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.common.base.Charsets; -import com.google.common.base.Splitter; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import joptsimple.OptionSpec; - import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.benchmark.CSVResultGenerator; import org.apache.jackrabbit.oak.benchmark.util.Date; @@ -69,6 +59,16 @@ import org.apache.jackrabbit.oak.scalabi import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeRelationshipSuite; import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite; +import com.google.common.base.Charsets; +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + +import joptsimple.OptionParser; +import joptsimple.OptionSet; +import joptsimple.OptionSpec; + /** * Main class for running scalability/longevity tests. * @@ -141,10 +141,6 @@ public class ScalabilityRunner { host.value(options), port.value(options), dbName.value(options), dropDBAfterTest.value(options), cacheSize * MB), - OakRepositoryFixture.getTar( - base.value(options), 256, cacheSize, mmap.value(options)), - OakRepositoryFixture.getTarWithBlobStore(base.value(options), 256, cacheSize, - mmap.value(options), fdsCache.value(options)), OakRepositoryFixture.getSegmentTar( base.value(options), 256, cacheSize, mmap.value(options)), OakRepositoryFixture.getSegmentTarWithBlobStore(base.value(options), 256, cacheSize, @@ -254,4 +250,3 @@ public class ScalabilityRunner { } } } - Added: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segment/FileStoreHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segment/FileStoreHelper.java?rev=1785274&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segment/FileStoreHelper.java (added) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/segment/FileStoreHelper.java Fri Mar 3 11:56:40 2017 @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.jackrabbit.oak.segment; + +import static com.google.common.base.Preconditions.checkArgument; + +import java.io.File; + +public class FileStoreHelper { + + public static File isValidFileStoreOrFail(File store) { + checkArgument(isValidFileStore(store), "Invalid FileStore directory " + + store); + return store; + } + + /** + * Checks if the provided directory is a valid FileStore + * + * @return true if the provided directory is a valid FileStore + */ + public static boolean isValidFileStore(File store) { + if (!store.exists()) { + return false; + } + if (!store.isDirectory()) { + return false; + } + // for now the only check is the existence of the journal file + for (String f : store.list()) { + if ("journal.log".equals(f)) { + return true; + } + } + return false; + } +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Fri Mar 3 11:56:40 2017 @@ -115,12 +115,6 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-segment</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-segment-tar</artifactId> <version>${project.version}</version> <scope>test</scope> 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=1785274&r1=1785273&r2=1785274&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 Fri Mar 3 11:56:40 2017 @@ -29,8 +29,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider; 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.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.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; @@ -52,7 +52,7 @@ public abstract class SolrBaseTest { @Before public void setUp() throws Exception { - store = SegmentNodeStore.builder(new MemoryStore()).build(); + store = SegmentNodeStoreBuilders.builder(new MemoryStore()).build(); provider = new TestUtils(); server = provider.getSolrServer(); configuration = provider.getConfiguration(); @@ -81,4 +81,4 @@ public abstract class SolrBaseTest { return repository.login(null, null).getLatestRoot(); } -} +} \ No newline at end of file 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=1785274&r1=1785273&r2=1785274&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 Fri Mar 3 11:56:40 2017 @@ -16,8 +16,11 @@ */ 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 static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.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; @@ -26,9 +29,6 @@ import org.apache.jackrabbit.oak.spi.sta import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - /** * Tests for {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate.OakSolrNodeStateConfiguration} */ @@ -38,7 +38,7 @@ public class OakSolrNodeStateConfigurati @Before public void setUp() throws Exception { - store = SegmentNodeStore.builder(new MemoryStore()).build(); + store = SegmentNodeStoreBuilders.builder(new MemoryStore()).build(); NodeBuilder builder = store.getRoot().builder(); builder.setProperty("a", 1) .setProperty("b", 2) @@ -82,4 +82,4 @@ public class OakSolrNodeStateConfigurati // expected to fail as the NodeState is not a solr node } } -} +} \ No newline at end of file Modified: jackrabbit/oak/trunk/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1785274&r1=1785273&r2=1785274&view=diff ============================================================================== --- jackrabbit/oak/trunk/pom.xml (original) +++ jackrabbit/oak/trunk/pom.xml Fri Mar 3 11:56:40 2017 @@ -49,7 +49,6 @@ <module>oak-solr-osgi</module> <module>oak-auth-external</module> <module>oak-auth-ldap</module> - <module>oak-tarmk-standby</module> <module>oak-run</module> <module>oak-it-osgi</module> <module>oak-pojosr</module> @@ -58,7 +57,6 @@ <module>oak-exercise</module> <module>oak-examples</module> <module>oak-it</module> - <module>oak-segment</module> <module>oak-segment-tar</module> </modules>
