diff options
| author | Shawn Pearce <spearce@spearce.org> | 2010-12-09 19:33:58 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-12-09 19:33:58 -0500 |
| commit | 93a7b2b24d5486b2033ba4b692906c6c758f46ad (patch) | |
| tree | 86577f37c95353d1bc69af6d37f3e6460261f73d | |
| parent | a3475fb664e82bbb92fd3a5ab8c9b6413fff224e (diff) | |
| parent | 941b3d8a8105333ccbc15e3b57574fce6da6f006 (diff) | |
| download | jgit-93a7b2b24d5486b2033ba4b692906c6c758f46ad.tar.gz jgit-93a7b2b24d5486b2033ba4b692906c6c758f46ad.zip | |
Merge "IndexPack: Remove blob-streaming size threshold"
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/IndexPackTest.java | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/IndexPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/IndexPackTest.java index 6015428d99..65929059ab 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/IndexPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/IndexPackTest.java @@ -166,7 +166,6 @@ public class IndexPackTest extends RepositoryTestCase { final byte[] raw = pack.toByteArray(); IndexPack ip = IndexPack.create(db, new ByteArrayInputStream(raw)); - ip.setStreamFileThreshold(1); ip.index(NullProgressMonitor.INSTANCE); ip.renameAndOpenPack(); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java index 8feb483fe2..bb9edc2669 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/IndexPack.java @@ -145,8 +145,6 @@ public class IndexPack { private final Repository repo; - private int streamFileThreshold; - /** * Object database used for loading existing objects */ @@ -244,7 +242,6 @@ public class IndexPack { public IndexPack(final Repository db, final InputStream src, final File dstBase) throws IOException { repo = db; - streamFileThreshold = 5 * (1 << 20); // A reasonable default for now. objectDatabase = db.getObjectDatabase().newCachedDatabase(); in = src; inflater = new InflaterStream(); @@ -268,10 +265,6 @@ public class IndexPack { } } - void setStreamFileThreshold(int sz) { - streamFileThreshold = sz; - } - /** * Set the pack index file format version this instance will create. * @@ -860,7 +853,7 @@ public class IndexPack { objectDigest.update((byte) 0); boolean checkContentLater = false; - if (type == Constants.OBJ_BLOB && sz >= streamFileThreshold) { + if (type == Constants.OBJ_BLOB) { InputStream inf = inflate(Source.INPUT, sz); long cnt = 0; while (cnt < sz) { |