Copied: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java (from r1799589, jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ExternalBlobReferenceTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ExternalBlobReferenceTest.java&r1=1799589&r2=1799590&rev=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ExternalBlobReferenceTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java Thu Jun 22 15:14:00 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.segment.file; +package org.apache.jackrabbit.oak.segment; import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder; import static org.junit.Assert.assertEquals; @@ -32,6 +32,7 @@ import java.io.InputStream; import com.google.common.base.Strings; import org.apache.jackrabbit.oak.segment.SegmentBlob; import org.apache.jackrabbit.oak.segment.SegmentTestConstants; +import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.junit.After; import org.junit.Before; @@ -104,7 +105,7 @@ public class ExternalBlobReferenceTest { doReturn(blobId).when(blobStore).writeBlob(any(InputStream.class)); doReturn(blobLength).when(blobStore).getBlobLength(blobId); - SegmentBlob blob = fileStore.getWriter().writeStream(newRandomInputStream(blobLength)); + SegmentBlob blob = new SegmentBlob(blobStore, fileStore.getWriter().writeStream(newRandomInputStream(blobLength))); assertEquals(blobLength, blob.length()); }
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/MapRecordTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/MapRecordTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/MapRecordTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/MapRecordTest.java Thu Jun 22 15:14:00 2017 @@ -29,14 +29,13 @@ import java.io.IOException; import java.util.Set; import java.util.regex.Pattern; +import com.google.common.collect.Sets; 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.oak.spi.state.NodeStateDiff; import org.junit.Test; -import com.google.common.collect.Sets; - /** * Test case for segment node state comparisons. */ @@ -47,8 +46,12 @@ public class MapRecordTest { private NodeBuilder builder; + // TODO frm replace this with JUnit test initialization public MapRecordTest() throws IOException { - builder = new MemoryStore().getWriter().writeNode(EMPTY_NODE).builder(); + MemoryStore store = new MemoryStore(); + RecordId id = store.getWriter().writeNode(EMPTY_NODE); + SegmentNodeState node = new SegmentNodeState(store.getReader(), store.getWriter(), store.getBlobStore(), id); + builder = node.builder(); } @Test Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java Thu Jun 22 15:14:00 2017 @@ -61,8 +61,9 @@ public class NodeRecordTest { @Test public void unreferencedNodeRecordShouldBeRoot() throws Exception { try (FileStore store = newFileStore()) { - SegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test").build(store); - SegmentNodeState state = writer.writeNode(EmptyNodeState.EMPTY_NODE); + DefaultSegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test").build(store); + // TODO frm this line does not seem to do anything useful + SegmentNodeState state = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(EmptyNodeState.EMPTY_NODE)); writer.flush(); } } @@ -70,18 +71,18 @@ public class NodeRecordTest { @Test public void stableIdShouldPersistAcrossGenerations() throws Exception { try (FileStore store = newFileStore()) { - SegmentWriter writer; + DefaultSegmentWriter writer; writer = SegmentWriterBuilder.segmentWriterBuilder("1").withGeneration(1).build(store); - SegmentNodeState one = writer.writeNode(EmptyNodeState.EMPTY_NODE); + SegmentNodeState one = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(EmptyNodeState.EMPTY_NODE)); writer.flush(); writer = SegmentWriterBuilder.segmentWriterBuilder("2").withGeneration(2).build(store); - SegmentNodeState two = writer.writeNode(one); + SegmentNodeState two = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(one)); writer.flush(); writer = SegmentWriterBuilder.segmentWriterBuilder("3").withGeneration(3).build(store); - SegmentNodeState three = writer.writeNode(two); + SegmentNodeState three = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(two)); writer.flush(); assertArrayEquals(asByteArray(three.getStableIdBytes()), asByteArray(two.getStableIdBytes())); @@ -104,7 +105,7 @@ public class NodeRecordTest { // otherwise the write of some records (in this case, template // records) will be cached and prevent this test to fail. - SegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test") + DefaultSegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test") .withGeneration(generation) .withWriterPool() .with(nodesOnlyCache()) @@ -115,18 +116,19 @@ public class NodeRecordTest { // Write a new node with a non trivial template. This record will // belong to generation 1. - SegmentNodeState base = writer.writeNode(EmptyNodeState.EMPTY_NODE.builder() + RecordId baseId = writer.writeNode(EmptyNodeState.EMPTY_NODE.builder() .setProperty("a", "a") .setProperty("k", "v1") .getNodeState() ); + SegmentNodeState base = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), baseId); writer.flush(); generation.set(2); // Compact that same record to generation 2. - SegmentNodeState compacted = writer.writeNode(base); + SegmentNodeState compacted = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(base)); writer.flush(); // Assert that even if the two records have the same stable ID, Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java Thu Jun 22 15:14:00 2017 @@ -76,7 +76,7 @@ public class RecordTest { private FileStore store; - private SegmentWriter writer; + private DefaultSegmentWriter writer; private final Random random = new Random(0xcafefaceL); @@ -176,8 +176,8 @@ public class RecordTest { checkRandomStreamRecord(0x80); checkRandomStreamRecord(0x4079); checkRandomStreamRecord(0x4080); - checkRandomStreamRecord(SegmentWriter.BLOCK_SIZE); - checkRandomStreamRecord(SegmentWriter.BLOCK_SIZE + 1); + checkRandomStreamRecord(DefaultSegmentWriter.BLOCK_SIZE); + checkRandomStreamRecord(DefaultSegmentWriter.BLOCK_SIZE + 1); checkRandomStreamRecord(Segment.MAX_SEGMENT_SIZE); checkRandomStreamRecord(Segment.MAX_SEGMENT_SIZE + 1); checkRandomStreamRecord(Segment.MAX_SEGMENT_SIZE * 2); @@ -188,7 +188,7 @@ public class RecordTest { byte[] source = new byte[size]; random.nextBytes(source); - Blob value = writer.writeStream(new ByteArrayInputStream(source)); + Blob value = new SegmentBlob(store.getBlobStore(), writer.writeStream(new ByteArrayInputStream(source))); InputStream stream = value.getNewStream(); checkBlob(source, value, 0); checkBlob(source, value, 1); @@ -237,17 +237,14 @@ public class RecordTest { public void testMapRecord() throws IOException { RecordId blockId = writer.writeBlock(bytes, 0, bytes.length); - MapRecord zero = writer.writeMap( - null, ImmutableMap.<String, RecordId>of()); - MapRecord one = writer.writeMap( - null, ImmutableMap.of("one", blockId)); - MapRecord two = writer.writeMap( - null, ImmutableMap.of("one", blockId, "two", blockId)); + MapRecord zero = new MapRecord(store.getReader(), writer.writeMap(null, ImmutableMap.<String, RecordId>of())); + MapRecord one = new MapRecord(store.getReader(), writer.writeMap(null, ImmutableMap.of("one", blockId))); + MapRecord two = new MapRecord(store.getReader(), writer.writeMap(null, ImmutableMap.of("one", blockId, "two", blockId))); Map<String, RecordId> map = newHashMap(); for (int i = 0; i < 1000; i++) { map.put("key" + i, blockId); } - MapRecord many = writer.writeMap(null, map); + MapRecord many = new MapRecord(store.getReader(), writer.writeMap(null, map)); Iterator<MapEntry> iterator; @@ -288,7 +285,7 @@ public class RecordTest { Map<String, RecordId> changes = newHashMap(); changes.put("key0", null); changes.put("key1000", blockId); - MapRecord modified = writer.writeMap(many, changes); + MapRecord modified = new MapRecord(store.getReader(), writer.writeMap(many, changes)); assertEquals(1000, modified.size()); iterator = modified.getEntries().iterator(); for (int i = 1; i <= 1000; i++) { @@ -306,7 +303,7 @@ public class RecordTest { Map<String, RecordId> changes = newHashMap(); changes.put("one", null); - MapRecord zero = writer.writeMap(null, changes); + MapRecord zero = new MapRecord(store.getReader(), writer.writeMap(null, changes)); assertEquals(0, zero.size()); } @@ -321,7 +318,7 @@ public class RecordTest { map.put(new String(key), blockId); } - MapRecord bad = writer.writeMap(null, map); + MapRecord bad = new MapRecord(store.getReader(), writer.writeMap(null, map)); assertEquals(map.size(), bad.size()); Iterator<MapEntry> iterator = bad.getEntries().iterator(); @@ -335,7 +332,7 @@ public class RecordTest { @Test public void testEmptyNode() throws IOException { NodeState before = EMPTY_NODE; - NodeState after = writer.writeNode(before); + NodeState after = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(before)); assertEquals(before, after); } @@ -346,7 +343,7 @@ public class RecordTest { .setProperty("bar", 123) .setProperty("baz", Math.PI) .getNodeState(); - NodeState after = writer.writeNode(before); + NodeState after = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(before)); assertEquals(before, after); } @@ -358,7 +355,7 @@ public class RecordTest { builder = builder.child("test"); } NodeState before = builder.getNodeState(); - NodeState after = writer.writeNode(before); + NodeState after = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(before)); assertEquals(before, after); } @@ -368,14 +365,14 @@ public class RecordTest { for (int i = 0; i < 1000; i++) { builder.child("test" + i); } - NodeState before = writer.writeNode(builder.getNodeState()); + NodeState before = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); assertEquals(builder.getNodeState(), before); builder = before.builder(); for (int i = 0; i < 900; i++) { builder.getChildNode("test" + i).remove(); } - NodeState after = writer.writeNode(builder.getNodeState()); + NodeState after = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); assertEquals(builder.getNodeState(), after); } @@ -389,13 +386,13 @@ public class RecordTest { // create enough copies of the value to fill a full segment List<Blob> blobs = newArrayList(); while (blobs.size() * data.length < Segment.MAX_SEGMENT_SIZE) { - blobs.add(writer.writeStream(new ByteArrayInputStream(data))); + blobs.add(new SegmentBlob(store.getBlobStore(), writer.writeStream(new ByteArrayInputStream(data)))); } // write a simple node that'll now be stored in a separate segment NodeBuilder builder = EMPTY_NODE.builder(); builder.setProperty("test", blobs, BINARIES); - NodeState state = writer.writeNode(builder.getNodeState()); + NodeState state = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); // all the blobs should still be accessible, even if they're // referenced from another segment @@ -422,7 +419,7 @@ public class RecordTest { NodeBuilder builder = EMPTY_NODE.builder(); builder.setProperty(extPropertyState); - NodeState state = writer.writeNode(builder.getNodeState()); + NodeState state = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); try { InputStream is = state.getProperty("binary").getValue(BINARY).getNewStream(); @@ -437,7 +434,7 @@ public class RecordTest { public void testStringPrimaryType() throws IOException { NodeBuilder builder = EMPTY_NODE.builder(); builder.setProperty("jcr:primaryType", "foo", STRING); - NodeState state = writer.writeNode(builder.getNodeState()); + NodeState state = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); assertNotNull(state.getProperty("jcr:primaryType")); } @@ -445,15 +442,15 @@ public class RecordTest { public void testStringMixinTypes() throws IOException { NodeBuilder builder = EMPTY_NODE.builder(); builder.setProperty("jcr:mixinTypes", singletonList("foo"), STRINGS); - NodeState state = writer.writeNode(builder.getNodeState()); + NodeState state = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); assertNotNull(state.getProperty("jcr:mixinTypes")); } @Test public void testCancel() throws IOException { NodeBuilder builder = EMPTY_NODE.builder(); - NodeState state = writer.writeNode(builder.getNodeState(), Suppliers.ofInstance(true)); - assertNull(state); + RecordId id = writer.writeNode(builder.getNodeState(), Suppliers.ofInstance(true)); + assertNull(id); } } Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterTest.java Thu Jun 22 15:14:00 2017 @@ -81,7 +81,7 @@ public class SegmentBufferWriterTest { } try (FileStore store = openFileStore()) { - SegmentWriter writer = segmentWriterBuilder("t").build(store); + DefaultSegmentWriter writer = segmentWriterBuilder("t").build(store); writer.writeString("test"); writer.flush(); } Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentGraphTest.java Thu Jun 22 15:14:00 2017 @@ -41,7 +41,7 @@ import com.google.common.base.Predicates import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multiset; - +import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.segment.SegmentGraph.Graph; import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore; @@ -71,18 +71,18 @@ public class SegmentGraphTest { SegmentNodeState root = store.getHead(); segments.add(getSegmentId(root)); - SegmentWriter w1 = segmentWriterBuilder("writer1").build(store); - SegmentWriter w2 = segmentWriterBuilder("writer2").build(store); - SegmentWriter w3 = segmentWriterBuilder("writer3").build(store); + DefaultSegmentWriter w1 = segmentWriterBuilder("writer1").build(store); + DefaultSegmentWriter w2 = segmentWriterBuilder("writer2").build(store); + DefaultSegmentWriter w3 = segmentWriterBuilder("writer3").build(store); - SegmentPropertyState p1 = w1.writeProperty(createProperty("p1", "v1")); + SegmentPropertyState p1 = new SegmentPropertyState(store.getReader(), w1.writeProperty(createProperty("p1", "v1")), "p1", Type.STRING); segments.add(getSegmentId(p1)); - SegmentPropertyState p2 = w2.writeProperty(createProperty("p2", "v2")); + SegmentPropertyState p2 = new SegmentPropertyState(store.getReader(), w2.writeProperty(createProperty("p2", "v2")), "p2", Type.STRING); segments.add(getSegmentId(p2)); filteredSegments.add(getSegmentId(p2)); - SegmentPropertyState p3 = w3.writeProperty(createProperty("p3", "v3")); + SegmentPropertyState p3 = new SegmentPropertyState(store.getReader(), w3.writeProperty(createProperty("p3", "v3")), "p3", Type.STRING); segments.add(getSegmentId(p3)); filteredSegments.add(getSegmentId(p3)); @@ -91,7 +91,7 @@ public class SegmentGraphTest { builder.setProperty(p2); builder.setProperty(p3); - SegmentNodeState n3 = w3.writeNode(builder.getNodeState()); + SegmentNodeState n3 = new SegmentNodeState(store.getReader(), w3, store.getBlobStore(), w3.writeNode(builder.getNodeState())); segments.add(getSegmentId(n3)); filteredSegments.add(getSegmentId(n3)); addReference(references, getSegmentId(n3), getSegmentId(p1)); @@ -99,7 +99,7 @@ public class SegmentGraphTest { addReference(filteredReferences, getSegmentId(n3), getSegmentId(p2)); // Cyclic reference - SegmentNodeState n1 = w1.writeNode(builder.getNodeState()); + SegmentNodeState n1 = new SegmentNodeState(store.getReader(), w1, store.getBlobStore(), w1.writeNode(builder.getNodeState())); addReference(references, getSegmentId(n1), getSegmentId(p2)); addReference(references, getSegmentId(n1), getSegmentId(p3)); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java Thu Jun 22 15:14:00 2017 @@ -59,7 +59,7 @@ import org.junit.Test; public class SegmentParserTest { private MemoryStore store; - private SegmentWriter writer; + private DefaultSegmentWriter writer; private static class TestParser extends SegmentParser { private final String name; @@ -142,7 +142,7 @@ public class SegmentParserTest { @Test public void emptyNode() throws IOException { - SegmentNodeState node = writer.writeNode(EMPTY_NODE); + SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(EMPTY_NODE)); NodeInfo info = new TestParser(store.getReader(), "emptyNode") { @Override protected void onTemplate(RecordId parentId, RecordId templateId) { } }.parseNode(node.getRecordId()); @@ -156,7 +156,7 @@ public class SegmentParserTest { public void singleChildNode() throws IOException { NodeBuilder builder = EMPTY_NODE.builder(); builder.setChildNode("child"); - SegmentNodeState node = writer.writeNode(builder.getNodeState()); + SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); NodeInfo info = new TestParser(store.getReader(), "singleChildNode") { @Override protected void onNode(RecordId parentId, RecordId nodeId) { } @Override protected void onTemplate(RecordId parentId, RecordId templateId) { } @@ -173,7 +173,7 @@ public class SegmentParserTest { builder.setChildNode("one"); builder.setChildNode("two"); builder.setProperty("three", 42); - SegmentNodeState node = writer.writeNode(builder.getNodeState()); + SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); NodeInfo info = new TestParser(store.getReader(), "node") { @Override protected void onNode(RecordId parentId, RecordId nodeId) { } @Override protected void onTemplate(RecordId parentId, RecordId templateId) { } @@ -194,7 +194,7 @@ public class SegmentParserTest { builder.setProperty("p", 1); builder.setProperty("jcr:primaryType", "type", NAME); builder.setProperty("jcr:mixinTypes", ImmutableList.of("type1", "type2"), NAMES); - SegmentNodeState node = writer.writeNode(builder.getNodeState()); + SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); NodeInfo nodeInfo = new TestParser(store.getReader(), "template") { @Override protected void onTemplate(RecordId parentId, RecordId templateId) { @@ -217,7 +217,7 @@ public class SegmentParserTest { @Test public void emptyMap() throws IOException { Map<String, RecordId> empty = newHashMap(); - MapRecord map = writer.writeMap(null, empty); + MapRecord map = new MapRecord(store.getReader(), writer.writeMap(null, empty)); MapInfo mapInfo = new TestParser(store.getReader(), "emptyMap") { @Override protected void onMapLeaf(RecordId parentId, RecordId mapId, MapRecord map) { } }.parseMap(null, map.getRecordId(), map); @@ -227,8 +227,8 @@ public class SegmentParserTest { @Test public void nonEmptyMap() throws IOException { Random rnd = new Random(); - MapRecord base = writer.writeMap(null, createMap(33, rnd)); - MapRecord map = writer.writeMap(base, createMap(1, rnd)); + MapRecord base = new MapRecord(store.getReader(), writer.writeMap(null, createMap(33, rnd))); + MapRecord map = new MapRecord(store.getReader(), writer.writeMap(base, createMap(1, rnd))); MapInfo mapInfo = new TestParser(store.getReader(), "nonEmptyMap") { @Override protected void onMapDiff(RecordId parentId, RecordId mapId, MapRecord map) { @@ -267,7 +267,7 @@ public class SegmentParserTest { public void singleValueProperty() throws IOException { NodeBuilder builder = EMPTY_NODE.builder(); builder.setProperty("p", 1); - SegmentNodeState node = writer.writeNode(builder.getNodeState()); + SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); NodeInfo nodeInfo = new TestParser(store.getReader(), "singleValueProperty") { @Override protected void onProperty(RecordId parentId, RecordId propertyId, PropertyTemplate template) { @@ -285,7 +285,7 @@ public class SegmentParserTest { public void multiValueProperty() throws IOException { NodeBuilder builder = EMPTY_NODE.builder(); builder.setProperty("p", ImmutableList.of(1L, 2L, 3L, 4L), LONGS); - SegmentNodeState node = writer.writeNode(builder.getNodeState()); + SegmentNodeState node = new SegmentNodeState(store.getReader(), writer, store.getBlobStore(), writer.writeNode(builder.getNodeState())); NodeInfo nodeInfo = new TestParser(store.getReader(), "multiValueProperty") { @Override protected void onProperty(RecordId parentId, RecordId propertyId, PropertyTemplate template) { @@ -301,7 +301,7 @@ public class SegmentParserTest { @Test public void smallBlob() throws IOException { - SegmentBlob blob = writer.writeBlob(createRandomBlob(4)); + SegmentBlob blob = new SegmentBlob(store.getBlobStore(), writer.writeBlob(createRandomBlob(4))); ValueInfo valueInfo = new TestParser(store.getReader(), "smallBlob") { @Override protected void onBlob(RecordId parentId, RecordId blobId) { @@ -316,7 +316,7 @@ public class SegmentParserTest { @Test public void mediumBlob() throws IOException { - SegmentBlob blob = writer.writeBlob(createRandomBlob(SMALL_LIMIT)); + SegmentBlob blob = new SegmentBlob(store.getBlobStore(), writer.writeBlob(createRandomBlob(SMALL_LIMIT))); ValueInfo valueInfo = new TestParser(store.getReader(), "mediumBlob") { @Override protected void onBlob(RecordId parentId, RecordId blobId) { @@ -331,7 +331,7 @@ public class SegmentParserTest { @Test public void longBlob() throws IOException { - SegmentBlob blob = writer.writeBlob(createRandomBlob(MEDIUM_LIMIT)); + SegmentBlob blob = new SegmentBlob(store.getBlobStore(), writer.writeBlob(createRandomBlob(MEDIUM_LIMIT))); ValueInfo valueInfo = new TestParser(store.getReader(), "longBlob") { @Override protected void onBlob(RecordId parentId, RecordId blobId) { Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentReferencesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentReferencesTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentReferencesTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentReferencesTest.java Thu Jun 22 15:14:00 2017 @@ -44,7 +44,7 @@ public class SegmentReferencesTest { // Write two records, one referencing the other. - SegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test").build(store); + DefaultSegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test").build(store); RecordId stringId = writer.writeString("test"); RecordId listId = writer.writeList(Arrays.asList(stringId, stringId)); writer.flush(); @@ -66,7 +66,7 @@ public class SegmentReferencesTest { // Write two records, one referencing the other. - SegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test").build(store); + DefaultSegmentWriter writer = SegmentWriterBuilder.segmentWriterBuilder("test").build(store); RecordId stringId = writer.writeString("test"); writer.flush(); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java Thu Jun 22 15:14:00 2017 @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.api.Blo import org.apache.jackrabbit.oak.segment.RecordId; 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.DefaultSegmentWriter; import org.apache.jackrabbit.oak.segment.SegmentTestConstants; import org.junit.Rule; import org.junit.Test; @@ -133,7 +133,7 @@ public class FileStoreIT { public void segmentOverflow() throws Exception { for (int n = 1; n < 255; n++) { // 255 = ListRecord.LEVEL_SIZE FileStore store = fileStoreBuilder(getFileStoreFolder()).withMaxFileSize(1).withMemoryMapping(false).build(); - SegmentWriter writer = store.getWriter(); + DefaultSegmentWriter writer = store.getWriter(); // writer.length == 32 (from the root node) // adding 15 strings with 16516 bytes each Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/server/DefaultStandbyReferenceReaderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/server/DefaultStandbyReferenceReaderTest.java?rev=1799590&r1=1799589&r2=1799590&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/server/DefaultStandbyReferenceReaderTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/server/DefaultStandbyReferenceReaderTest.java Thu Jun 22 15:14:00 2017 @@ -29,7 +29,7 @@ import java.io.File; import java.util.Iterator; import org.apache.jackrabbit.oak.segment.RecordId; -import org.apache.jackrabbit.oak.segment.SegmentWriter; +import org.apache.jackrabbit.oak.segment.DefaultSegmentWriter; import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder; import org.junit.Rule; @@ -57,7 +57,7 @@ public class DefaultStandbyReferenceRead @Test public void shouldReturnEmptyReferences() throws Exception { try (FileStore store = newFileStore()) { - SegmentWriter writer = segmentWriterBuilder("test").build(store); + DefaultSegmentWriter writer = segmentWriterBuilder("test").build(store); RecordId id = writer.writeString("test"); writer.flush(); @@ -71,7 +71,7 @@ public class DefaultStandbyReferenceRead @Test public void shouldReturnReferences() throws Exception { try (FileStore store = newFileStore()) { - SegmentWriter writer = segmentWriterBuilder("test").build(store); + DefaultSegmentWriter writer = segmentWriterBuilder("test").build(store); RecordId a = writer.writeString("test"); writer.flush();
