@ -43,6 +43,9 @@
* /
* /
package org.eclipse.jgit.storage.file ;
package org.eclipse.jgit.storage.file ;
import static org.eclipse.jgit.storage.pack.PackExt.BITMAP_INDEX ;
import static org.eclipse.jgit.storage.pack.PackExt.INDEX ;
import java.io.File ;
import java.io.File ;
import java.io.FileOutputStream ;
import java.io.FileOutputStream ;
import java.io.IOException ;
import java.io.IOException ;
@ -54,6 +57,7 @@ import java.text.ParseException;
import java.util.ArrayList ;
import java.util.ArrayList ;
import java.util.Collection ;
import java.util.Collection ;
import java.util.Collections ;
import java.util.Collections ;
import java.util.Comparator ;
import java.util.Date ;
import java.util.Date ;
import java.util.HashMap ;
import java.util.HashMap ;
import java.util.HashSet ;
import java.util.HashSet ;
@ -63,6 +67,7 @@ import java.util.List;
import java.util.Map ;
import java.util.Map ;
import java.util.Map.Entry ;
import java.util.Map.Entry ;
import java.util.Set ;
import java.util.Set ;
import java.util.TreeMap ;
import org.eclipse.jgit.dircache.DirCacheIterator ;
import org.eclipse.jgit.dircache.DirCacheIterator ;
import org.eclipse.jgit.errors.CorruptObjectException ;
import org.eclipse.jgit.errors.CorruptObjectException ;
@ -83,6 +88,7 @@ import org.eclipse.jgit.lib.RefDatabase;
import org.eclipse.jgit.revwalk.ObjectWalk ;
import org.eclipse.jgit.revwalk.ObjectWalk ;
import org.eclipse.jgit.revwalk.RevObject ;
import org.eclipse.jgit.revwalk.RevObject ;
import org.eclipse.jgit.revwalk.RevWalk ;
import org.eclipse.jgit.revwalk.RevWalk ;
import org.eclipse.jgit.storage.pack.PackExt ;
import org.eclipse.jgit.storage.pack.PackWriter ;
import org.eclipse.jgit.storage.pack.PackWriter ;
import org.eclipse.jgit.storage.pack.PackWriter.ObjectIdSet ;
import org.eclipse.jgit.storage.pack.PackWriter.ObjectIdSet ;
import org.eclipse.jgit.treewalk.TreeWalk ;
import org.eclipse.jgit.treewalk.TreeWalk ;
@ -192,8 +198,10 @@ public class GC {
if ( ! oldPack . shouldBeKept ( ) ) {
if ( ! oldPack . shouldBeKept ( ) ) {
oldPack . close ( ) ;
oldPack . close ( ) ;
FileUtils . delete ( nameFor ( oldName , ".pack" ) , deleteOptions ) ; //$NON-NLS-1$
for ( PackExt ext : PackExt . values ( ) ) {
FileUtils . delete ( nameFor ( oldName , ".idx" ) , deleteOptions ) ; //$NON-NLS-1$
File f = nameFor ( oldName , "." + ext . getExtension ( ) ) ; //$NON-NLS-1$
FileUtils . delete ( f , deleteOptions ) ;
}
}
}
}
}
// close the complete object database. Thats my only chance to force
// close the complete object database. Thats my only chance to force
@ -636,7 +644,22 @@ public class GC {
Set < ? extends ObjectId > have , Set < ObjectId > tagTargets ,
Set < ? extends ObjectId > have , Set < ObjectId > tagTargets ,
List < ObjectIdSet > excludeObjects ) throws IOException {
List < ObjectIdSet > excludeObjects ) throws IOException {
File tmpPack = null ;
File tmpPack = null ;
File tmpIdx = null ;
Map < PackExt , File > tmpExts = new TreeMap < PackExt , File > (
new Comparator < PackExt > ( ) {
public int compare ( PackExt o1 , PackExt o2 ) {
// INDEX entries must be returned last, so the pack
// scanner does pick up the new pack until all the
// PackExt entries have been written.
if ( o1 = = o2 )
return 0 ;
if ( o1 = = PackExt . INDEX )
return 1 ;
if ( o2 = = PackExt . INDEX )
return - 1 ;
return Integer . signum ( o1 . hashCode ( ) - o2 . hashCode ( ) ) ;
}
} ) ;
PackWriter pw = new PackWriter ( repo ) ;
PackWriter pw = new PackWriter ( repo ) ;
try {
try {
// prepare the PackWriter
// prepare the PackWriter
@ -655,9 +678,10 @@ public class GC {
String id = pw . computeName ( ) . getName ( ) ;
String id = pw . computeName ( ) . getName ( ) ;
File packdir = new File ( repo . getObjectsDirectory ( ) , "pack" ) ; //$NON-NLS-1$
File packdir = new File ( repo . getObjectsDirectory ( ) , "pack" ) ; //$NON-NLS-1$
tmpPack = File . createTempFile ( "gc_" , ".pack_tmp" , packdir ) ; //$NON-NLS-1$ //$NON-NLS-2$
tmpPack = File . createTempFile ( "gc_" , ".pack_tmp" , packdir ) ; //$NON-NLS-1$ //$NON-NLS-2$
tmpIdx = new File ( packdir , tmpPack . getName ( ) . substring ( 0 ,
final String tmpBase = tmpPack . getName ( )
tmpPack . getName ( ) . lastIndexOf ( '.' ) )
. substring ( 0 , tmpPack . getName ( ) . lastIndexOf ( '.' ) ) ;
+ ".idx_tmp" ) ; //$NON-NLS-1$
File tmpIdx = new File ( packdir , tmpBase + ".idx_tmp" ) ; //$NON-NLS-1$
tmpExts . put ( INDEX , tmpIdx ) ;
if ( ! tmpIdx . createNewFile ( ) )
if ( ! tmpIdx . createNewFile ( ) )
throw new IOException ( MessageFormat . format (
throw new IOException ( MessageFormat . format (
@ -687,38 +711,70 @@ public class GC {
idxChannel . close ( ) ;
idxChannel . close ( ) ;
}
}
if ( pw . prepareBitmapIndex ( pm ) ) {
File tmpBitmapIdx = new File ( packdir , tmpBase + ".bitmap_tmp" ) ; //$NON-NLS-1$
tmpExts . put ( BITMAP_INDEX , tmpBitmapIdx ) ;
if ( ! tmpBitmapIdx . createNewFile ( ) )
throw new IOException ( MessageFormat . format (
JGitText . get ( ) . cannotCreateIndexfile ,
tmpBitmapIdx . getPath ( ) ) ) ;
idxChannel = new FileOutputStream ( tmpBitmapIdx ) . getChannel ( ) ;
idxStream = Channels . newOutputStream ( idxChannel ) ;
try {
pw . writeBitmapIndex ( idxStream ) ;
} finally {
idxChannel . force ( true ) ;
idxStream . close ( ) ;
idxChannel . close ( ) ;
}
}
// rename the temporary files to real files
// rename the temporary files to real files
File realPack = nameFor ( id , ".pack" ) ; //$NON-NLS-1$
File realPack = nameFor ( id , ".pack" ) ; //$NON-NLS-1$
tmpPack . setReadOnly ( ) ;
tmpPack . setReadOnly ( ) ;
File realIdx = nameFor ( id , ".idx" ) ; //$NON-NLS-1$
realIdx . setReadOnly ( ) ;
boolean delete = true ;
boolean delete = true ;
try {
try {
if ( ! tmpPack . renameTo ( realPack ) )
if ( ! tmpPack . renameTo ( realPack ) )
return null ;
return null ;
delete = false ;
delete = false ;
if ( ! tmpIdx . renameTo ( realIdx ) ) {
for ( Map . Entry < PackExt , File > tmpEntry : tmpExts . entrySet ( ) ) {
File newIdx = new File ( realIdx . getParentFile ( ) ,
File tmpExt = tmpEntry . getValue ( ) ;
realIdx . getName ( ) + ".new" ) ; //$NON-NLS-1$
tmpExt . setReadOnly ( ) ;
if ( ! tmpIdx . renameTo ( newIdx ) )
newIdx = tmpIdx ;
File realExt = nameFor (
throw new IOException ( MessageFormat . format (
id , "." + tmpEntry . getKey ( ) . getExtension ( ) ) ; //$NON-NLS-1$
JGitText . get ( ) . panicCantRenameIndexFile , newIdx ,
if ( ! tmpExt . renameTo ( realExt ) ) {
realIdx ) ) ;
File newExt = new File ( realExt . getParentFile ( ) ,
realExt . getName ( ) + ".new" ) ; //$NON-NLS-1$
if ( ! tmpExt . renameTo ( newExt ) )
newExt = tmpExt ;
throw new IOException ( MessageFormat . format (
JGitText . get ( ) . panicCantRenameIndexFile , newExt ,
realExt ) ) ;
}
}
}
} finally {
} finally {
if ( delete & & tmpPack . exists ( ) )
if ( delete ) {
tmpPack . delete ( ) ;
if ( tmpPack . exists ( ) )
if ( delete & & tmpIdx . exists ( ) )
tmpPack . delete ( ) ;
tmpIdx . delete ( ) ;
for ( File tmpExt : tmpExts . values ( ) ) {
if ( tmpExt . exists ( ) )
tmpExt . delete ( ) ;
}
}
}
}
return repo . getObjectDatabase ( ) . openPack ( realPack ) ;
return repo . getObjectDatabase ( ) . openPack ( realPack ) ;
} finally {
} finally {
pw . release ( ) ;
pw . release ( ) ;
if ( tmpPack ! = null & & tmpPack . exists ( ) )
if ( tmpPack ! = null & & tmpPack . exists ( ) )
tmpPack . delete ( ) ;
tmpPack . delete ( ) ;
if ( tmpIdx ! = null & & tmpIdx . exists ( ) )
for ( File tmpExt : tmpExts . values ( ) ) {
tmpIdx . delete ( ) ;
if ( tmpExt . exists ( ) )
tmpExt . delete ( ) ;
}
}
}
}
}