-
-
Notifications
You must be signed in to change notification settings - Fork 17
/
conda_variant_priorization.patch
438 lines (426 loc) · 12.2 KB
/
conda_variant_priorization.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
diff --git a/src/conda.c b/src/conda.c
index 21ad6bfb..408a236a 100644
--- a/src/conda.c
+++ b/src/conda.c
@@ -134,7 +134,7 @@ solv_vercmp_conda(const char *s1, const char *q1, const char *s2, const char *q2
return -1;
if (s1p - s1 > s2p - s2)
return 1;
- r = s1p - s1 ? strncmp(s1, s2, s1p - s1) : 0;
+ r = (s1p - s1) ? strncmp(s1, s2, s1p - s1) : 0;
if (r)
return r;
}
diff --git a/src/policy.c b/src/policy.c
index c02d2373..d6354cd2 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -833,6 +833,79 @@ move_installed_to_front(Pool *pool, Queue *plist)
}
}
+/*
+ * prune_to_best_version
+ *
+ * sort list of packages (given through plist) by name and evr
+ * return result through plist
+ */
+void
+prune_to_best_version(Pool *pool, Queue *plist)
+{
+#ifdef ENABLE_CONDA
+ if (pool->disttype == DISTTYPE_CONDA)
+ return prune_to_best_version_conda(pool, plist);
+#endif
+
+ int i, j, r;
+ Solvable *s, *best;
+
+ if (plist->count < 2) /* no need to prune for a single entry */
+ return;
+ POOL_DEBUG(SOLV_DEBUG_POLICY, "prune_to_best_version %d\n", plist->count);
+
+ /* sort by name first, prefer installed */
+ solv_sort(plist->elements, plist->count, sizeof(Id), prune_to_best_version_sortcmp, pool);
+
+ /* now find best 'per name' */
+ best = 0;
+ for (i = j = 0; i < plist->count; i++)
+ {
+ s = pool->solvables + plist->elements[i];
+
+ POOL_DEBUG(SOLV_DEBUG_POLICY, "- %s [%d]%s\n",
+ pool_solvable2str(pool, s), plist->elements[i],
+ (pool->installed && s->repo == pool->installed) ? "I" : "");
+
+ if (!best) /* if no best yet, the current is best */
+ {
+ best = s;
+ continue;
+ }
+
+ /* name switch: finish group, re-init */
+ if (best->name != s->name) /* new name */
+ {
+ plist->elements[j++] = best - pool->solvables; /* move old best to front */
+ best = s; /* take current as new best */
+ continue;
+ }
+
+ r = 0;
+ if (r == 0)
+ r = best->evr != s->evr ? pool_evrcmp(pool, best->evr, s->evr, EVRCMP_COMPARE) : 0;
+#ifdef ENABLE_LINKED_PKGS
+ if (r == 0 && has_package_link(pool, s))
+ r = pool_link_evrcmp(pool, best, s);
+#endif
+ if (r < 0)
+ best = s;
+ }
+
+ plist->elements[j++] = best - pool->solvables; /* finish last group */
+ plist->count = j;
+
+ /* we reduced the list to one package per name, now look at
+ * package obsoletes */
+ if (plist->count > 1)
+ {
+ if (plist->count == 2)
+ prune_obsoleted_2(pool, plist);
+ else
+ prune_obsoleted(pool, plist);
+ }
+}
+
#ifdef ENABLE_CONDA
static int
pool_featurecountcmp(Pool *pool, Solvable *s1, Solvable *s2)
@@ -863,23 +936,221 @@ pool_buildflavorcmp(Pool *pool, Solvable *s1, Solvable *s2)
return 0;
return pool_evrcmp_str(pool, f1 ? f1 : "" , f2 ? f2 : "", EVRCMP_COMPARE);
}
-#endif
+
+void intersect_selection(Pool* pool, Id dep, Queue* prev)
+{
+ Queue tmp;
+ int i = 0, j = 0, isectidx = 0;
+
+ queue_init(&tmp);
+
+ Id* pp, p;
+ pp = pool_whatprovides_ptr(pool, dep);
+ while ((p = *pp++) != 0)
+ queue_push(&tmp, p);
+
+ // set intersection, assuming sorted arrays
+ while (i < prev->count && j < tmp.count)
+ if (prev->elements[i] < tmp.elements[j])
+ i++;
+ else if (tmp.elements[j] < prev->elements[i])
+ j++;
+ else
+ {
+ if (isectidx != i)
+ prev->elements[isectidx] = prev->elements[i];
+ i++, j++, isectidx++;
+ }
+
+ prev->count = isectidx;
+ queue_free(&tmp);
+}
+
+int check_deps_unequal(Pool* pool, Queue* q1, Queue* q2, Id name)
+{
+ Id dep;
+ int i, j;
+ int found = 0;
+ for (i = 0; i < q1->count; ++i)
+ {
+ dep = q1->elements[i];
+ if (ISRELDEP(dep) && GETRELDEP(pool, dep)->name == name)
+ {
+ for (j = 0; j < q2->count; ++j)
+ {
+ if (q2->elements[j] == dep)
+ {
+ found = 1;
+ break;
+ }
+ }
+ if (!found)
+ return 1;
+
+ found = 0;
+ }
+ }
+ return 0;
+}
+
+Id best_matching(Pool* pool, Queue* q, Id name, int* all_have_trackfeatures)
+{
+ int first = 1;
+ Id dep, p, *pp;
+
+ Queue selection;
+ queue_init(&selection);
+
+ for (int i = 0; i < q->count; ++i)
+ {
+ dep = q->elements[i];
+ if (!ISRELDEP(dep) || GETRELDEP(pool, dep)->name != name) continue;
+
+ if (first)
+ {
+ pp = pool_whatprovides_ptr(pool, dep);
+ while ((p = *pp++) != 0)
+ queue_push(&selection, p);
+ first = 0;
+ }
+ else
+ intersect_selection(pool, dep, &selection);
+ }
+
+ if (selection.count == 0)
+ return 0;
+
+ Solvable *stmp, *best = pool_id2solvable(pool, selection.elements[0]);
+ int cmp;
+
+ *all_have_trackfeatures = 1;
+ for (int i = 0; i < selection.count; ++i)
+ if (solvable_lookup_count(pool_id2solvable(pool, selection.elements[i]),
+ SOLVABLE_TRACK_FEATURES) == 0)
+ {
+ *all_have_trackfeatures = 0;
+ break;
+ }
+
+ for (int i = 0; i < selection.count; ++i)
+ {
+ stmp = pool_id2solvable(pool, selection.elements[i]);
+ cmp = pool_evrcmp(pool, best->evr, stmp->evr, 0);
+ if (cmp < 0) best = stmp;
+ }
+
+ return best->evr;
+}
+
+int conda_compare_dependencies(Pool *pool, Solvable *s1, Solvable *s2)
+{
+ int i, j, has_seen;
+ Queue q1, q2, seen;
+
+ queue_init(&q1);
+ queue_init(&q2);
+ queue_init(&seen);
+
+ solvable_lookup_deparray(s1, SOLVABLE_REQUIRES, &q1, -1);
+ solvable_lookup_deparray(s2, SOLVABLE_REQUIRES, &q2, -1);
+
+ int comparison_result = 0;
+
+ for (i = 0; i < q1.count; ++i)
+ {
+ Id x1 = q1.elements[i];
+ has_seen = 0;
+
+ if (!ISRELDEP(x1))
+ continue;
+
+ Reldep* rd1 = GETRELDEP(pool, x1);
+ for (j = 0; j < seen.count && has_seen == 0; ++j)
+ if (seen.elements[j] == rd1->name)
+ has_seen = 1;
+
+ if (has_seen)
+ continue;
+
+ // first make sure that deps are different between a & b
+ int deps_unequal = check_deps_unequal(pool, &q1, &q2, rd1->name);
+ if (!deps_unequal)
+ {
+ queue_push(&seen, rd1->name);
+ continue;
+ }
+
+ int aht_1, aht_2; // all have track features check
+ Id b1 = best_matching(pool, &q1, rd1->name, &aht_1);
+ Id b2 = best_matching(pool, &q2, rd1->name, &aht_2);
+
+ // one of both or both is not solvable...
+ // ignoring this case for now
+ if (b1 == 0 || b2 == 0)
+ continue;
+
+ // if one has deps with track features, and the other does not,
+ // downweight the one with track features
+ if (aht_1 != aht_2)
+ comparison_result += (aht_1 - aht_2) * 100;
+
+ comparison_result += pool_evrcmp(pool, b2, b1, 0);
+ }
+
+ queue_free(&q1);
+ queue_free(&q2);
+ queue_free(&seen);
+
+ return comparison_result;
+}
+
+static int
+sort_by_best_dependencies(const void *ap, const void *bp, void *dp)
+{
+ Pool* pool = (Pool*) dp;
+
+ Id a = *(Id *)ap;
+ Id b = *(Id *)bp;
+ Solvable *sa, *sb;
+
+ sa = pool->solvables + a;
+ sb = pool->solvables + b;
+
+ int res = conda_compare_dependencies(pool, sa, sb);
+ if (res == 0)
+ {
+ // no differences, select later build
+ Repodata* ra = repo_last_repodata(sa->repo);
+ Repodata* rb = repo_last_repodata(sb->repo);
+
+ unsigned long long bta = repodata_lookup_num(ra, a, SOLVABLE_BUILDTIME, 0ull);
+ unsigned long long btb = repodata_lookup_num(rb, b, SOLVABLE_BUILDTIME, 0ull);
+
+ res = (btb > bta) ? 1 : -1;
+ POOL_DEBUG(SOLV_DEBUG_POLICY, "Fallback to timestamp comparison: %llu vs %llu: [%d]\n", bta, btb, res);
+ }
+
+ POOL_DEBUG(SOLV_DEBUG_POLICY, "Selecting variant [%c] of (a) %s vs (b) %s (score: %d)\n",
+ (res < 0 ? 'a' : 'b'), pool_solvable2str(pool, sa), pool_solvable2str(pool, sb), res);
+
+ return res;
+}
/*
- * prune_to_best_version
+ * prune_to_best_version_conda
*
* sort list of packages (given through plist) by name and evr
* return result through plist
*/
void
-prune_to_best_version(Pool *pool, Queue *plist)
+prune_to_best_version_conda(Pool *pool, Queue *plist)
{
int i, j, r;
Solvable *s, *best;
- if (plist->count < 2) /* no need to prune for a single entry */
+ if (plist->count < 2) /* no need to prune for a single entry */
return;
- POOL_DEBUG(SOLV_DEBUG_POLICY, "prune_to_best_version %d\n", plist->count);
+ POOL_DEBUG(SOLV_DEBUG_POLICY, "prune_to_best_version_conda %d\n", plist->count);
/* sort by name first, prefer installed */
solv_sort(plist->elements, plist->count, sizeof(Id), prune_to_best_version_sortcmp, pool);
@@ -891,10 +1162,10 @@ prune_to_best_version(Pool *pool, Queue *plist)
s = pool->solvables + plist->elements[i];
POOL_DEBUG(SOLV_DEBUG_POLICY, "- %s [%d]%s\n",
- pool_solvable2str(pool, s), plist->elements[i],
- (pool->installed && s->repo == pool->installed) ? "I" : "");
+ pool_solvable2str(pool, s), plist->elements[i],
+ (pool->installed && s->repo == pool->installed) ? "I" : "");
- if (!best) /* if no best yet, the current is best */
+ if (!best) /* if no best yet, the current is best */
{
best = s;
continue;
@@ -904,49 +1175,54 @@ prune_to_best_version(Pool *pool, Queue *plist)
if (best->name != s->name) /* new name */
{
plist->elements[j++] = best - pool->solvables; /* move old best to front */
- best = s; /* take current as new best */
+ best = s; /* take current as new best */
continue;
}
r = 0;
-#ifdef ENABLE_CONDA
- if (pool->disttype == DISTTYPE_CONDA)
- r = pool_featurecountcmp(pool, best, s);
-#endif
+ r = pool_featurecountcmp(pool, best, s);
if (r == 0)
r = best->evr != s->evr ? pool_evrcmp(pool, best->evr, s->evr, EVRCMP_COMPARE) : 0;
-#ifdef ENABLE_LINKED_PKGS
- if (r == 0 && has_package_link(pool, s))
- r = pool_link_evrcmp(pool, best, s);
-#endif
-#ifdef ENABLE_CONDA
- if (pool->disttype == DISTTYPE_CONDA)
- {
- if (r == 0)
- r = (best->repo ? best->repo->subpriority : 0) - (s->repo ? s->repo->subpriority : 0);
- if (r == 0)
- r = pool_buildversioncmp(pool, best, s);
- if (r == 0)
- r = pool_buildflavorcmp(pool, best, s);
- }
-#endif
+ if (r == 0)
+ r = (best->repo ? best->repo->subpriority : 0) - (s->repo ? s->repo->subpriority : 0);
+ if (r == 0)
+ r = pool_buildversioncmp(pool, best, s);
+ // this can be removed as this comparison doesn't effect anything
+ if (r == 0)
+ r = pool_buildflavorcmp(pool, best, s);
if (r < 0)
- best = s;
+ best = s;
}
- plist->elements[j++] = best - pool->solvables; /* finish last group */
- plist->count = j;
- /* we reduced the list to one package per name, now look at
- * package obsoletes */
- if (plist->count > 1)
+ Queue q;
+ queue_init(&q);
+ for (i = 0; i < plist->count; i++)
{
- if (plist->count == 2)
- prune_obsoleted_2(pool, plist);
- else
- prune_obsoleted(pool, plist);
+ s = pool->solvables + plist->elements[i];
+ r = pool_featurecountcmp(pool, best, s);
+ if (r == 0)
+ r = best->evr != s->evr ? pool_evrcmp(pool, best->evr, s->evr, EVRCMP_COMPARE) : 0;
+ if (r == 0)
+ r = (best->repo ? best->repo->subpriority : 0) - (s->repo ? s->repo->subpriority : 0);
+ if (r == 0)
+ r = pool_buildversioncmp(pool, best, s);
+ if (r == 0)
+ queue_push(&q, s - pool->solvables);
}
-}
+ if (q.count > 1)
+ {
+ // order by first-level deps
+ solv_sort(q.elements, q.count, sizeof(Id), sort_by_best_dependencies, pool);
+ }
+
+ for (i = 0; i < q.count; ++i)
+ plist->elements[i] = q.elements[i];
+ plist->count = q.count;
+
+ queue_free(&q);
+}
+#endif // ENABLE_CONDA
static int
sort_by_name_evr_sortcmp(const void *ap, const void *bp, void *dp)
diff --git a/src/policy.h b/src/policy.h
index 3ae1005a..a79483a4 100644
--- a/src/policy.h
+++ b/src/policy.h
@@ -45,6 +45,9 @@ extern void pool_best_solvables(Pool *pool, Queue *plist, int flags);
extern void prune_to_best_version(Pool *pool, Queue *plist);
extern void policy_prefer_favored(Solver *solv, Queue *plist);
+#ifdef ENABLE_CONDA
+extern void prune_to_best_version_conda(Pool *pool, Queue *plist);
+#endif
#ifdef __cplusplus
}