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 2017/08/11 15:31:22 UTC
svn commit: r1804806 - in /jackrabbit/oak/trunk/oak-segment-tar/src:
main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/
test/java/org/apache/jackrabbit/oak/segment/
test/java/org/apache/jackrabbit/oak/segment/file/
test/java/org/apache/jack...
Author: mduerig
Date: Fri Aug 11 15:31:22 2017
New Revision: 1804806
URL: http://svn.apache.org/viewvc?rev=1804806&view=rev
Log:
@Trivial reword references to "tail generation" and "tail flag" to "generation" and "compacted flag"
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/GcJournalTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java?rev=1804806&r1=1804805&r2=1804806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java Fri Aug 11 15:31:22 2017
@@ -100,13 +100,13 @@ public class BinaryReferencesIndexWriter
// this entry, after the optional padding.
for (Map<UUID, Set<String>> segmentToReferences : entries.values()) {
- // 4 bytes per generation to store the full generation number.
+ // 4 bytes per generation to store the generation number.
binaryReferenceSize += 4;
- // 4 bytes per generation to store the tail generation number.
+ // 4 bytes per generation to store the full generation number.
binaryReferenceSize += 4;
- // 1 byte per generation to store the "tail" flag.
+ // 1 byte per generation to store the "compacted" flag.
binaryReferenceSize += 1;
// 4 bytes per generation to store the number of segments.
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java?rev=1804806&r1=1804805&r2=1804806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java Fri Aug 11 15:31:22 2017
@@ -1360,17 +1360,17 @@ public class CompactionAndCleanupIT {
traverse(fileStore.getHead());
// Create a tail head state on top of the previous full state. This
- // increments the tail generation, but leaves the full generation
+ // increments the generation, but leaves the full generation
// untouched.
fileStore.tailGC();
traverse(fileStore.getHead());
// Create a tail state on top of the previous tail state. This
- // increments the tail generation, but leaves the full generation
+ // increments the generation, but leaves the full generation
// untouched. This brings this generations two generations away from
// the latest full head state. Still, the full head state will not
- // be deleted because doing so would geenrated an invalid repository
+ // be deleted because doing so would generate an invalid repository
// at risk of SegmentNotFoundException.
fileStore.tailGC();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/GcJournalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/GcJournalTest.java?rev=1804806&r1=1804805&r2=1804806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/GcJournalTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/GcJournalTest.java Fri Aug 11 15:31:22 2017
@@ -92,7 +92,7 @@ public class GcJournalTest {
}
@Test
- public void testGCGenerationTailFlagCleared() throws Exception {
+ public void testGCGenerationCompactedFlagCleared() throws Exception {
GCJournal out = new GCJournal(segmentFolder.getRoot());
out.persist(1, 100, newGCGeneration(1, 2, true), 50, RecordId.NULL.toString());
GCJournal in = new GCJournal(segmentFolder.getRoot());
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java?rev=1804806&r1=1804805&r2=1804806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java Fri Aug 11 15:31:22 2017
@@ -95,7 +95,7 @@ public class TarFileTest {
}
@Test
- public void testGCGenerationIsTailFlagNotErased() throws Exception {
+ public void testGCGenerationIsCompactedFlagNotErased() throws Exception {
UUID id = UUID.randomUUID();
long msb = id.getMostSignificantBits();
long lsb = id.getLeastSignificantBits();