Skip to content
Snippets Groups Projects
Commit c6e8edb5 authored by Matthias Sohn's avatar Matthias Sohn Committed by Gerrit Code Review
Browse files

Merge "Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmap"

parents 8f05f61c ce3a7ca3
No related branches found
No related tags found
No related merge requests found
......@@ -33,18 +33,18 @@
import org.eclipse.jgit.util.FileUtils;
import org.junit.Test;
public class GcNumberOfPackFilesAfterBitmapStatisticsTest extends GcTestCase {
public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase {
@Test
public void testShouldReportZeroObjectsForInitializedRepo()
throws IOException {
assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap);
assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap);
}
@Test
public void testShouldReportAllPackFilesWhenNoGcWasPerformed()
throws Exception {
packAndPrune();
long result = gc.getStatistics().numberOfPackFilesAfterBitmap;
long result = gc.getStatistics().numberOfPackFilesSinceBitmap;
assertEquals(repo.getObjectDatabase().getPacks().size(), result);
}
......@@ -55,11 +55,11 @@ public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception {
addCommit(null);
gc.gc().get();
assertEquals(1L, repositoryBitmapFiles());
assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap);
assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap);
}
@Test
public void testShouldReportNewObjectsAfterGcWhenRepositoryProgresses()
public void testShouldReportNewObjectsSinceGcWhenRepositoryProgresses()
throws Exception {
// commit & gc
RevCommit parent = addCommit(null);
......@@ -70,7 +70,7 @@ public void testShouldReportNewObjectsAfterGcWhenRepositoryProgresses()
addCommit(parent);
packAndPrune();
assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap);
assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap);
}
@Test
......@@ -90,7 +90,7 @@ public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresse
addCommit(parent);
packAndPrune();
assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap);
assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap);
}
private void packAndPrune() throws Exception {
......
......@@ -1512,7 +1512,7 @@ public static class RepoStatistics {
* The number of pack files that were created after the last bitmap
* generation.
*/
public long numberOfPackFilesAfterBitmap;
public long numberOfPackFilesSinceBitmap;
/**
* The number of objects stored as loose objects.
......@@ -1549,8 +1549,8 @@ public String toString() {
final StringBuilder b = new StringBuilder();
b.append("numberOfPackedObjects=").append(numberOfPackedObjects); //$NON-NLS-1$
b.append(", numberOfPackFiles=").append(numberOfPackFiles); //$NON-NLS-1$
b.append(", numberOfPackFilesAfterBitmap=") //$NON-NLS-1$
.append(numberOfPackFilesAfterBitmap);
b.append(", numberOfPackFilesSinceBitmap=") //$NON-NLS-1$
.append(numberOfPackFilesSinceBitmap);
b.append(", numberOfLooseObjects=").append(numberOfLooseObjects); //$NON-NLS-1$
b.append(", numberOfLooseRefs=").append(numberOfLooseRefs); //$NON-NLS-1$
b.append(", numberOfPackedRefs=").append(numberOfPackedRefs); //$NON-NLS-1$
......@@ -1578,7 +1578,7 @@ public RepoStatistics getStatistics() throws IOException {
if (p.getBitmapIndex() != null)
ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount();
else
ret.numberOfPackFilesAfterBitmap++;
ret.numberOfPackFilesSinceBitmap++;
}
File objDir = repo.getObjectsDirectory();
String[] fanout = objDir.list();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment