motiejus
/
jgit
1
Fork 0
Code Releases Activity

PackWriter: Rename getObjectsNumber to getObjectCount 

This better matches with PackFile and CachedPack's methods
that return the same value.

Change-Id: Idb9b7c71d2048dd2344a62c2cde20b4e34529ab7
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2011-03-14 07:09:41 -07:00
parent 65f9a6e58b
commit 7a9bf1e2e0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/PackWriterTest.java
View File

@ -133,7 +133,7 @@ public void testContructor() throws IOException {
assertEquals(false, writer.isDeltaBaseAsOffset()); assertEquals(false, writer.isDeltaBaseAsOffset());
assertEquals(true, config.isReuseDeltas()); assertEquals(true, config.isReuseDeltas());
assertEquals(true, config.isReuseObjects()); assertEquals(true, config.isReuseObjects());
assertEquals(0, writer.getObjectsNumber()); assertEquals(0, writer.getObjectCount());
} }
/** /**
@ -164,7 +164,7 @@ public void testModifySettings() {
public void testWriteEmptyPack1() throws IOException { public void testWriteEmptyPack1() throws IOException {
createVerifyOpenPack(EMPTY_LIST_OBJECT, EMPTY_LIST_OBJECT, false, false); createVerifyOpenPack(EMPTY_LIST_OBJECT, EMPTY_LIST_OBJECT, false, false);
assertEquals(0, writer.getObjectsNumber()); assertEquals(0, writer.getObjectCount());
assertEquals(0, pack.getObjectCount()); assertEquals(0, pack.getObjectCount());
assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", writer assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", writer
.computeName().name()); .computeName().name());
@ -180,7 +180,7 @@ public void testWriteEmptyPack1() throws IOException {
public void testWriteEmptyPack2() throws IOException { public void testWriteEmptyPack2() throws IOException {
createVerifyOpenPack(EMPTY_LIST_REVS); createVerifyOpenPack(EMPTY_LIST_REVS);
assertEquals(0, writer.getObjectsNumber()); assertEquals(0, writer.getObjectCount());
assertEquals(0, pack.getObjectCount()); assertEquals(0, pack.getObjectCount());
} }
@ -323,7 +323,7 @@ public void testWritePack3() throws MissingObjectException, IOException {
createVerifyOpenPack(Arrays.asList(forcedOrderRevs)); createVerifyOpenPack(Arrays.asList(forcedOrderRevs));
assertEquals(forcedOrder.length, writer.getObjectsNumber()); assertEquals(forcedOrder.length, writer.getObjectCount());
verifyObjectsOrder(forcedOrder); verifyObjectsOrder(forcedOrder);
assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer
.computeName().name()); .computeName().name());
@ -466,7 +466,7 @@ private void writeVerifyPack1() throws IOException {
ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259"), ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259"),
ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3") }; ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3") };
assertEquals(expectedOrder.length, writer.getObjectsNumber()); assertEquals(expectedOrder.length, writer.getObjectCount());
verifyObjectsOrder(expectedOrder); verifyObjectsOrder(expectedOrder);
assertEquals("34be9032ac282b11fa9babdc2b2a93ca996c9c2f", writer assertEquals("34be9032ac282b11fa9babdc2b2a93ca996c9c2f", writer
.computeName().name()); .computeName().name());
@ -495,7 +495,7 @@ private void writeVerifyPack2(boolean deltaReuse) throws IOException {
expectedOrder[4] = expectedOrder[5]; expectedOrder[4] = expectedOrder[5];
expectedOrder[5] = temp; expectedOrder[5] = temp;
} }
assertEquals(expectedOrder.length, writer.getObjectsNumber()); assertEquals(expectedOrder.length, writer.getObjectCount());
verifyObjectsOrder(expectedOrder); verifyObjectsOrder(expectedOrder);
assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer
.computeName().name()); .computeName().name());
@ -514,7 +514,7 @@ private void writeVerifyPack4(final boolean thin) throws IOException {
ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"),
ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"),
ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") };
assertEquals(writtenObjects.length, writer.getObjectsNumber()); assertEquals(writtenObjects.length, writer.getObjectCount());
ObjectId expectedObjects[]; ObjectId expectedObjects[];
if (thin) { if (thin) {
expectedObjects = new ObjectId[4]; expectedObjects = new ObjectId[4];
@ -550,7 +550,7 @@ private void createVerifyOpenPack(final List<RevObject> objectSource)
NullProgressMonitor m = NullProgressMonitor.INSTANCE; NullProgressMonitor m = NullProgressMonitor.INSTANCE;
writer = new PackWriter(config, db.newObjectReader()); writer = new PackWriter(config, db.newObjectReader());
writer.preparePack(objectSource.iterator()); writer.preparePack(objectSource.iterator());
assertEquals(objectSource.size(), writer.getObjectsNumber()); assertEquals(objectSource.size(), writer.getObjectCount());
writer.writePack(m, m, os); writer.writePack(m, m, os);
writer.release(); writer.release();
verifyOpenPack(false); verifyOpenPack(false);

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

@ -405,7 +405,7 @@ public void setTagTargets(Set<ObjectId> objects) {
* @throws IOException * @throws IOException
* a cached pack cannot supply its object count. * a cached pack cannot supply its object count.
*/ */
public long getObjectsNumber() throws IOException { public long getObjectCount() throws IOException {
if (stats.totalObjects == 0) { if (stats.totalObjects == 0) {
long objCnt = 0; long objCnt = 0;
for (List<ObjectToPack> list : objectsLists) for (List<ObjectToPack> list : objectsLists)
@ -645,7 +645,7 @@ public void writePack(ProgressMonitor compressMonitor,
final PackOutputStream out = new PackOutputStream(writeMonitor, final PackOutputStream out = new PackOutputStream(writeMonitor,
packStream, this); packStream, this);
long objCnt = getObjectsNumber(); long objCnt = getObjectCount();
stats.totalObjects = objCnt; stats.totalObjects = objCnt;
writeMonitor.beginTask(JGitText.get().writingObjects, (int) objCnt); writeMonitor.beginTask(JGitText.get().writingObjects, (int) objCnt);
long writeStart = System.currentTimeMillis(); long writeStart = System.currentTimeMillis();

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java
View File

@ -230,7 +230,7 @@ private void sendpack(final List<RemoteRefUpdate> updates,
// be an empty pack, as the remote has all objects it // be an empty pack, as the remote has all objects it
// needs to complete this change. // needs to complete this change.
// //
if (writer.getObjectsNumber() == 0) if (writer.getObjectCount() == 0)
return; return;
packNames = new LinkedHashMap<String, String>(); packNames = new LinkedHashMap<String, String>();