motiejus
/
jgit
1
Fork 0
Code Releases Activity

Correctly classify the compressing objects phase 

Searching for reuse candidates should be fast compared to actually
doing delta compression.  So pull the progress monitor out of this
phase and rename it back to identify the compressing objects state.

Change-Id: I5eb80919f21c1251e0e3420ff7774126f1f79b27
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-07-09 08:04:06 -07:00
parent 85b7a53d52
commit 4569d77e13
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
View File

@ -122,12 +122,11 @@ public class PackWriter {
public static final String COUNTING_OBJECTS_PROGRESS = JGitText.get().countingObjects; public static final String COUNTING_OBJECTS_PROGRESS = JGitText.get().countingObjects;
/** /**
* Title of {@link ProgressMonitor} task used during searching for objects * Title of {@link ProgressMonitor} task used during compression.
* reuse or delta reuse.
* *
* @see #writePack(ProgressMonitor, ProgressMonitor, OutputStream) * @see #writePack(ProgressMonitor, ProgressMonitor, OutputStream)
*/ */
public static final String SEARCHING_REUSE_PROGRESS = JGitText.get().compressingObjects; public static final String COMPRESSING_OBJECTS_PROGRESS = JGitText.get().compressingObjects;
/** /**
* Title of {@link ProgressMonitor} task used during writing out pack * Title of {@link ProgressMonitor} task used during writing out pack
@ -686,7 +685,7 @@ private List<ObjectToPack> sortByName() {
* <p> * <p>
* At first, this method collects and sorts objects to pack, then deltas * At first, this method collects and sorts objects to pack, then deltas
* search is performed if set up accordingly, finally pack stream is * search is performed if set up accordingly, finally pack stream is
* written. {@link ProgressMonitor} tasks {@value #SEARCHING_REUSE_PROGRESS} * written. {@link ProgressMonitor} tasks {@value #COMPRESSING_OBJECTS_PROGRESS}
* (only if reuseDeltas or reuseObjects is enabled) and * (only if reuseDeltas or reuseObjects is enabled) and
* {@value #WRITING_OBJECTS_PROGRESS} are updated during packing. * {@value #WRITING_OBJECTS_PROGRESS} are updated during packing.
* </p> * </p>
@ -716,7 +715,7 @@ public void writePack(ProgressMonitor compressMonitor,
writeMonitor = NullProgressMonitor.INSTANCE; writeMonitor = NullProgressMonitor.INSTANCE;
if ((reuseDeltas || reuseObjects) && reuseSupport != null) if ((reuseDeltas || reuseObjects) && reuseSupport != null)
searchForReuse(compressMonitor); searchForReuse();
final PackOutputStream out = new PackOutputStream(writeMonitor, final PackOutputStream out = new PackOutputStream(writeMonitor,
packStream, isDeltaBaseAsOffset()); packStream, isDeltaBaseAsOffset());
@ -739,19 +738,11 @@ public void release() {
} }
} }
private void searchForReuse(ProgressMonitor compressMonitor) private void searchForReuse() throws IOException {
throws IOException {
compressMonitor.beginTask(SEARCHING_REUSE_PROGRESS, getObjectsNumber());
for (List<ObjectToPack> list : objectsLists) { for (List<ObjectToPack> list : objectsLists) {
for (ObjectToPack otp : list) { for (ObjectToPack otp : list)
if (compressMonitor.isCancelled())
throw new IOException(
JGitText.get().packingCancelledDuringObjectsWriting);
reuseSupport.selectObjectRepresentation(this, otp); reuseSupport.selectObjectRepresentation(this, otp);
compressMonitor.update(1);
}
} }
compressMonitor.endTask();
} }
private void writeObjects(ProgressMonitor writeMonitor, PackOutputStream out) private void writeObjects(ProgressMonitor writeMonitor, PackOutputStream out)