comparison tests/test-setdiscovery.t @ 14624:f03c82d1f50a

setdiscovery: batch heads and known(ownheads) This means that we now discover both subset conditions (local<remote and remote<local) in a single roundtrip without ever constructing an actual sample (which takes a bit of client CPU).
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Tue, 14 Jun 2011 22:58:00 +0200
parents cb98fed52495
children 65f8f98aa924
comparison
equal deleted inserted replaced
14623:e7c9fdbbb902 14624:f03c82d1f50a
42 42
43 % -- a -> b set 43 % -- a -> b set
44 comparing with b 44 comparing with b
45 query 1; heads 45 query 1; heads
46 searching for changes 46 searching for changes
47 taking initial sample 47 all local heads known remotely
48 searching: 2 queries
49 query 2; still undecided: 4, sample size is: 4
50 2 total queries
51 common heads: b5714e113bc0 01241442b3c2 48 common heads: b5714e113bc0 01241442b3c2
52 local is subset 49 local is subset
53 50
54 % -- b -> a tree 51 % -- b -> a tree
55 comparing with a 52 comparing with a
81 78
82 % -- a -> b set 79 % -- a -> b set
83 comparing with b 80 comparing with b
84 query 1; heads 81 query 1; heads
85 searching for changes 82 searching for changes
86 taking quick initial sample 83 taking initial sample
87 searching: 2 queries 84 searching: 2 queries
88 query 2; still undecided: 35, sample size is: 35 85 query 2; still undecided: 29, sample size is: 29
89 2 total queries 86 2 total queries
90 common heads: bebd167eb94d 87 common heads: bebd167eb94d
91 88
92 % -- b -> a tree 89 % -- b -> a tree
93 comparing with a 90 comparing with a
99 comparing with a 96 comparing with a
100 query 1; heads 97 query 1; heads
101 searching for changes 98 searching for changes
102 taking initial sample 99 taking initial sample
103 searching: 2 queries 100 searching: 2 queries
104 query 2; still undecided: 3, sample size is: 3 101 query 2; still undecided: 2, sample size is: 2
105 2 total queries 102 2 total queries
106 common heads: bebd167eb94d 103 common heads: bebd167eb94d
107 104
108 105
109 Both sides many new with stub: 106 Both sides many new with stub:
120 117
121 % -- a -> b set 118 % -- a -> b set
122 comparing with b 119 comparing with b
123 query 1; heads 120 query 1; heads
124 searching for changes 121 searching for changes
125 taking quick initial sample 122 taking initial sample
126 searching: 2 queries 123 searching: 2 queries
127 query 2; still undecided: 34, sample size is: 34 124 query 2; still undecided: 29, sample size is: 29
128 2 total queries 125 2 total queries
129 common heads: 2dc09a01254d 126 common heads: 2dc09a01254d
130 127
131 % -- b -> a tree 128 % -- b -> a tree
132 comparing with a 129 comparing with a
138 comparing with a 135 comparing with a
139 query 1; heads 136 query 1; heads
140 searching for changes 137 searching for changes
141 taking initial sample 138 taking initial sample
142 searching: 2 queries 139 searching: 2 queries
143 query 2; still undecided: 30, sample size is: 30 140 query 2; still undecided: 29, sample size is: 29
144 2 total queries 141 2 total queries
145 common heads: 2dc09a01254d 142 common heads: 2dc09a01254d
146 143
147 144
148 Both many new: 145 Both many new:
161 comparing with b 158 comparing with b
162 query 1; heads 159 query 1; heads
163 searching for changes 160 searching for changes
164 taking quick initial sample 161 taking quick initial sample
165 searching: 2 queries 162 searching: 2 queries
166 query 2; still undecided: 32, sample size is: 32 163 query 2; still undecided: 31, sample size is: 31
167 2 total queries 164 2 total queries
168 common heads: 66f7d451a68b 165 common heads: 66f7d451a68b
169 166
170 % -- b -> a tree 167 % -- b -> a tree
171 comparing with a 168 comparing with a
172 searching for changes 169 searching for changes
173 unpruned common: 66f7d451a68b 170 unpruned common: 66f7d451a68b
174 common heads: 66f7d451a68b 171 common heads: 66f7d451a68b
175 172
176 % -- b -> a set 173 % -- b -> a set
177 comparing with a 174 comparing with a
178 query 1; heads 175 query 1; heads
179 searching for changes 176 searching for changes
180 taking quick initial sample 177 taking quick initial sample
181 searching: 2 queries 178 searching: 2 queries
182 query 2; still undecided: 32, sample size is: 32 179 query 2; still undecided: 31, sample size is: 31
183 2 total queries 180 2 total queries
184 common heads: 66f7d451a68b 181 common heads: 66f7d451a68b
185 182
186 183
187 Both many new skewed: 184 Both many new skewed:
200 comparing with b 197 comparing with b
201 query 1; heads 198 query 1; heads
202 searching for changes 199 searching for changes
203 taking quick initial sample 200 taking quick initial sample
204 searching: 2 queries 201 searching: 2 queries
205 query 2; still undecided: 52, sample size is: 52 202 query 2; still undecided: 51, sample size is: 51
206 2 total queries 203 2 total queries
207 common heads: 66f7d451a68b 204 common heads: 66f7d451a68b
208 205
209 % -- b -> a tree 206 % -- b -> a tree
210 comparing with a 207 comparing with a
211 searching for changes 208 searching for changes
212 unpruned common: 66f7d451a68b 209 unpruned common: 66f7d451a68b
213 common heads: 66f7d451a68b 210 common heads: 66f7d451a68b
214 211
215 % -- b -> a set 212 % -- b -> a set
216 comparing with a 213 comparing with a
217 query 1; heads 214 query 1; heads
218 searching for changes 215 searching for changes
219 taking quick initial sample 216 taking quick initial sample
220 searching: 2 queries 217 searching: 2 queries
221 query 2; still undecided: 32, sample size is: 32 218 query 2; still undecided: 31, sample size is: 31
222 2 total queries 219 2 total queries
223 common heads: 66f7d451a68b 220 common heads: 66f7d451a68b
224 221
225 222
226 Both many new on top of long history: 223 Both many new on top of long history:
239 comparing with b 236 comparing with b
240 query 1; heads 237 query 1; heads
241 searching for changes 238 searching for changes
242 taking quick initial sample 239 taking quick initial sample
243 searching: 2 queries 240 searching: 2 queries
244 query 2; still undecided: 1050, sample size is: 11 241 query 2; still undecided: 1049, sample size is: 11
245 sampling from both directions 242 sampling from both directions
246 searching: 3 queries 243 searching: 3 queries
247 query 3; still undecided: 31, sample size is: 31 244 query 3; still undecided: 31, sample size is: 31
248 3 total queries 245 3 total queries
249 common heads: 7ead0cba2838 246 common heads: 7ead0cba2838
258 comparing with a 255 comparing with a
259 query 1; heads 256 query 1; heads
260 searching for changes 257 searching for changes
261 taking quick initial sample 258 taking quick initial sample
262 searching: 2 queries 259 searching: 2 queries
263 query 2; still undecided: 1030, sample size is: 11 260 query 2; still undecided: 1029, sample size is: 11
264 sampling from both directions 261 sampling from both directions
265 searching: 3 queries 262 searching: 3 queries
266 query 3; still undecided: 16, sample size is: 16 263 query 3; still undecided: 16, sample size is: 16
267 3 total queries 264 3 total queries
268 common heads: 7ead0cba2838 265 common heads: 7ead0cba2838