Rename detection: Avoid repeated filespec population
In diffcore_rename, we assume that the blob contents in the filespec aren't required anymore after estimate_similarity has been called and thus we free it. But estimate_similarity might return early when the file sizes differ too much. In that case, cnt_data is never set and the next call to estimate_similarity will populate the filespec again, eventually rereading the same blob over and over again. To fix that, we first get the blob sizes and only when the blob contents are actually required, and when cnt_data will be set, the full filespec is populated, once. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Björn Steinbrink committed
Jan 20, 2009 at 16:59 UTC
885c716f0f039cfe100f5d761e1011085b43fbb8
1 file changed
+7
-2
diffcore-rename.c
+7
-2
@@ -153,9 +153,9 @@ static int estimate_similarity(struct diff_filespec *src,
153
* is a possible size - we really should have a flag to
154
* say whether the size is valid or not!)
155
*/
156
- if (!src->cnt_data && diff_populate_filespec(src, 0))
156
+ if (!src->cnt_data && diff_populate_filespec(src, 1))
157
return 0;
158
- if (!dst->cnt_data && diff_populate_filespec(dst, 0))
158
+ if (!dst->cnt_data && diff_populate_filespec(dst, 1))
159
return 0;
160
161
max_size = ((src->size > dst->size) ? src->size : dst->size);
@@ -173,6 +173,11 @@ static int estimate_similarity(struct diff_filespec *src,
173
if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
174
return 0;
175
176
+ if (!src->cnt_data && diff_populate_filespec(src, 0))
177
+ return 0;
178
+ if (!dst->cnt_data && diff_populate_filespec(dst, 0))
179
+ return 0;
180
+
181
delta_limit = (unsigned long)
182
(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
183
if (diffcore_count_changes(src, dst,