proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-10-04 16:49:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api-macro: replace ident hashmap with simple find

Browse Source 
after benchmarking (again), i found that doing a simple find instead
of saving the inidices for the ident strings in a hashmap has
no real performance impact (the max list size for the properties
are max ~25 at the moment, so this should not be impacting compile
times much) but it is much simpler

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-09-17 11:21:05 +02:00 committed by Dietmar Maurer
parent 3be70bc4a8
commit 3458d3fa69
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxmox-api-macro/src/api/mod.rs
View File

@ -8,7 +8,6 @@
//! The handling of methods vs type definitions happens in their corresponding submodules. //! The handling of methods vs type definitions happens in their corresponding submodules.
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};
use std::collections::HashMap;
use anyhow::Error; use anyhow::Error;
@ -379,14 +378,12 @@ impl SchemaItem {
/// Contains a sorted list of properties: /// Contains a sorted list of properties:
pub struct SchemaObject { pub struct SchemaObject {
properties_: Vec<(FieldName, bool, Schema)>, properties_: Vec<(FieldName, bool, Schema)>,
ident_hash: HashMap<String, usize>,
} }
impl SchemaObject { impl SchemaObject {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
properties_: Vec::new(), properties_: Vec::new(),
ident_hash: HashMap::new(),
} }
} }
@ -397,9 +394,6 @@ impl SchemaObject {
fn sort_properties(&mut self) { fn sort_properties(&mut self) {
self.properties_.sort_by(|a, b| (a.0).cmp(&b.0)); self.properties_.sort_by(|a, b| (a.0).cmp(&b.0));
for (idx, prop) in self.properties_.iter().enumerate() {
self.ident_hash.insert(prop.0.as_ident_str().to_string(), idx);
}
} }
fn try_extract_from(obj: &mut JSONObject) -> Result<Self, syn::Error> { fn try_extract_from(obj: &mut JSONObject) -> Result<Self, syn::Error> {
@ -428,7 +422,6 @@ impl SchemaObject {
Ok(properties) Ok(properties)
}, },
)?, )?,
ident_hash: HashMap::new(),
}; };
this.sort_properties(); this.sort_properties();
Ok(this) Ok(this)
@ -446,17 +439,11 @@ impl SchemaObject {
} }
fn find_property_by_ident(&self, key: &str) -> Option<&(FieldName, bool, Schema)> { fn find_property_by_ident(&self, key: &str) -> Option<&(FieldName, bool, Schema)> {
match self.ident_hash.get(key) { self.properties_.iter().find(|p| p.0.as_ident_str() == key)
Some(idx) => Some(&self.properties_[*idx]),
None => None,
}
} }
fn find_property_by_ident_mut(&mut self, key: &str) -> Option<&mut (FieldName, bool, Schema)> { fn find_property_by_ident_mut(&mut self, key: &str) -> Option<&mut (FieldName, bool, Schema)> {
match self.ident_hash.get(key) { self.properties_.iter_mut().find(|p| p.0.as_ident_str() == key)
Some(idx) => Some(&mut self.properties_[*idx]),
None => None,
}
} }
fn extend_properties(&mut self, new_fields: Vec<(FieldName, bool, Schema)>) { fn extend_properties(&mut self, new_fields: Vec<(FieldName, bool, Schema)>) {