Am 21.09.2011 um 22:35 schrieb Junio C Hamano:
> That's a tad old master you seem to have.
Up until now I only followed the github clone, but that seems to be dated. Since kernel.org is still down, I'll now follow the google code clone.
Am 21.09.2011 um 22:35 schrieb Junio C Hamano:
>> Am 21.09.2011 um 14:24 schrieb Junio C Hamano:
>>>> $ git log --numstat 48a07e7e533f507228e8d1c99d4d48e175e14260
>>>> [...]
>>>> 11 10 src/java/voldemort/server/storage/StorageService.java
>>>
>>> Didn't we update it this already? I seem to get 10/9 here not 11/10.
>>
>> Current 'maint' (cd2b8ae9), 'master' (4b5eac7f)...
>
> Strangely, bisection points at 27af01d5523, which was supposed to be only
> about performance and never about correctness. There is something fishy
> going on....
I also did some tests, and besides --numstat also git show sometimes show different patches in comparison to older git versions. The last version with the "old" git show output is 1.7.7.rc0 and the first version with the "new" git show output is 1.7.7.rc1.
with git version 1.7.7.rc0:
$ git show 679e1d5cd007a0a9cb2813bd155622d7a1e904bd :
[...]
diff --git a/src/java/voldemort/store/stats/RequestCounter.java b/src/java/voldemort/store/stats/RequestCounter.java
index b012e98..c6be603 100644
--- a/src/java/voldemort/store/stats/RequestCounter.java
+++ b/src/java/voldemort/store/stats/RequestCounter.java
@@ -64,16 +64,21 @@ public class RequestCounter {
Accumulator accum = values.get();
long now = System.currentTimeMillis();
- if(now - accum.startTimeMS > durationMS) {
- Accumulator newWithTotal = accum.newWithTotal();
- values.set(newWithTotal);
-
- /*
- * try to set. if we fail, then someone else set it, so just keep going
- */
- if(values.compareAndSet(accum, newWithTotal)) {
- return newWithTotal;
- }
+ /*
+ * if still in the window, just return it
+ */
+ if(now - accum.startTimeMS <= durationMS) {
+ return accum;
+ }
+
+ /*
+ * try to set. if we fail, then someone else set it, so just return that new one
+ */
+
+ Accumulator newWithTotal = accum.newWithTotal();
+
+ if(values.compareAndSet(accum, newWithTotal)) {
+ return newWithTotal;
}
return values.get();
with git version 1.7.7.rc1:
$ git show 679e1d5cd007a0a9cb2813bd155622d7a1e904bd
[...]
diff --git a/src/java/voldemort/store/stats/RequestCounter.java b/src/java/voldemort/store/stats/RequestCounter.java
index b012e98..c6be603 100644
--- a/src/java/voldemort/store/stats/RequestCounter.java
+++ b/src/java/voldemort/store/stats/RequestCounter.java
@@ -64,16 +64,21 @@ public class RequestCounter {
Accumulator accum = values.get();
long now = System.currentTimeMillis();
- if(now - accum.startTimeMS > durationMS) {
- Accumulator newWithTotal = accum.newWithTotal();
- values.set(newWithTotal);
+ /*
+ * if still in the window, just return it
+ */
+ if(now - accum.startTimeMS <= durationMS) {
+ return accum;
+ }
- /*
- * try to set. if we fail, then someone else set it, so just keep going
- */
- if(values.compareAndSet(accum, newWithTotal)) {
- return newWithTotal;
- }
+ /*
+ * try to set. if we fail, then someone else set it, so just return that new one
+ */
+
+ Accumulator newWithTotal = accum.newWithTotal();
+
+ if(values.compareAndSet(accum, newWithTotal)) {
+ return newWithTotal;
}
return values.get();
The difference is, that now it's shown as two delete and two added hunks instead of one bigger delete and one bigger added hunk.
with git version 1.7.7.rc1:
$ git show 679e1d5cd007a0a9cb2813bd155622d7a1e904bd | diffstat
RequestCounter.java | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
with git version 1.7.7.rc0:
$ git show 679e1d5cd007a0a9cb2813bd155622d7a1e904bd | diffstat
RequestCounter.java | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
When used git version 1.7.7.rc1 I didn't observed any case where git show and git log --numstat mismatch. I'm only a little confused, that 'git show' yields different results, depending on the git version.
Greetings from Berlin
Alex--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html