You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2016/04/01 14:16:34 UTC
svn commit: r1737358 - in /jackrabbit/oak/trunk/oak-segment/src:
main/java/org/apache/jackrabbit/oak/plugins/segment/file/
test/java/org/apache/jackrabbit/oak/plugins/segment/file/
Author: chetanm
Date: Fri Apr 1 12:16:33 2016
New Revision: 1737358
URL: http://svn.apache.org/viewvc?rev=1737358&view=rev
Log:
OAK-4095 - Include timestamp in journal log entries
Added:
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java (with props)
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java
Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1737358&r1=1737357&r2=1737358&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Fri Apr 1 12:16:33 2016
@@ -814,7 +814,7 @@ public class FileStore implements Segmen
fileStoreLock.writeLock().lock();
try {
log.debug("TarMK journal update {} -> {}", before, after);
- journalFile.writeBytes(after.toString10() + " root\n");
+ journalFile.writeBytes(after.toString10() + " root " + System.currentTimeMillis()+"\n");
journalFile.getChannel().force(false);
persistedHead.set(after);
} finally {
Added: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java?rev=1737358&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java (added)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java Fri Apr 1 12:16:33 2016
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.segment.file;
+
+import java.io.File;
+import java.nio.charset.Charset;
+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.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import static org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class JournalEntryTest {
+
+ @Rule
+ public TemporaryFolder tempFolder = new TemporaryFolder();
+
+ @Test
+ public void timestampInJournalEntry() throws Exception{
+ FileStore fileStore = newFileStore(tempFolder.getRoot()).withMaxFileSize(5)
+ .withNoCache().withMemoryMapping(true).create();
+
+ SegmentNodeStore nodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create();
+
+ long startTime = System.currentTimeMillis();
+
+ for (int i = 0; i < 5; i++) {
+ NodeBuilder root = nodeStore.getRoot().builder();
+ root.child("c"+i);
+ nodeStore.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ fileStore.flush();
+ }
+
+ fileStore.close();
+
+ File journal = new File(tempFolder.getRoot(), "journal.log");
+ List<String> lines = Files.readLines(journal, Charset.defaultCharset());
+ assertFalse(lines.isEmpty());
+
+ String line = lines.get(0);
+ List<String> journalEntry = journalParts(line);
+ assertEquals(3, journalEntry.size());
+
+ long entryTime = Long.valueOf(journalEntry.get(2));
+ assertTrue(entryTime > startTime);
+
+ JournalReader jr = new JournalReader(journal);
+ assertEquals(journalParts(lines.get(lines.size() - 1)).get(0), jr.iterator().next());
+ }
+
+ private List<String> journalParts(String line){
+ return Splitter.on(' ').splitToList(line);
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalEntryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java?rev=1737358&r1=1737357&r2=1737358&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/JournalReaderTest.java Fri Apr 1 12:16:33 2016
@@ -58,7 +58,7 @@ public class JournalReaderTest {
@Test
public void testMultiple() throws IOException {
- JournalReader journalReader = createJournalReader("one 1\ntwo 2\nthree 3");
+ JournalReader journalReader = createJournalReader("one 1\ntwo 2\nthree 3 456");
try {
Iterator<String> journal = journalReader.iterator();
assertTrue(journal.hasNext());