Skip to content

Commit 446ceaf

Browse files
SyMindSyMind
authored
perf: remove rope (#200)
1 parent 7b7842a commit 446ceaf

15 files changed

Lines changed: 431 additions & 1947 deletions

‎benches/bench_complex_replace_source.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36737,7 +36737,7 @@ pub fn benchmark_complex_replace_source_map_cached_source_stream_chunks(
3673736737
cached_source.map(&ObjectPool::default(), &MapOptions::default());
3673836738

3673936739
b.iter(|| {
36740-
black_box(cached_source.stream_chunks(
36740+
black_box(cached_source.stream_chunks().stream(
3674136741
&ObjectPool::default(),
3674236742
&MapOptions::default(),
3674336743
&mut |_chunk, _mapping| {},

‎src/cached_source.rs‎

Lines changed: 58 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::{
22
borrow::Cow,
3+
cell::OnceCell,
34
hash::{Hash, Hasher},
45
sync::{Arc, OnceLock},
56
};
@@ -9,10 +10,9 @@ use rustc_hash::FxHasher;
910
use crate::{
1011
helpers::{
1112
stream_and_get_source_and_map, stream_chunks_of_raw_source,
12-
stream_chunks_of_source_map, StreamChunks,
13+
stream_chunks_of_source_map, Chunks, GeneratedInfo, StreamChunks,
1314
},
1415
object_pool::ObjectPool,
15-
rope::Rope,
1616
source::SourceValue,
1717
BoxSource, MapOptions, Source, SourceExt, SourceMap,
1818
};
@@ -86,10 +86,6 @@ impl Source for CachedSource {
8686
self.inner.source()
8787
}
8888

89-
fn rope(&self) -> Rope<'_> {
90-
self.inner.rope()
91-
}
92-
9389
fn buffer(&self) -> Cow<[u8]> {
9490
let mut buffer = vec![];
9591
self.to_writer(&mut buffer).unwrap();
@@ -125,44 +121,68 @@ impl Source for CachedSource {
125121
}
126122
}
127123

128-
impl StreamChunks for CachedSource {
129-
fn stream_chunks<'a>(
124+
struct CachedSourceChunks<'source> {
125+
chunks: Box<dyn Chunks + 'source>,
126+
cache: Arc<CachedData>,
127+
inner: &'source dyn Source,
128+
source: OnceCell<Cow<'source, str>>,
129+
}
130+
131+
impl<'a> CachedSourceChunks<'a> {
132+
fn new(cache_source: &'a CachedSource) -> Self {
133+
Self {
134+
chunks: cache_source.inner.stream_chunks(),
135+
cache: cache_source.cache.clone(),
136+
inner: &cache_source.inner,
137+
source: OnceCell::new(),
138+
}
139+
}
140+
}
141+
142+
impl Chunks for CachedSourceChunks<'_> {
143+
fn stream<'a>(
130144
&'a self,
131145
object_pool: &'a ObjectPool,
132146
options: &MapOptions,
133147
on_chunk: crate::helpers::OnChunk<'_, 'a>,
134148
on_source: crate::helpers::OnSource<'_, 'a>,
135149
on_name: crate::helpers::OnName<'_, 'a>,
136-
) -> crate::helpers::GeneratedInfo {
150+
) -> GeneratedInfo {
137151
let cell = if options.columns {
138152
&self.cache.columns_map
139153
} else {
140154
&self.cache.line_only_map
141155
};
142156
match cell.get() {
143157
Some(map) => {
144-
let source = self.rope();
158+
let source = self
159+
.source
160+
.get_or_init(|| self.inner.source().into_string_lossy());
145161
if let Some(map) = map {
146162
stream_chunks_of_source_map(
147163
options,
148164
object_pool,
149-
source,
165+
source.as_ref(),
150166
map,
151167
on_chunk,
152168
on_source,
153169
on_name,
154170
)
155171
} else {
156172
stream_chunks_of_raw_source(
157-
source, options, on_chunk, on_source, on_name,
173+
source.as_ref(),
174+
options,
175+
on_chunk,
176+
on_source,
177+
on_name,
158178
)
159179
}
160180
}
161181
None => {
162182
let (generated_info, map) = stream_and_get_source_and_map(
163183
options,
164184
object_pool,
165-
&self.inner,
185+
self.chunks.as_ref(),
166186
on_chunk,
167187
on_source,
168188
on_name,
@@ -174,6 +194,12 @@ impl StreamChunks for CachedSource {
174194
}
175195
}
176196

197+
impl StreamChunks for CachedSource {
198+
fn stream_chunks<'a>(&'a self) -> Box<dyn Chunks + 'a> {
199+
Box::new(CachedSourceChunks::new(self))
200+
}
201+
}
202+
177203
impl Clone for CachedSource {
178204
fn clone(&self) -> Self {
179205
Self {
@@ -323,22 +349,26 @@ mod tests {
323349
let mut on_chunk_count = 0;
324350
let mut on_source_count = 0;
325351
let mut on_name_count = 0;
326-
let generated_info = source.stream_chunks(
327-
&ObjectPool::default(),
328-
&map_options,
329-
&mut |_chunk, _mapping| {
330-
on_chunk_count += 1;
331-
},
332-
&mut |_source_index, _source, _source_content| {
333-
on_source_count += 1;
334-
},
335-
&mut |_name_index, _name| {
336-
on_name_count += 1;
337-
},
338-
);
352+
let generated_info = {
353+
let object_pool = ObjectPool::default();
354+
let chunks = source.stream_chunks();
355+
chunks.stream(
356+
&object_pool,
357+
&map_options,
358+
&mut |_chunk, _mapping| {
359+
on_chunk_count += 1;
360+
},
361+
&mut |_source_index, _source, _source_content| {
362+
on_source_count += 1;
363+
},
364+
&mut |_name_index, _name| {
365+
on_name_count += 1;
366+
},
367+
)
368+
};
339369

340370
let cached_source = CachedSource::new(source);
341-
cached_source.stream_chunks(
371+
cached_source.stream_chunks().stream(
342372
&ObjectPool::default(),
343373
&map_options,
344374
&mut |_chunk, _mapping| {},
@@ -349,7 +379,7 @@ mod tests {
349379
let mut cached_on_chunk_count = 0;
350380
let mut cached_on_source_count = 0;
351381
let mut cached_on_name_count = 0;
352-
let cached_generated_info = cached_source.stream_chunks(
382+
let cached_generated_info = cached_source.stream_chunks().stream(
353383
&ObjectPool::default(),
354384
&map_options,
355385
&mut |_chunk, _mapping| {

‎src/concat_source.rs‎

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use std::{
88
use rustc_hash::FxHashMap as HashMap;
99

1010
use crate::{
11-
helpers::{get_map, GeneratedInfo, OnChunk, OnName, OnSource, StreamChunks},
11+
helpers::{get_map, Chunks, GeneratedInfo, StreamChunks},
1212
linear_map::LinearMap,
1313
object_pool::ObjectPool,
1414
source::{Mapping, OriginalLocation},
15-
BoxSource, MapOptions, RawStringSource, Rope, Source, SourceExt, SourceMap,
15+
BoxSource, MapOptions, RawStringSource, Source, SourceExt, SourceMap,
1616
SourceValue,
1717
};
1818

@@ -175,20 +175,6 @@ impl Source for ConcatSource {
175175
}
176176
}
177177

178-
fn rope(&self) -> Rope<'_> {
179-
let children = self.optimized_children();
180-
if children.len() == 1 {
181-
children[0].rope()
182-
} else {
183-
let mut rope = Rope::new();
184-
for child in children {
185-
let child_rope = child.rope();
186-
rope.append(child_rope);
187-
}
188-
rope
189-
}
190-
}
191-
192178
fn buffer(&self) -> Cow<[u8]> {
193179
let children = self.optimized_children();
194180
if children.len() == 1 {
@@ -208,12 +194,14 @@ impl Source for ConcatSource {
208194
.sum()
209195
}
210196

211-
fn map(
212-
&self,
213-
object_pool: &ObjectPool,
197+
fn map<'a>(
198+
&'a self,
199+
object_pool: &'a ObjectPool,
214200
options: &MapOptions,
215201
) -> Option<SourceMap> {
216-
get_map(object_pool, self, options)
202+
let chunks = self.stream_chunks();
203+
let result = get_map(object_pool, chunks.as_ref(), options);
204+
result
217205
}
218206

219207
fn to_writer(&self, writer: &mut dyn std::io::Write) -> std::io::Result<()> {
@@ -240,19 +228,32 @@ impl PartialEq for ConcatSource {
240228
}
241229
impl Eq for ConcatSource {}
242230

243-
impl StreamChunks for ConcatSource {
244-
fn stream_chunks<'a>(
245-
&'a self,
246-
object_pool: &'a ObjectPool,
247-
options: &MapOptions,
248-
on_chunk: OnChunk<'_, 'a>,
249-
on_source: OnSource<'_, 'a>,
250-
on_name: OnName<'_, 'a>,
251-
) -> crate::helpers::GeneratedInfo {
252-
let children = self.optimized_children();
231+
struct ConcatSourceChunks<'source> {
232+
children_chunks: Vec<Box<dyn Chunks + 'source>>,
233+
}
253234

254-
if children.len() == 1 {
255-
return children[0].stream_chunks(
235+
impl<'source> ConcatSourceChunks<'source> {
236+
fn new(concat_source: &'source ConcatSource) -> Self {
237+
let children = concat_source.optimized_children();
238+
let children_chunks = children
239+
.iter()
240+
.map(|child| child.stream_chunks())
241+
.collect::<Vec<_>>();
242+
Self { children_chunks }
243+
}
244+
}
245+
246+
impl Chunks for ConcatSourceChunks<'_> {
247+
fn stream<'b>(
248+
&'b self,
249+
object_pool: &'b ObjectPool,
250+
options: &MapOptions,
251+
on_chunk: crate::helpers::OnChunk<'_, 'b>,
252+
on_source: crate::helpers::OnSource<'_, 'b>,
253+
on_name: crate::helpers::OnName<'_, 'b>,
254+
) -> GeneratedInfo {
255+
if self.children_chunks.len() == 1 {
256+
return self.children_chunks[0].stream(
256257
object_pool,
257258
options,
258259
on_chunk,
@@ -271,14 +272,14 @@ impl StreamChunks for ConcatSource {
271272
let name_index_mapping: RefCell<LinearMap<u32>> =
272273
RefCell::new(LinearMap::default());
273274

274-
for item in children {
275+
for child_handle in &self.children_chunks {
275276
source_index_mapping.borrow_mut().clear();
276277
name_index_mapping.borrow_mut().clear();
277278
let mut last_mapping_line = 0;
278279
let GeneratedInfo {
279280
generated_line,
280281
generated_column,
281-
} = item.stream_chunks(
282+
} = child_handle.stream(
282283
object_pool,
283284
options,
284285
&mut |chunk, mapping| {
@@ -418,6 +419,12 @@ impl StreamChunks for ConcatSource {
418419
}
419420
}
420421

422+
impl StreamChunks for ConcatSource {
423+
fn stream_chunks<'a>(&'a self) -> Box<dyn Chunks + 'a> {
424+
Box::new(ConcatSourceChunks::new(self))
425+
}
426+
}
427+
421428
fn optimize(children: &mut Vec<BoxSource>) -> Vec<BoxSource> {
422429
let original_children = std::mem::take(children);
423430

‎src/error.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ pub type Result<T> = result::Result<T, Error>;
88
pub enum Error {
99
/// a JSON parsing related failure
1010
BadJson(simd_json::Error),
11-
/// rope related failure
12-
Rope(&'static str),
1311
}
1412

1513
impl fmt::Display for Error {
1614
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
1715
match self {
1816
Error::BadJson(err) => write!(f, "bad json: {err}"),
19-
Error::Rope(err) => write!(f, "rope error: {err}"),
2017
}
2118
}
2219
}

0 commit comments

Comments
 (0)