Improve Get call performance by replacing regex with glob matching li…

…b for wildcard handling
eclipse-kuksa · Jun 6, 2024 · bb13826 · bb13826
1 parent 82513ea
commit bb13826
Show file tree

Hide file tree

Showing 6 changed files with 1,679 additions and 68 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/databroker/Cargo.toml b/databroker/Cargo.toml
@@ -54,6 +54,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 jsonwebtoken = "9.1.0"
 regex = "1.7.1"
+glob-match = "0.2.1"
 
 jemallocator = { version = "0.5.0", optional = true }
 lazy_static = "1.4.0"

diff --git a/databroker/src/broker.rs b/databroker/src/broker.rs
@@ -61,6 +61,7 @@ pub enum RegistrationError {
 pub struct Metadata {
     pub id: i32,
     pub path: String,
+    pub glob_path: String,
     pub data_type: DataType,
     pub entry_type: EntryType,
     pub change_type: ChangeType,
@@ -726,7 +727,7 @@ impl ChangeSubscription {
                                                 notify_fields.insert(Field::ActuatorTarget);
                                             }
                                             // fill unit field always
-                                            update.unit = entry.metadata.unit.clone();
+                                            update.unit.clone_from(&entry.metadata.unit);
                                             notifications.updates.push(ChangeNotification {
                                                 update,
                                                 fields: notify_fields,
@@ -1155,6 +1156,7 @@ impl<'a, 'b> DatabaseWriteAccess<'a, 'b> {
             metadata: Metadata {
                 id: temp_id,
                 path: name.clone(),
+                glob_path: name.replace('.', "/"),
                 data_type,
                 change_type,
                 entry_type,
@@ -1431,7 +1433,7 @@ impl<'a, 'b> AuthorizedAccess<'a, 'b> {
             {
                 Ok(None) => false,
                 Ok(Some(lag_updates_)) => {
-                    lag_updates = lag_updates_.clone();
+                    lag_updates.clone_from(&lag_updates_);
                     false
                 }
                 Err(_) => true, // Cleanup needed