pack-objects: simplify "thin" pack.
There was a misguided logic to overly prefer using objects that we are not going to pack as the base object. This was unnecessary. It does not matter to the unpacking side where the base object is -- it matters more to make the resulting delta smaller. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 5, 2006 at 11:22 UTC
70ca1a3f854be0d3b429e66f1484f9ca73a79828
1 file changed
+11
-27
pack-objects.c
+11
-27
@@ -32,9 +32,6 @@ struct object_entry {
32
* be used as the base objectto delta huge
33
* objects against.
34
*/
35
- int based_on_preferred; /* current delta candidate is a preferred
36
- * one, or delta against a preferred one.
37
- */
35
};
36
37
/*
@@ -824,8 +821,6 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
821
{
822
struct object_entry *cur_entry = cur->entry;
823
struct object_entry *old_entry = old->entry;
827
- int old_preferred = (old_entry->preferred_base ||
828
- old_entry->based_on_preferred);
824
unsigned long size, oldsize, delta_size, sizediff;
825
long max_size;
826
void *delta_buf;
@@ -867,27 +862,8 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
862
* delete).
863
*/
864
max_size = size / 2 - 20;
870
- if (cur_entry->delta) {
871
- if (cur_entry->based_on_preferred) {
872
- if (old_preferred)
873
- max_size = cur_entry->delta_size-1;
874
- else
875
- /* trying with non-preferred one when we
876
- * already have a delta based on preferred
877
- * one is pointless.
878
- */
879
- return -1;
880
- }
881
- else if (!old_preferred)
882
- max_size = cur_entry->delta_size-1;
883
- else
884
- /* otherwise... even if delta with a
885
- * preferred one produces a bigger result than
886
- * what we currently have, which is based on a
887
- * non-preferred one, it is OK.
888
- */
889
- ;
890
- }
865
+ if (cur_entry->delta)
866
+ max_size = cur_entry->delta_size-1;
867
if (sizediff >= max_size)
868
return -1;
869
delta_buf = diff_delta(old->data, oldsize,
@@ -897,7 +873,6 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
873
cur_entry->delta = old_entry;
874
cur_entry->delta_size = delta_size;
875
cur_entry->depth = old_entry->depth + 1;
900
- cur_entry->based_on_preferred = old_preferred;
876
free(delta_buf);
877
return 0;
878
}
@@ -966,6 +941,15 @@ static void find_deltas(struct object_entry **list, int window, int depth)
941
if (try_delta(n, m, depth) < 0)
942
break;
943
}
944
+#if 0
945
+ /* if we made n a delta, and if n is already at max
946
+ * depth, leaving it in the window is pointless. we
947
+ * should evict it first.
948
+ * ... in theory only; somehow this makes things worse.
949
+ */
950
+ if (entry->delta && depth <= entry->depth)
951
+ continue;
952
+#endif
953
idx++;
954
if (idx >= window)
955
idx = 0;