Align PackStatistics and DfsPackDescription list length
Without this the caller cannot tell which PackStatistics is for which pack file. Change-Id: Ifa530f8bc82459611ae694c0a0d111daec3e08f3 Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
This commit is contained in:
parent
7cd5d77ae3
commit
45837ff189
|
@ -486,7 +486,12 @@ public List<DfsPackDescription> getNewPacks() {
|
|||
return newPackDesc;
|
||||
}
|
||||
|
||||
/** @return statistics corresponding to the {@link #getNewPacks()}. */
|
||||
/**
|
||||
* @return statistics corresponding to the {@link #getNewPacks()}.
|
||||
*
|
||||
* <p>The elements can be null if the stat is not available for the pack
|
||||
* file.
|
||||
*/
|
||||
public List<PackStatistics> getNewPackStatistics() {
|
||||
return newPackStats;
|
||||
}
|
||||
|
@ -637,7 +642,6 @@ private DfsPackDescription writePack(PackSource source, PackWriter pw,
|
|||
ProgressMonitor pm, long estimatedPackSize) throws IOException {
|
||||
DfsPackDescription pack = repo.getObjectDatabase().newPack(source,
|
||||
estimatedPackSize);
|
||||
newPackDesc.add(pack);
|
||||
|
||||
if (source == GC && reftableConfig != null) {
|
||||
writeReftable(pack);
|
||||
|
@ -671,6 +675,7 @@ private DfsPackDescription writePack(PackSource source, PackWriter pw,
|
|||
PackStatistics stats = pw.getStatistics();
|
||||
pack.setPackStats(stats);
|
||||
pack.setLastModified(startTimeMillis);
|
||||
newPackDesc.add(pack);
|
||||
newPackStats.add(stats);
|
||||
newPackObj.add(pw.getObjectSet());
|
||||
return pack;
|
||||
|
@ -680,6 +685,7 @@ private void writeReftable() throws IOException {
|
|||
if (reftableConfig != null) {
|
||||
DfsPackDescription pack = objdb.newPack(GC);
|
||||
newPackDesc.add(pack);
|
||||
newPackStats.add(null);
|
||||
writeReftable(pack);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -350,9 +350,13 @@ public List<DfsPackDescription> getNewPacks() {
|
|||
: Collections.emptyList();
|
||||
}
|
||||
|
||||
/** @return statistics corresponding to the {@link #getNewPacks()}. */
|
||||
/**
|
||||
* @return statistics corresponding to the {@link #getNewPacks()}.
|
||||
*
|
||||
* <p>The element may be null if the stat is not available.
|
||||
*/
|
||||
public List<PackStatistics> getNewPackStatistics() {
|
||||
return newStats != null
|
||||
return outDesc != null
|
||||
? Collections.singletonList(newStats)
|
||||
: Collections.emptyList();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue