From c3effe0a20a4c427b9161a9aece7a9eb7df463ee Mon Sep 17 00:00:00 2001 From: Zygo Blaxell Date: Fri, 9 Mar 2018 22:57:57 -0500 Subject: [PATCH] crawl: use custom order instead of (ab)using BeesFileRange::operator< This makes the code clearer and keeps changes to BeesFileRange ordering isolated. Signed-off-by: Zygo Blaxell --- src/bees-roots.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bees-roots.cc b/src/bees-roots.cc index d2d13f3..d411a7f 100644 --- a/src/bees-roots.cc +++ b/src/bees-roots.cc @@ -293,7 +293,11 @@ BeesRoots::crawl_roots() auto this_crawl = i.second; auto this_range = this_crawl->peek_front(); if (this_range) { - if (!first_range || this_range < first_range) { + // Use custom ordering here to avoid abusing BeesFileRange::operator<(). + if (!first_range || + make_tuple(this_range.fid().ino(), this_range.begin(), this_range.fid().root()) < + make_tuple(first_range.fid().ino(), first_range.begin(), first_range.fid().root()) + ) { first_crawl = this_crawl; first_range = this_range; }