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
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
use std::sync::Arc;
use dashmap::DashSet;
use git_features::{parallel, progress::Progress};
use git_hash::{oid, ObjectId};
use git_object::immutable;
use crate::{data::output, find, FindExt};
pub fn iter_from_objects<Find, Iter, Oid, Cache>(
db: Find,
make_cache: impl Fn() -> Cache + Send + Clone + Sync + 'static,
objects_ids: Iter,
progress: impl Progress,
Options {
thread_limit,
input_object_expansion,
chunk_size,
}: Options,
) -> impl Iterator<Item = Result<Vec<output::Count>, Error<find::existing::Error<Find::Error>>>>
+ parallel::reduce::Finalize<Reduce = reduce::Statistics<Error<find::existing::Error<Find::Error>>>>
where
Find: crate::Find + Clone + Send + Sync + 'static,
<Find as crate::Find>::Error: Send,
Iter: Iterator<Item = Oid> + Send + 'static,
Oid: AsRef<oid> + Send + 'static,
Cache: crate::cache::DecodeEntry,
{
let lower_bound = objects_ids.size_hint().0;
let (chunk_size, thread_limit, _) = parallel::optimize_chunk_size_and_thread_limit(
chunk_size,
if lower_bound == 0 { None } else { Some(lower_bound) },
thread_limit,
None,
);
let chunks = util::Chunks {
iter: objects_ids,
size: chunk_size,
};
let seen_objs = Arc::new(dashmap::DashSet::<ObjectId>::new());
let progress = Arc::new(parking_lot::Mutex::new(progress));
parallel::reduce::Stepwise::new(
chunks,
thread_limit,
{
let progress = Arc::clone(&progress);
move |n| {
(
Vec::new(),
Vec::new(),
make_cache(),
{
let mut p = progress.lock().add_child(format!("thread {}", n));
p.init(None, git_features::progress::count("objects"));
p
},
)
}
},
{
let seen_objs = Arc::clone(&seen_objs);
move |oids: Vec<Oid>, (buf1, buf2, cache, progress)| {
use ObjectExpansion::*;
let mut out = Vec::new();
let mut tree_traversal_state = git_traverse::tree::breadthfirst::State::default();
let mut tree_diff_state = git_diff::tree::State::default();
let mut parent_commit_ids = Vec::new();
let seen_objs = seen_objs.as_ref();
let mut traverse_delegate = tree::traverse::AllUnseen::new(seen_objs);
let mut changes_delegate = tree::changes::AllNew::new(seen_objs);
let mut outcome = Outcome::default();
let stats = &mut outcome;
for id in oids.into_iter() {
let id = id.as_ref();
let obj = db.find_existing(id, buf1, cache)?;
stats.input_objects += 1;
match input_object_expansion {
TreeAdditionsComparedToAncestor => {
use git_object::Kind::*;
let mut obj = obj;
let mut id = id.to_owned();
loop {
push_obj_count_unique(&mut out, seen_objs, &id, &obj, progress, stats, false);
match obj.kind {
Tree | Blob => break,
Tag => {
id = immutable::TagIter::from_bytes(obj.data)
.target_id()
.expect("every tag has a target");
obj = db.find_existing(id, buf1, cache)?;
stats.expanded_objects += 1;
continue;
}
Commit => {
let current_tree_iter = {
let mut commit_iter = immutable::CommitIter::from_bytes(obj.data);
let tree_id = commit_iter.tree_id().expect("every commit has a tree");
parent_commit_ids.clear();
for token in commit_iter {
match token {
Ok(immutable::commit::iter::Token::Parent { id }) => {
parent_commit_ids.push(id)
}
Ok(_) => break,
Err(err) => return Err(Error::CommitDecode(err)),
}
}
let obj = db.find_existing(tree_id, buf1, cache)?;
push_obj_count_unique(
&mut out, seen_objs, &tree_id, &obj, progress, stats, true,
);
immutable::TreeIter::from_bytes(obj.data)
};
let objects = if parent_commit_ids.is_empty() {
traverse_delegate.clear();
git_traverse::tree::breadthfirst(
current_tree_iter,
&mut tree_traversal_state,
|oid, buf| {
stats.decoded_objects += 1;
db.find_existing_tree_iter(oid, buf, cache).ok()
},
&mut traverse_delegate,
)
.map_err(Error::TreeTraverse)?;
&traverse_delegate.objects
} else {
for commit_id in &parent_commit_ids {
let parent_tree_id = {
let parent_commit_obj = db.find_existing(commit_id, buf2, cache)?;
push_obj_count_unique(
&mut out,
seen_objs,
commit_id,
&parent_commit_obj,
progress,
stats,
true,
);
immutable::CommitIter::from_bytes(parent_commit_obj.data)
.tree_id()
.expect("every commit has a tree")
};
let parent_tree = {
let parent_tree_obj =
db.find_existing(parent_tree_id, buf2, cache)?;
push_obj_count_unique(
&mut out,
seen_objs,
&parent_tree_id,
&parent_tree_obj,
progress,
stats,
true,
);
immutable::TreeIter::from_bytes(parent_tree_obj.data)
};
changes_delegate.clear();
git_diff::tree::Changes::from(Some(parent_tree))
.needed_to_obtain(
current_tree_iter.clone(),
&mut tree_diff_state,
|oid, buf| {
stats.decoded_objects += 1;
db.find_existing_tree_iter(oid, buf, cache).ok()
},
&mut changes_delegate,
)
.map_err(Error::TreeChanges)?;
}
&changes_delegate.objects
};
for id in objects.iter() {
out.push(id_to_count(&db, buf2, id, progress, stats));
}
break;
}
}
}
}
TreeContents => {
use git_object::Kind::*;
let mut id: ObjectId = id.into();
let mut obj = obj;
loop {
push_obj_count_unique(&mut out, seen_objs, &id, &obj, progress, stats, false);
match obj.kind {
Tree => {
traverse_delegate.clear();
git_traverse::tree::breadthfirst(
git_object::immutable::TreeIter::from_bytes(obj.data),
&mut tree_traversal_state,
|oid, buf| {
stats.decoded_objects += 1;
db.find_existing_tree_iter(oid, buf, cache).ok()
},
&mut traverse_delegate,
)
.map_err(Error::TreeTraverse)?;
for id in traverse_delegate.objects.iter() {
out.push(id_to_count(&db, buf1, id, progress, stats));
}
break;
}
Commit => {
id = immutable::CommitIter::from_bytes(obj.data)
.tree_id()
.expect("every commit has a tree");
stats.expanded_objects += 1;
obj = db.find_existing(id, buf1, cache)?;
continue;
}
Blob => break,
Tag => {
id = immutable::TagIter::from_bytes(obj.data)
.target_id()
.expect("every tag has a target");
stats.expanded_objects += 1;
obj = db.find_existing(id, buf1, cache)?;
continue;
}
}
}
}
AsIs => push_obj_count_unique(&mut out, seen_objs, id, &obj, progress, stats, false),
}
}
Ok((out, outcome))
}
},
reduce::Statistics::default(),
)
}
mod tree {
pub mod changes {
use dashmap::DashSet;
use git_diff::tree::{
visit::{Action, Change},
Visit,
};
use git_hash::ObjectId;
use git_object::bstr::BStr;
pub struct AllNew<'a> {
pub objects: Vec<ObjectId>,
all_seen: &'a DashSet<ObjectId>,
}
impl<'a> AllNew<'a> {
pub fn new(all_seen: &'a DashSet<ObjectId>) -> Self {
AllNew {
objects: Default::default(),
all_seen,
}
}
pub fn clear(&mut self) {
self.objects.clear();
}
}
impl<'a> Visit for AllNew<'a> {
fn pop_front_tracked_path_and_set_current(&mut self) {}
fn push_back_tracked_path_component(&mut self, _component: &BStr) {}
fn push_path_component(&mut self, _component: &BStr) {}
fn pop_path_component(&mut self) {}
fn visit(&mut self, change: Change) -> Action {
match change {
Change::Addition { oid, .. } | Change::Modification { oid, .. } => {
let inserted = self.all_seen.insert(oid);
if inserted {
self.objects.push(oid);
}
}
Change::Deletion { .. } => {}
};
Action::Continue
}
}
}
pub mod traverse {
use dashmap::DashSet;
use git_hash::ObjectId;
use git_object::{bstr::BStr, immutable::tree::Entry};
use git_traverse::tree::visit::{Action, Visit};
pub struct AllUnseen<'a> {
pub objects: Vec<ObjectId>,
all_seen: &'a DashSet<ObjectId>,
}
impl<'a> AllUnseen<'a> {
pub fn new(all_seen: &'a DashSet<ObjectId>) -> Self {
AllUnseen {
objects: Default::default(),
all_seen,
}
}
pub fn clear(&mut self) {
self.objects.clear();
}
}
impl<'a> Visit for AllUnseen<'a> {
fn pop_front_tracked_path_and_set_current(&mut self) {}
fn push_back_tracked_path_component(&mut self, _component: &BStr) {}
fn push_path_component(&mut self, _component: &BStr) {}
fn pop_path_component(&mut self) {}
fn visit_tree(&mut self, entry: &Entry<'_>) -> Action {
let inserted = self.all_seen.insert(entry.oid.to_owned());
if inserted {
self.objects.push(entry.oid.to_owned());
Action::Continue
} else {
Action::Skip
}
}
fn visit_nontree(&mut self, entry: &Entry<'_>) -> Action {
let inserted = self.all_seen.insert(entry.oid.to_owned());
if inserted {
self.objects.push(entry.oid.to_owned());
}
Action::Continue
}
}
}
}
fn push_obj_count_unique(
out: &mut Vec<output::Count>,
all_seen: &DashSet<ObjectId>,
id: &oid,
obj: &crate::data::Object<'_>,
progress: &mut impl Progress,
statistics: &mut Outcome,
count_expanded: bool,
) {
let inserted = all_seen.insert(id.to_owned());
if inserted {
progress.inc();
statistics.decoded_objects += 1;
if count_expanded {
statistics.expanded_objects += 1;
}
out.push(output::Count::from_data(id, obj));
}
}
fn id_to_count<Find: crate::Find>(
db: &Find,
buf: &mut Vec<u8>,
id: &oid,
progress: &mut impl Progress,
statistics: &mut Outcome,
) -> output::Count {
progress.inc();
statistics.expanded_objects += 1;
output::Count {
id: id.to_owned(),
entry_pack_location: db.location_by_oid(id, buf),
}
}
mod util {
pub struct Chunks<I> {
pub size: usize,
pub iter: I,
}
impl<I, Item> Iterator for Chunks<I>
where
I: Iterator<Item = Item>,
{
type Item = Vec<Item>;
fn next(&mut self) -> Option<Self::Item> {
let mut res = Vec::with_capacity(self.size);
let mut items_left = self.size;
for item in &mut self.iter {
res.push(item);
items_left -= 1;
if items_left == 0 {
break;
}
}
(!res.is_empty()).then(|| res)
}
}
}
mod types {
#[derive(Default, PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
pub struct Outcome {
pub input_objects: usize,
pub expanded_objects: usize,
pub decoded_objects: usize,
pub total_objects: usize,
}
impl Outcome {
pub(in crate::data::output::count) fn aggregate(
&mut self,
Outcome {
input_objects,
decoded_objects,
expanded_objects,
total_objects,
}: Self,
) {
self.input_objects += input_objects;
self.decoded_objects += decoded_objects;
self.expanded_objects += expanded_objects;
self.total_objects += total_objects;
}
}
#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
pub enum ObjectExpansion {
AsIs,
TreeContents,
TreeAdditionsComparedToAncestor,
}
impl Default for ObjectExpansion {
fn default() -> Self {
ObjectExpansion::AsIs
}
}
#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
pub struct Options {
pub thread_limit: Option<usize>,
pub chunk_size: usize,
pub input_object_expansion: ObjectExpansion,
}
impl Default for Options {
fn default() -> Self {
Options {
thread_limit: None,
chunk_size: 10,
input_object_expansion: Default::default(),
}
}
}
#[derive(Debug, thiserror::Error)]
#[allow(missing_docs)]
pub enum Error<FindErr>
where
FindErr: std::error::Error + 'static,
{
#[error(transparent)]
CommitDecode(git_object::immutable::object::decode::Error),
#[error(transparent)]
FindExisting(#[from] FindErr),
#[error(transparent)]
TreeTraverse(git_traverse::tree::breadthfirst::Error),
#[error(transparent)]
TreeChanges(git_diff::tree::changes::Error),
}
}
pub use types::{Error, ObjectExpansion, Options, Outcome};
mod reduce {
use std::marker::PhantomData;
use git_features::parallel;
use super::Outcome;
use crate::data::output;
pub struct Statistics<E> {
total: Outcome,
_err: PhantomData<E>,
}
impl<E> Default for Statistics<E> {
fn default() -> Self {
Statistics {
total: Default::default(),
_err: PhantomData::default(),
}
}
}
impl<Error> parallel::Reduce for Statistics<Error> {
type Input = Result<(Vec<output::Count>, Outcome), Error>;
type FeedProduce = Vec<output::Count>;
type Output = Outcome;
type Error = Error;
fn feed(&mut self, item: Self::Input) -> Result<Self::FeedProduce, Self::Error> {
item.map(|(counts, mut stats)| {
stats.total_objects = counts.len();
self.total.aggregate(stats);
counts
})
}
fn finalize(self) -> Result<Self::Output, Self::Error> {
Ok(self.total)
}
}
}