More Optimization + Download Folder Permission

Author: aarkue

Cargo.lock

@@ -5,3 +5,10 @@ members = [ "ocpq_cli",
 	"shared",
   "web-server",
 ]
+
+[profile.release]
+strip = true
+panic = 'abort'
+opt-level = 3
+lto = 'fat'
+codegen-units = 1

backend/Cargo.lock

@@ -152,6 +152,10 @@ pub fn evaluate_box_tree(
         let seconds_json_file = File::create(durations_path).unwrap();
         serde_json::to_writer_pretty(BufWriter::new(seconds_json_file), &eval_times).unwrap();
         println!("Evaluation time: {eval_times:?}");
+        println!(
+            "Mean: {:.2}ms",
+            1000.0 * eval_times.iter().sum::<f64>() / eval_times.len() as f64
+        );
     }
     let now = Instant::now();
     let (evaluation_results_flat, bindings_skipped) = tree.evaluate(ocel);

backend/Cargo.toml

@@ -225,8 +225,7 @@ impl BindingStep {
         }
 
         let mut expansion = var_can_bind
-            .clone()
-            .into_iter()
+            .iter()
             .filter(|(v, _vs)| !bound_vars.contains(v))
             // Prefer binding events over objects first
             .sorted_by_key(|(v, vs)| {
@@ -241,7 +240,7 @@ impl BindingStep {
             .collect_vec();
         while !expansion.is_empty() {
             if let Some(var) = expansion.pop() {
-                if bound_vars.contains(&var) {
+                if bound_vars.contains(var) {
                     continue;
                 }
                 if let Some((v, (_var, qualifier, filter_index, reversed))) = bound_vars
@@ -251,7 +250,7 @@ impl BindingStep {
                             .get(v)
                             .unwrap()
                             .iter()
-                            .find(|(x, _q, _filter_index, _reversed)| x == &var)
+                            .find(|(x, _q, _filter_index, _reversed)| x == var)
                             .map(|t| (v, t))
                     })
                     .sorted_by_cached_key(|(bound_by_var, (_v, _q, _filter_index, _reversed))| {
@@ -265,7 +264,7 @@ impl BindingStep {
                     match v {
                         Variable::Event(v_ev) => match var {
                             Variable::Object(var_ob) => ret.push(BindingStep::BindObFromEv(
-                                var_ob,
+                                *var_ob,
                                 *v_ev,
                                 qualifier.clone(),
                             )),
@@ -275,12 +274,12 @@ impl BindingStep {
                         },
                         Variable::Object(v_ob) => match var {
                             Variable::Event(var_ev) => ret.push(BindingStep::BindEvFromOb(
-                                var_ev,
+                                *var_ev,
                                 *v_ob,
                                 qualifier.clone(),
                             )),
                             Variable::Object(var_ob) => ret.push(BindingStep::BindObFromOb(
-                                var_ob,
+                                *var_ob,
                                 *v_ob,
                                 qualifier.clone(),
                                 *reversed,
@@ -293,18 +292,18 @@ impl BindingStep {
                             if let Some((ref_ev, min_sec, max_sec)) = time_between_evs.get(&var_ev)
                             {
                                 ret.push(BindingStep::BindEv(
-                                    var_ev,
+                                    *var_ev,
                                     Some(vec![(**ref_ev, (*min_sec, *max_sec))]),
                                 ));
                             } else {
-                                ret.push(BindingStep::BindEv(var_ev, None));
+                                ret.push(BindingStep::BindEv(*var_ev, None));
                             }
                         }
-                        Variable::Object(var_ob) => ret.push(BindingStep::BindOb(var_ob)),
+                        Variable::Object(var_ob) => ret.push(BindingStep::BindOb(*var_ob)),
                     }
                 }
-                var_requiring_bindings.remove(&var);
-                bound_vars.insert(var);
+                var_requiring_bindings.remove(var);
+                bound_vars.insert(var.clone());
                 add_supported_filters(
                     bbox,
                     &mut filter_indices_incoporated,
@@ -317,7 +316,7 @@ impl BindingStep {
                     .iter()
                     .any(|bv| var_can_bind.get(bv).unwrap().contains(var));
                 if can_be_bound {
-                    100
+                    1
                 } else {
                     0
                 }

backend/shared/src/binding_box/mod.rs

@@ -17,3 +17,4 @@ chrono = "0.4.33"
 uuid = "1.7.0"
 tower-http = { version = "0.6.1", features = ["cors"] }
 cel-interpreter = {version = "0.9.0", features = ["chrono"]}
+mimalloc = { version = "0.1.47", default-features = false }

backend/shared/src/binding_box/step_order.rs

@@ -1,3 +1,6 @@
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
 use axum::{
     body::Bytes,
     extract::{DefaultBodyLimit, Path, State},
@@ -206,8 +209,7 @@ pub async fn get_qualifers_for_object_types<'a>(
     StatusCode,
     Json<Option<HashMap<String, HashSet<QualifierAndObjectType>>>>,
 ) {
-    let qualifier_and_type =
-        with_ocel_from_state(&State(state), get_object_rels_per_type);
+    let qualifier_and_type = with_ocel_from_state(&State(state), get_object_rels_per_type);
     match qualifier_and_type {
         Some(x) => (StatusCode::OK, Json(Some(x))),
         None => (StatusCode::BAD_REQUEST, Json(None)),

backend/web-server/Cargo.toml

@@ -11,6 +11,7 @@
   "permissions": [
     "updater:default",
     "process:default",
-    "log:default"
+    "log:default",
+    "fs:allow-download-write-recursive"
   ]
 }