omedusyo/minisql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return reference in index_column.get()

Browse source
This commit is contained in:
Yuriy Dupyn 2024-01-08 14:24:30 +01:00
parent f0d29eb399
commit b04f3d167b
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
minisql/src/internals/column_index.rs
View file

@ -12,11 +12,8 @@ impl ColumnIndex {
Self { index } Self { index }
} }
pub fn get(&self, value: &IndexableValue) -> HashSet<Uuid> { pub fn get(&self, value: &IndexableValue) -> Option<&HashSet<Uuid>> {
match self.index.get(value) { self.index.get(value)
Some(set) => set.clone(),
None => HashSet::new(),
}
} }
pub fn add(&mut self, value: IndexableValue, id: Uuid) { pub fn add(&mut self, value: IndexableValue, id: Uuid) {

4
minisql/src/internals/table.rs
View file

@ -218,8 +218,8 @@ impl Table {
} else { } else {
match self.indexes.get(&column_position) { match self.indexes.get(&column_position) {
Some(index) => { Some(index) => {
let ids = index.get(value); let ids = index.get(value).cloned();
Ok(Some(ids)) Ok(ids)
} }
None => Ok(None), None => Ok(None),
} }

3
minisql/src/interpreter.rs
View file

@ -148,6 +148,7 @@ trait SqlResponseConsumer {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use std::collections::HashSet;
fn users_schema() -> TableSchema { fn users_schema() -> TableSchema {
let id: ColumnPosition = 0; let id: ColumnPosition = 0;
@ -505,7 +506,7 @@ mod tests {
let plato_id = 0; let plato_id = 0;
let aristotle_id = 1; let aristotle_id = 1;
let plato_ids = index.get(&String("Plato".to_string())); let plato_ids = index.get(&String("Plato".to_string())).cloned().unwrap_or(HashSet::new());
assert!(plato_ids.contains(&plato_id)); assert!(plato_ids.contains(&plato_id));
assert!(!plato_ids.contains(&aristotle_id)); assert!(!plato_ids.contains(&aristotle_id));
assert!(plato_ids.len() == 1); assert!(plato_ids.len() == 1);