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 md...@apache.org on 2018/11/06 11:54:10 UTC
svn commit: r1845902 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
SegmentCache.java file/FileStoreUtil.java file/GCJournal.java
file/Reclaimers.java file/TarRevisions.java
Author: mduerig
Date: Tue Nov 6 11:54:10 2018
New Revision: 1845902
URL: http://svn.apache.org/viewvc?rev=1845902&view=rev
Log:
@trivial: broken Javadoc links
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreUtil.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java?rev=1845902&r1=1845901&r2=1845902&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java Tue Nov 6 11:54:10 2018
@@ -42,9 +42,9 @@ import org.jetbrains.annotations.NotNull
* SegmentId#isBulkSegmentId() bulk} segments.
* <p>
* Conceptually this cache serves as a 2nd level cache for segments. The 1st
- * level cache is implemented by memoising the segment in its id (see {@link
+ * level cache is implemented by memoising the segment in its id (see {@code
* SegmentId#segment}. Every time an segment is evicted from this cache the
- * memoised segment is discarded (see {@link SegmentId#onAccess}.
+ * memoised segment is discarded (see {@code SegmentId#onAccess}.
*/
public abstract class SegmentCache {
@@ -105,7 +105,7 @@ public abstract class SegmentCache {
/**
* Record a hit in this cache's underlying statistics.
*
- * @see SegmentId#onAccess
+ * See {@code SegmentId#onAccess}
*/
public abstract void recordHit();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreUtil.java?rev=1845902&r1=1845901&r2=1845902&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreUtil.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreUtil.java Tue Nov 6 11:54:10 2018
@@ -40,7 +40,7 @@ class FileStoreUtil {
*
* @param store An instance of {@link SegmentStore}.
* @param idProvider The {@code SegmentIdProvider} of the {@code store}
- * @param journal Path to the journal file.
+ * @param journalFile The journal of the {@code store}
* @return An instance of {@link RecordId}, or {@code null} if none could be
* found.
* @throws IOException If an I/O error occurs.
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java?rev=1845902&r1=1845901&r2=1845902&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java Tue Nov 6 11:54:10 2018
@@ -29,9 +29,8 @@ import java.util.List;
import com.google.common.base.Joiner;
import org.apache.jackrabbit.oak.segment.RecordId;
-import org.apache.jackrabbit.oak.segment.spi.persistence.GCJournalFile;
import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
-import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
+import org.apache.jackrabbit.oak.segment.spi.persistence.GCJournalFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
@@ -39,7 +38,7 @@ import org.slf4j.LoggerFactory;
/**
* Persists the repository size and the reclaimed size following a cleanup
- * operation in the {@link TarPersistence#GC_JOURNAL gc journal} file with the format:
+ * operation in the {@code gc.log} file with the format:
* 'repoSize, reclaimedSize, timestamp, gc generation, gc full generation (since Oak 1.8),
* number of nodes compacted, root id (since Oak 1.8)'.
*/
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java?rev=1845902&r1=1845901&r2=1845902&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java Tue Nov 6 11:54:10 2018
@@ -51,7 +51,7 @@ class Reclaimers {
* past wrt. {@code referenceGeneration} <em>and</em> the segment is not in the same tail as
* segments of the {@code referenceGeneration}. A segment is in the same tail as another segment
* if it is a {@link GCGeneration#isCompacted() compacted segment} <em>and</em> both segments have
- * the same {@link GCGeneration#fullGeneration full generation}.
+ * the same {@code full generation}.
*
* @param lastGCType type of the most recent GC operation. {@link GCType#FULL} if unknown.
* @param referenceGeneration generation used as reference for determining the age of other segments.
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java?rev=1845902&r1=1845901&r2=1845902&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java Tue Nov 6 11:54:10 2018
@@ -38,11 +38,10 @@ import com.google.common.base.Supplier;
import org.apache.jackrabbit.oak.segment.RecordId;
import org.apache.jackrabbit.oak.segment.Revisions;
import org.apache.jackrabbit.oak.segment.SegmentIdProvider;
+import org.apache.jackrabbit.oak.segment.SegmentStore;
import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFile;
import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileWriter;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
-import org.apache.jackrabbit.oak.segment.SegmentStore;
-import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
@@ -50,7 +49,7 @@ import org.slf4j.LoggerFactory;
/**
* This implementation of {@code Revisions} is backed by a
- * {@link TarPersistence#JOURNAL_FILE_NAME journal} file where the current head is persisted
+ * {@link JournalFile journal} file where the current head is persisted
* by calling {@link #tryFlush(Flusher)}.
* <p>
* The {@link #setHead(Function, Option...)} method supports a timeout