Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/MergeTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/MergeTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/MergeTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/MergeTest.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; @@ -27,7 +29,8 @@ import java.util.concurrent.atomic.Atomi import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordIdMapTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordIdMapTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordIdMapTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordIdMapTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordIdMapTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordIdMapTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordIdMapTest.java Wed Apr 20 10:34:51 2016 @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.collect.Maps.newHashMap; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.MAX_SEGMENT_SIZE; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.RECORD_ALIGN_BITS; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.encode; -import static org.apache.jackrabbit.oak.plugins.segment.TestUtils.newValidOffset; +import static org.apache.jackrabbit.oak.segment.Segment.MAX_SEGMENT_SIZE; +import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ALIGN_BITS; +import static org.apache.jackrabbit.oak.segment.Segment.encode; +import static org.apache.jackrabbit.oak.segment.TestUtils.newValidOffset; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Random; -import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; +import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.junit.Test; public class RecordIdMapTest { @@ -72,7 +72,7 @@ public class RecordIdMapTest { int n = r.nextInt(maxEntriesPerSegment); int offset = MAX_SEGMENT_SIZE; for (int j = 0; j < n; j++) { - offset = newValidOffset(r, (n - j) << RECORD_ALIGN_BITS, offset); + offset = TestUtils.newValidOffset(r, (n - j) << RECORD_ALIGN_BITS, offset); RecordId record = new RecordId(id, offset); reference.put(encode(record.getOffset()), record); } Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; @@ -25,8 +27,8 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.Type.STRING; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; -import static org.apache.jackrabbit.oak.plugins.segment.ListRecord.LEVEL_SIZE; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.readString; +import static org.apache.jackrabbit.oak.segment.ListRecord.LEVEL_SIZE; +import static org.apache.jackrabbit.oak.segment.Segment.readString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -45,7 +47,16 @@ import java.util.Random; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.api.Blob; -import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; +import org.apache.jackrabbit.oak.segment.BlockRecord; +import org.apache.jackrabbit.oak.segment.ListRecord; +import org.apache.jackrabbit.oak.segment.MapEntry; +import org.apache.jackrabbit.oak.segment.MapRecord; +import org.apache.jackrabbit.oak.segment.RecordId; +import org.apache.jackrabbit.oak.segment.Segment; +import org.apache.jackrabbit.oak.segment.SegmentStore; +import org.apache.jackrabbit.oak.segment.SegmentTracker; +import org.apache.jackrabbit.oak.segment.SegmentWriter; +import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordUsageAnalyserTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordUsageAnalyserTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordUsageAnalyserTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordUsageAnalyserTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/RecordUsageAnalyserTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.base.Strings.repeat; import static java.util.Collections.nCopies; @@ -26,11 +26,11 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.Type.NAMES; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; -import static org.apache.jackrabbit.oak.plugins.segment.ListRecord.LEVEL_SIZE; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.MEDIUM_LIMIT; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.SMALL_LIMIT; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_10; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; +import static org.apache.jackrabbit.oak.segment.ListRecord.LEVEL_SIZE; +import static org.apache.jackrabbit.oak.segment.Segment.MEDIUM_LIMIT; +import static org.apache.jackrabbit.oak.segment.Segment.SMALL_LIMIT; +import static org.apache.jackrabbit.oak.segment.SegmentVersion.V_10; +import static org.apache.jackrabbit.oak.segment.SegmentVersion.V_11; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -42,6 +42,14 @@ import java.util.Random; import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob; +import org.apache.jackrabbit.oak.segment.MapRecord; +import org.apache.jackrabbit.oak.segment.RecordUsageAnalyser; +import org.apache.jackrabbit.oak.segment.SegmentBufferWriter; +import org.apache.jackrabbit.oak.segment.SegmentNodeState; +import org.apache.jackrabbit.oak.segment.SegmentStore; +import org.apache.jackrabbit.oak.segment.SegmentTracker; +import org.apache.jackrabbit.oak.segment.SegmentVersion; +import org.apache.jackrabbit.oak.segment.SegmentWriter; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.junit.Before; import org.junit.Test; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.get; @@ -33,7 +33,7 @@ import static java.lang.System.getProper import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; -import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD; +import static org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD; import static org.junit.Assume.assumeTrue; import static org.slf4j.helpers.MessageFormatter.arrayFormat; import static org.slf4j.helpers.MessageFormatter.format; @@ -74,10 +74,12 @@ import org.apache.jackrabbit.oak.cache.C import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.apache.jackrabbit.oak.plugins.commit.ConflictHook; import org.apache.jackrabbit.oak.plugins.commit.DefaultConflictHandler; -import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy; -import org.apache.jackrabbit.oak.plugins.segment.compaction.DefaultCompactionStrategyMBean; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStoreGCMonitor; +import org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy; +import org.apache.jackrabbit.oak.segment.compaction.DefaultCompactionStrategyMBean; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.file.FileStoreGCMonitor; +import org.apache.jackrabbit.oak.segment.compaction.CompactionStrategyMBean; +import org.apache.jackrabbit.oak.segment.file.GCMonitorMBean; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.CompositeHook; @@ -102,8 +104,8 @@ import org.slf4j.LoggerFactory; * <p>The test schedules a number of readers, writers, a compactor and holds some references for a certain time. * All of which can be interactively modified through the accompanying * {@link SegmentCompactionITMBean}, the - * {@link org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategyMBean} and the - * {@link org.apache.jackrabbit.oak.plugins.segment.file.GCMonitorMBean}.</p> + * {@link CompactionStrategyMBean} and the + * {@link GCMonitorMBean}.</p> * *<p>The test is <b>disabled</b> by default, to run it you need to set the {@code SegmentCompactionIT} system property:<br> * {@code mvn test -Dtest=SegmentCompactionIT -Dtest.opts.memory=-Xmx4G} Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionMBean.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionMBean.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionMBean.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionMBean.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; + +import org.apache.jackrabbit.oak.segment.file.FileStore; /** * MBean for monitoring and interacting with the {@link SegmentCompactionIT} @@ -265,7 +267,7 @@ public interface SegmentCompactionMBean int getReferenceCount(); /** - * @return current size of the {@link org.apache.jackrabbit.oak.plugins.segment.file.FileStore} + * @return current size of the {@link FileStore} */ long getFileStoreSize(); Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java Wed Apr 20 10:34:51 2016 @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; + +package org.apache.jackrabbit.oak.segment; import static org.apache.commons.io.FileUtils.byteCountToDisplaySize; import static org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_MK; @@ -58,8 +59,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils; import org.apache.jackrabbit.oak.plugins.blob.datastore.SharedDataStoreUtils; import org.apache.jackrabbit.oak.plugins.identifier.ClusterRepositoryInfo; -import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy; +import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentGraphTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java Wed Apr 20 10:34:51 2016 @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.collect.Maps.newHashMap; import static com.google.common.collect.Sets.newHashSet; import static java.util.Collections.singleton; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentGraph.createRegExpFilter; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentGraph.parseSegmentGraph; +import static org.apache.jackrabbit.oak.segment.SegmentGraph.createRegExpFilter; +import static org.apache.jackrabbit.oak.segment.SegmentGraph.parseSegmentGraph; import static org.junit.Assert.assertEquals; import java.io.File; @@ -43,9 +43,9 @@ import com.google.common.base.Predicates import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multiset; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.oak.plugins.segment.SegmentGraph.Graph; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore.ReadOnlyStore; +import org.apache.jackrabbit.oak.segment.SegmentGraph.Graph; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.file.FileStore.ReadOnlyStore; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdFactoryTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdFactoryTest.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; @@ -23,7 +25,10 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Set; -import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; +import org.apache.jackrabbit.oak.segment.Segment; +import org.apache.jackrabbit.oak.segment.SegmentId; +import org.apache.jackrabbit.oak.segment.SegmentTracker; +import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.junit.Test; public class SegmentIdFactoryTest { Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdTableBenchmark.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdTableBenchmark.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdTableBenchmark.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableBenchmark.java Wed Apr 20 10:34:51 2016 @@ -1,26 +1,31 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment; +package org.apache.jackrabbit.oak.segment; import java.io.IOException; import java.lang.ref.WeakReference; import java.util.Random; -import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; +import org.apache.jackrabbit.oak.segment.SegmentId; +import org.apache.jackrabbit.oak.segment.SegmentIdTable; +import org.apache.jackrabbit.oak.segment.SegmentTracker; +import org.apache.jackrabbit.oak.segment.memory.MemoryStore; public class SegmentIdTableBenchmark { public static void main(String... args) throws IOException { Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdTableTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdTableTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentIdTableTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentIdTableTest.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static org.junit.Assert.fail; @@ -30,9 +32,12 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import junit.framework.Assert; -import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy; -import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType; -import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; +import org.apache.jackrabbit.oak.segment.SegmentId; +import org.apache.jackrabbit.oak.segment.SegmentIdTable; +import org.apache.jackrabbit.oak.segment.SegmentTracker; +import org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy; +import org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy.CleanupType; +import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.junit.Test; public class SegmentIdTableTest { Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreServiceTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreServiceTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.collect.Maps.newHashMap; import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate; @@ -27,6 +27,8 @@ import static org.mockito.Mockito.mock; import java.util.Map; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreService; +import org.apache.jackrabbit.oak.segment.SegmentStoreProvider; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java Wed Apr 20 10:34:51 2016 @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; -import static org.apache.commons.io.FileUtils.deleteDirectory; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; -import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD; -import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.MEMORY_THRESHOLD_DEFAULT; +import static org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD; +import static org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy.MEMORY_THRESHOLD_DEFAULT; import static org.junit.Assume.assumeTrue; import java.io.ByteArrayInputStream; @@ -33,14 +32,13 @@ import java.util.Random; import com.google.common.collect.Iterables; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy; +import org.apache.jackrabbit.oak.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.gc.GCMonitor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentParserTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentParserTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentParserTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.base.Strings.repeat; import static com.google.common.collect.Lists.newArrayListWithCapacity; @@ -29,14 +29,14 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.Type.NAME; import static org.apache.jackrabbit.oak.api.Type.NAMES; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.MEDIUM_LIMIT; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.SMALL_LIMIT; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentParser.BlobType.LONG; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentParser.BlobType.MEDIUM; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentParser.BlobType.SMALL; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_10; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; -import static org.apache.jackrabbit.oak.plugins.segment.TestUtils.newRecordId; +import static org.apache.jackrabbit.oak.segment.Segment.MEDIUM_LIMIT; +import static org.apache.jackrabbit.oak.segment.Segment.SMALL_LIMIT; +import static org.apache.jackrabbit.oak.segment.SegmentParser.BlobType.LONG; +import static org.apache.jackrabbit.oak.segment.SegmentParser.BlobType.MEDIUM; +import static org.apache.jackrabbit.oak.segment.SegmentParser.BlobType.SMALL; +import static org.apache.jackrabbit.oak.segment.SegmentVersion.V_10; +import static org.apache.jackrabbit.oak.segment.SegmentVersion.V_11; +import static org.apache.jackrabbit.oak.segment.TestUtils.newRecordId; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -51,12 +51,12 @@ import com.google.common.collect.Immutab import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob; -import org.apache.jackrabbit.oak.plugins.segment.SegmentParser.BlobInfo; -import org.apache.jackrabbit.oak.plugins.segment.SegmentParser.ListInfo; -import org.apache.jackrabbit.oak.plugins.segment.SegmentParser.MapInfo; -import org.apache.jackrabbit.oak.plugins.segment.SegmentParser.NodeInfo; -import org.apache.jackrabbit.oak.plugins.segment.SegmentParser.ValueInfo; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.SegmentParser.BlobInfo; +import org.apache.jackrabbit.oak.segment.SegmentParser.ListInfo; +import org.apache.jackrabbit.oak.segment.SegmentParser.MapInfo; +import org.apache.jackrabbit.oak.segment.SegmentParser.NodeInfo; +import org.apache.jackrabbit.oak.segment.SegmentParser.ValueInfo; +import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.junit.After; import org.junit.Before; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentSizeTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentSizeTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentSizeTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentSizeTest.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static junit.framework.Assert.assertEquals; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; @@ -26,7 +28,13 @@ import java.util.Collections; import com.google.common.collect.ImmutableList; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; -import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; +import org.apache.jackrabbit.oak.segment.RecordId; +import org.apache.jackrabbit.oak.segment.Segment; +import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder; +import org.apache.jackrabbit.oak.segment.SegmentNodeState; +import org.apache.jackrabbit.oak.segment.SegmentStore; +import org.apache.jackrabbit.oak.segment.SegmentWriter; +import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.util.ISO8601; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentVersionTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentVersionTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentVersionTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentVersionTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/SegmentVersionTest.java Wed Apr 20 10:34:51 2016 @@ -16,16 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; + +package org.apache.jackrabbit.oak.segment; import static org.apache.jackrabbit.oak.api.Type.LONG; import static org.apache.jackrabbit.oak.api.Type.LONGS; import static org.apache.jackrabbit.oak.api.Type.STRING; import static org.apache.jackrabbit.oak.api.Type.STRINGS; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.LATEST_VERSION; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_10; -import static org.apache.jackrabbit.oak.plugins.segment.SegmentVersion.V_11; -import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_NONE; +import static org.apache.jackrabbit.oak.segment.SegmentVersion.LATEST_VERSION; +import static org.apache.jackrabbit.oak.segment.SegmentVersion.V_10; +import static org.apache.jackrabbit.oak.segment.SegmentVersion.V_11; +import static org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy.CleanupType.CLEAN_NONE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -37,8 +38,11 @@ import com.google.common.collect.Immutab import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; -import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeState; +import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentVersion; +import org.apache.jackrabbit.oak.segment.compaction.CompactionStrategy; +import org.apache.jackrabbit.oak.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.ChildNodeEntry; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/ShortSetTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ShortSetTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/ShortSetTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/ShortSetTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ShortSetTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ShortSetTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/ShortSetTest.java Wed Apr 20 10:34:51 2016 @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Random; -import org.apache.jackrabbit.oak.plugins.segment.RecordIdSet.ShortSet; +import org.apache.jackrabbit.oak.segment.RecordIdSet.ShortSet; import org.junit.Test; public class ShortSetTest { Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/StringCacheTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/StringCacheTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/StringCacheTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/StringCacheTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/StringCacheTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/StringCacheTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/StringCacheTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.Atomi import javax.annotation.Nullable; +import org.apache.jackrabbit.oak.segment.StringCache; import org.junit.Test; import com.google.common.base.Function; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TemplateTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/TemplateTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TemplateTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TemplateTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/TemplateTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/TemplateTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TemplateTest.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty; @@ -26,7 +28,8 @@ import org.apache.jackrabbit.oak.api.Typ import static org.junit.Assert.*; -import org.junit.Assert; +import org.apache.jackrabbit.oak.segment.PropertyTemplate; +import org.apache.jackrabbit.oak.segment.Template; import org.junit.Test; public class TemplateTest { Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/TestUtils.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/TestUtils.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/TestUtils.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java Wed Apr 20 10:34:51 2016 @@ -17,17 +17,21 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment; +package org.apache.jackrabbit.oak.segment; import static com.google.common.collect.Maps.newHashMap; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.MAX_SEGMENT_SIZE; -import static org.apache.jackrabbit.oak.plugins.segment.Segment.RECORD_ALIGN_BITS; +import static org.apache.jackrabbit.oak.segment.Segment.MAX_SEGMENT_SIZE; +import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ALIGN_BITS; import java.util.Map; import java.util.Random; import javax.annotation.Nonnull; +import org.apache.jackrabbit.oak.segment.RecordId; +import org.apache.jackrabbit.oak.segment.SegmentId; +import org.apache.jackrabbit.oak.segment.SegmentTracker; + // FIXME SegmentTestUtils duplicates this public final class TestUtils { private TestUtils() {} Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/CompactionEstimatorTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/CompactionEstimatorTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/CompactionEstimatorTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/CompactionEstimatorTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/CompactionEstimatorTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import static org.junit.Assert.assertTrue; @@ -28,7 +28,8 @@ import java.util.Random; import com.google.common.base.Suppliers; import org.apache.jackrabbit.oak.api.Blob; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.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; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ExternalBlobReferenceTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ExternalBlobReferenceTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ExternalBlobReferenceTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ExternalBlobReferenceTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ExternalBlobReferenceTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ExternalBlobReferenceTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ExternalBlobReferenceTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -28,8 +28,9 @@ import java.io.IOException; import java.io.InputStream; import com.google.common.base.Strings; -import org.apache.jackrabbit.oak.plugins.segment.Segment; -import org.apache.jackrabbit.oak.plugins.segment.SegmentBlob; +import org.apache.jackrabbit.oak.segment.Segment; +import org.apache.jackrabbit.oak.segment.SegmentBlob; +import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.junit.After; import org.junit.Before; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileBlob.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileBlob.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileBlob.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileBlob.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import java.io.File; import java.io.FileInputStream; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreIT.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreIT.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newTreeSet; @@ -37,14 +39,14 @@ import java.util.Random; import com.google.common.base.Strings; import org.apache.jackrabbit.oak.api.Blob; -import org.apache.jackrabbit.oak.plugins.segment.RecordId; -import org.apache.jackrabbit.oak.plugins.segment.Segment; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeBuilder; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeState; -import org.apache.jackrabbit.oak.plugins.segment.SegmentWriter; -import org.apache.jackrabbit.oak.plugins.segment.file.FileStore.ReadOnlyStore; +import org.apache.jackrabbit.oak.segment.RecordId; +import org.apache.jackrabbit.oak.segment.Segment; +import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder; +import org.apache.jackrabbit.oak.segment.SegmentNodeState; +import org.apache.jackrabbit.oak.segment.SegmentWriter; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.file.FileStore.ReadOnlyStore; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreStatsTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreStatsTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreStatsTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import java.io.File; import java.util.UUID; @@ -25,6 +25,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.file.FileStoreStats; +import org.apache.jackrabbit.oak.segment.file.TarWriter; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; import org.apache.jackrabbit.oak.stats.StatisticsProvider; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStoreTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java Wed Apr 20 10:34:51 2016 @@ -17,12 +17,13 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.oak.plugins.segment.SegmentId; +import org.apache.jackrabbit.oak.segment.SegmentId; +import org.apache.jackrabbit.oak.segment.file.FileStore; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalEntryTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalEntryTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalEntryTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalEntryTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,7 +29,9 @@ import java.util.List; import com.google.common.base.Splitter; import com.google.common.io.Files; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.segment.file.JournalReader; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java Wed Apr 20 10:34:51 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import static org.apache.commons.io.FileUtils.write; import static org.junit.Assert.assertEquals; @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; import java.util.Iterator; +import org.apache.jackrabbit.oak.segment.file.JournalReader; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java Wed Apr 20 10:34:51 2016 @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.segment.file; + +package org.apache.jackrabbit.oak.segment.file; import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReaderTestParamBlockSize.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReaderTestParamBlockSize.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReaderTestParamBlockSize.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java Wed Apr 20 10:34:51 2016 @@ -1,25 +1,23 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.GBK_BIN; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.WINDOWS_31J_BIN; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.X_WINDOWS_949_BIN; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.X_WINDOWS_950_BIN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -94,7 +92,7 @@ public class ReversedLinesFileReaderTest @Test public void testWindows31jFile() throws URISyntaxException, IOException { - File testFileWindows31J = createFile(WINDOWS_31J_BIN); + File testFileWindows31J = createFile(ReversedLinesReaderTestData.WINDOWS_31J_BIN); reversedLinesFileReader = new ReversedLinesFileReader(testFileWindows31J, testParamBlockSize, "windows-31j"); assertEqualsAndNoLineBreaks(TEST_LINE_WINDOWS_31J_2, reversedLinesFileReader.readLine()); assertEqualsAndNoLineBreaks(TEST_LINE_WINDOWS_31J_1, reversedLinesFileReader.readLine()); @@ -102,7 +100,7 @@ public class ReversedLinesFileReaderTest @Test public void testGBK() throws URISyntaxException, IOException { - File testFileGBK = createFile(GBK_BIN); + File testFileGBK = createFile(ReversedLinesReaderTestData.GBK_BIN); reversedLinesFileReader = new ReversedLinesFileReader(testFileGBK, testParamBlockSize, "GBK"); assertEqualsAndNoLineBreaks(TEST_LINE_GBK_2, reversedLinesFileReader.readLine()); assertEqualsAndNoLineBreaks(TEST_LINE_GBK_1, reversedLinesFileReader.readLine()); @@ -110,7 +108,7 @@ public class ReversedLinesFileReaderTest @Test public void testxWindows949File() throws URISyntaxException, IOException { - File testFilexWindows949 = createFile(X_WINDOWS_949_BIN); + File testFilexWindows949 = createFile(ReversedLinesReaderTestData.X_WINDOWS_949_BIN); reversedLinesFileReader = new ReversedLinesFileReader(testFilexWindows949, testParamBlockSize, "x-windows-949"); assertEqualsAndNoLineBreaks(TEST_LINE_X_WINDOWS_949_2, reversedLinesFileReader.readLine()); assertEqualsAndNoLineBreaks(TEST_LINE_X_WINDOWS_949_1, reversedLinesFileReader.readLine()); @@ -118,7 +116,7 @@ public class ReversedLinesFileReaderTest @Test public void testxWindows950File() throws URISyntaxException, IOException { - File testFilexWindows950 = createFile(X_WINDOWS_950_BIN); + File testFilexWindows950 = createFile(ReversedLinesReaderTestData.X_WINDOWS_950_BIN); reversedLinesFileReader = new ReversedLinesFileReader(testFilexWindows950, testParamBlockSize, "x-windows-950"); assertEqualsAndNoLineBreaks(TEST_LINE_X_WINDOWS_950_2, reversedLinesFileReader.readLine()); assertEqualsAndNoLineBreaks(TEST_LINE_X_WINDOWS_950_1, reversedLinesFileReader.readLine()); Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReaderTestParamFile.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReaderTestParamFile.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReaderTestParamFile.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java Wed Apr 20 10:34:51 2016 @@ -1,27 +1,29 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.GBK_BIN; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.WINDOWS_31J_BIN; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.X_WINDOWS_949_BIN; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.X_WINDOWS_950_BIN; -import static org.apache.jackrabbit.oak.plugins.segment.file.ReversedLinesReaderTestData.createFile; +import static org.apache.jackrabbit.oak.segment.file.ReversedLinesReaderTestData.GBK_BIN; +import static org.apache.jackrabbit.oak.segment.file.ReversedLinesReaderTestData.WINDOWS_31J_BIN; +import static org.apache.jackrabbit.oak.segment.file.ReversedLinesReaderTestData.X_WINDOWS_949_BIN; +import static org.apache.jackrabbit.oak.segment.file.ReversedLinesReaderTestData.X_WINDOWS_950_BIN; +import static org.apache.jackrabbit.oak.segment.file.ReversedLinesReaderTestData.createFile; import static org.junit.Assert.assertEquals; import java.io.BufferedReader; Copied: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesReaderTestData.java (from r1740105, jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesReaderTestData.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesReaderTestData.java?p2=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesReaderTestData.java&p1=jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesReaderTestData.java&r1=1740105&r2=1740107&rev=1740107&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesReaderTestData.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesReaderTestData.java Wed Apr 20 10:34:51 2016 @@ -1,20 +1,22 @@ /* - * 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 + * 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 + * 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. + * 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.plugins.segment.file; +package org.apache.jackrabbit.oak.segment.file; import java.io.File; import java.io.FileOutputStream;
