use HashMapDictionary #397
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mmarx
requested changes
Nov 2, 2023
Comment on lines
46
to
49
| //#[cfg(feature = "no-prefixed-string-dictionary")] | ||
| /// Dictionary Implementation used in the current configuration | ||
| pub type Dict = crate::dictionary::StringDictionary; | ||
| #[cfg(not(feature = "no-prefixed-string-dictionary"))] | ||
| //pub type Dict = crate::dictionary::StringDictionary; | ||
| //#[cfg(not(feature = "no-prefixed-string-dictionary"))] |
There was a problem hiding this comment.
Please just remove these instead of only commenting them out, and also remove the features in the nemo{,-physical,cli} crates.
nemo-physical/src/dictionary.rs
Outdated
Comment on lines
46
to
47
| } | ||
| impl AddResult { |
There was a problem hiding this comment.
Please separate enum and impl with a blank line.
nemo-physical/src/dictionary.rs
Outdated
|
|
||
| /// Marks the given string as being known using the special id [KNOWN_ID_MARK] without | ||
| /// assigning an own id to it. If the entry exists already, the old id will be kept and | ||
| /// returned. If is possible to return [AddResult::Rejected] to indicate that the dictionary |
There was a problem hiding this comment.
If is: there seems to be a word missing here.
| pub(crate) const LONG_STRING_THRESHOLD: usize = 1000; | ||
|
|
||
| /// Inner struct where keep locations extracted from strings. This is separated | ||
| /// to enable an iner mutability patters. |
There was a problem hiding this comment.
iner ~> interior
patters ~> pattern
Comment on lines
90
to
91
| } | ||
| impl DictionaryType { |
Comment on lines
123
to
124
| } | ||
| impl DictIterator { |
Comment on lines
135
to
143
| if ds.infixable() { | ||
| #[allow(trivial_casts)] | ||
| if let Some(dict_idx) = md | ||
| .infix_dicts | ||
| .get((ds.prefix(), ds.suffix()).borrow() as &dyn StringPairKey) | ||
| { | ||
| return *dict_idx; | ||
| } | ||
| } |
There was a problem hiding this comment.
if ds.infixable() {
if let Some(dict_idx) = md
.infix_dicts
.get::<dyn StringPairKey>(&(ds.prefix(), ds.suffix()))
{
return *dict_idx;
}
}
Comment on lines
184
to
185
| dictblocks: Vec::new(), //vec![(1, 0)], | ||
| dicts: Vec::new(), //vec![default_dict_record, blob_dict_record], |
Comment on lines
243
to
250
| let mut new_block: usize; | ||
| if btl_index > 0 { | ||
| // extrapolate where global block should be relative to last allocated local block | ||
| new_block = self.dicts[dict].gblocks[btl_index - 1] + btl_index - 1; | ||
| } else { | ||
| // TODO determine "good" initial block for this dictionary | ||
| new_block = 0; | ||
| } |
There was a problem hiding this comment.
let mut new_block = if btl_index > 0 {
// extrapolate where global block should be relative to last allocated local block
self.dicts[dict].gblocks[btl_index - 1] + btl_index - 1
} else {
// TODO determine "good" initial block for this dictionary
0
};…unsafe inside; creating constants
mmarx
approved these changes
Nov 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
HashMapDictionaryHashMapDictionaryinstead ofStringDictionaryorPrefixedStringDictionaryby defaultMetaDictionaryInfixDictionary