kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Do not cache long strings and avoid caching one-hit wonders.

Browse Source
This commit is contained in:
Stephen Chung 2023-03-31 10:41:55 +08:00
parent b102982d65
commit 5eaa4c5240
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/parser.rs
View File

@ -261,7 +261,7 @@ impl<'e, 's> ParseState<'e, 's> {
text: impl AsRef<str> + Into<ImmutableString>, text: impl AsRef<str> + Into<ImmutableString>,
) -> ImmutableString { ) -> ImmutableString {
self.interned_strings.get_with_mapper( self.interned_strings.get_with_mapper(
crate::engine::FN_GET, b'g',
|s| crate::engine::make_getter(s.as_ref()).into(), |s| crate::engine::make_getter(s.as_ref()).into(),
text, text,
) )
@ -276,7 +276,7 @@ impl<'e, 's> ParseState<'e, 's> {
text: impl AsRef<str> + Into<ImmutableString>, text: impl AsRef<str> + Into<ImmutableString>,
) -> ImmutableString { ) -> ImmutableString {
self.interned_strings.get_with_mapper( self.interned_strings.get_with_mapper(
crate::engine::FN_SET, b's',
|s| crate::engine::make_setter(s.as_ref()).into(), |s| crate::engine::make_setter(s.as_ref()).into(),
text, text,
) )

10
src/types/interner.rs
View File

@ -62,7 +62,7 @@ impl StringsInterner {
#[inline(always)] #[inline(always)]
#[must_use] #[must_use]
pub fn get<S: AsRef<str> + Into<ImmutableString>>(&mut self, text: S) -> ImmutableString { pub fn get<S: AsRef<str> + Into<ImmutableString>>(&mut self, text: S) -> ImmutableString {
self.get_with_mapper("", Into::into, text) self.get_with_mapper(0, Into::into, text)
} }
/// Get an identifier from a text string, adding it to the interner if necessary. /// Get an identifier from a text string, adding it to the interner if necessary.
@ -70,19 +70,19 @@ impl StringsInterner {
#[must_use] #[must_use]
pub fn get_with_mapper<S: AsRef<str>>( pub fn get_with_mapper<S: AsRef<str>>(
&mut self, &mut self,
category: &str, category: u8,
mapper: impl FnOnce(S) -> ImmutableString, mapper: impl FnOnce(S) -> ImmutableString,
text: S, text: S,
) -> ImmutableString { ) -> ImmutableString {
let key = text.as_ref(); let key = text.as_ref();
let hasher = &mut get_hasher(); let hasher = &mut get_hasher();
category.hash(hasher); hasher.write_u8(category);
key.hash(hasher); key.hash(hasher);
let hash = hasher.finish(); let hash = hasher.finish();
// Cache long strings only on the second try to avoid caching "one-hit wonders". // Do not cache long strings and avoid caching "one-hit wonders".
if key.len() > MAX_STRING_LEN && self.bloom_filter.is_absent_and_set(hash) { if key.len() > MAX_STRING_LEN || self.bloom_filter.is_absent_and_set(hash) {
return mapper(text); return mapper(text);
} }