Optimize anchor comparison and take full advantage of fragment IDs

This commit is contained in:
Antonio Scandurra 2021-12-10 09:16:58 +01:00
parent 1ed1ec21dd
commit eeba0993aa
5 changed files with 19 additions and 13 deletions

1
Cargo.lock generated
View file

@ -4853,6 +4853,7 @@ dependencies = [
"ctor", "ctor",
"env_logger", "env_logger",
"gpui", "gpui",
"lazy_static",
"log", "log",
"parking_lot", "parking_lot",
"rand 0.8.3", "rand 0.8.3",

View file

@ -15,6 +15,7 @@ collections = { path = "../collections" }
sum_tree = { path = "../sum_tree" } sum_tree = { path = "../sum_tree" }
anyhow = "1.0.38" anyhow = "1.0.38"
arrayvec = "0.7.1" arrayvec = "0.7.1"
lazy_static = "1.4"
log = "0.4" log = "0.4"
parking_lot = "0.11" parking_lot = "0.11"
rand = { version = "0.8.3", optional = true } rand = { version = "0.8.3", optional = true }

View file

@ -28,15 +28,17 @@ impl Anchor {
} }
pub fn cmp<'a>(&self, other: &Anchor, buffer: &Snapshot) -> Result<Ordering> { pub fn cmp<'a>(&self, other: &Anchor, buffer: &Snapshot) -> Result<Ordering> {
let offset_comparison = if self.timestamp == other.timestamp { let fragment_id_comparison = if self.timestamp == other.timestamp {
self.offset.cmp(&other.offset) Ordering::Equal
} else { } else {
buffer buffer
.full_offset_for_anchor(self) .fragment_id_for_anchor(self)
.cmp(&buffer.full_offset_for_anchor(other)) .cmp(&buffer.fragment_id_for_anchor(other))
}; };
Ok(offset_comparison.then_with(|| self.bias.cmp(&other.bias))) Ok(fragment_id_comparison
.then_with(|| self.offset.cmp(&other.offset))
.then_with(|| self.bias.cmp(&other.bias)))
} }
pub fn bias_left(&self, buffer: &Buffer) -> Anchor { pub fn bias_left(&self, buffer: &Buffer) -> Anchor {

View file

@ -1,6 +1,12 @@
use lazy_static::lazy_static;
use smallvec::{smallvec, SmallVec}; use smallvec::{smallvec, SmallVec};
use std::iter; use std::iter;
lazy_static! {
pub static ref MIN: Locator = Locator::min();
pub static ref MAX: Locator = Locator::max();
}
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct Locator(SmallVec<[u64; 4]>); pub struct Locator(SmallVec<[u64; 4]>);

View file

@ -1763,12 +1763,11 @@ impl Snapshot {
} }
} }
fn full_offset_for_anchor(&self, anchor: &Anchor) -> FullOffset { fn fragment_id_for_anchor(&self, anchor: &Anchor) -> &Locator {
if *anchor == Anchor::min() { if *anchor == Anchor::min() {
Default::default() &locator::MIN
} else if *anchor == Anchor::max() { } else if *anchor == Anchor::max() {
let text = self.fragments.summary().text; &locator::MAX
FullOffset(text.visible + text.deleted)
} else { } else {
let anchor_key = InsertionFragmentKey { let anchor_key = InsertionFragmentKey {
timestamp: anchor.timestamp, timestamp: anchor.timestamp,
@ -1790,10 +1789,7 @@ impl Snapshot {
} }
let insertion = insertion_cursor.item().expect("invalid insertion"); let insertion = insertion_cursor.item().expect("invalid insertion");
debug_assert_eq!(insertion.timestamp, anchor.timestamp, "invalid insertion"); debug_assert_eq!(insertion.timestamp, anchor.timestamp, "invalid insertion");
&insertion.fragment_id
let mut fragment_cursor = self.fragments.cursor::<(Option<&Locator>, FullOffset)>();
fragment_cursor.seek(&Some(&insertion.fragment_id), Bias::Left, &None);
fragment_cursor.start().1 + (anchor.offset - insertion.split_offset)
} }
} }