vato007/ingey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build issues

Browse Source
This commit is contained in:
Michael Pivato
2023-10-13 10:43:27 +10:30
parent 9a5a89d683
commit c1771b66c4
4 changed files with 1134 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1229
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

3
Cargo.toml
View File

@@ -18,12 +18,13 @@ clap = { version = "4.1.8", features = ["derive"] }
anyhow = "1.0" anyhow = "1.0"
itertools = "0.10.3" itertools = "0.10.3"
chrono = {version = "0.4.23", features = ["default", "serde"]} chrono = {version = "0.4.31", features = ["default", "serde"]}
rayon = "1.6.0" rayon = "1.6.0"
tokio = { version = "1.26.0", features = ["full"] } tokio = { version = "1.26.0", features = ["full"] }
sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "mssql" ] } sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "mssql" ] }
rmp-serde = "1.1.1" rmp-serde = "1.1.1"
polars = { version = "0.32.1", features = ["lazy", "dtype-datetime"] }
# More info on targets: https://doc.rust-lang.org/cargo/reference/cargo-targets.html#configuring-a-target # More info on targets: https://doc.rust-lang.org/cargo/reference/cargo-targets.html#configuring-a-target
[lib] [lib]

4
src/overhead_allocation.rs
View File

@@ -266,7 +266,7 @@ where
let mut limited_ccs: Vec<String> = Vec::new(); let mut limited_ccs: Vec<String> = Vec::new();
for limit_to in limit_tos.iter() { for limit_to in limit_tos.iter() {
// TODO: It is technically possible to have more than one limit to (I think?) for a slot, so consider eventually splitting this and doing a foreach // TODO: It is technically possible to have more than one limit to (I think?) for a slot, so consider eventually splitting this and doing a foreach
let limit_value = area.get(&("LimitTo:".to_owned() + limit_to)).unwrap(); let limit_value = area.get(&format!("LimitTo:{}", limit_to)).unwrap();
if limit_value.is_empty() { if limit_value.is_empty() {
continue; continue;
} }
@@ -274,7 +274,7 @@ where
limited_ccs.push(limit_value.clone()); limited_ccs.push(limit_value.clone());
} else { } else {
let mut found_ccs = rollups let mut found_ccs = rollups
.get(&("RollupSlot:".to_owned() + limit_to)) .get(&format!("RollupSlot:{}", limit_to))
.map(|rollups| rollups.get(limit_value)) .map(|rollups| rollups.get(limit_value))
.flatten() .flatten()
.unwrap() .unwrap()

5
src/products/csv.rs
View File

@@ -34,6 +34,7 @@ impl From<&String> for SourceType {
"S" => SourceType::Service, "S" => SourceType::Service,
"R" => SourceType::Revenue, "R" => SourceType::Revenue,
"T" => SourceType::Transfer, "T" => SourceType::Transfer,
_ => panic!{}
} }
} }
} }
@@ -279,7 +280,7 @@ where
equal: record.get("FilterNotIn").unwrap() != "", equal: record.get("FilterNotIn").unwrap() != "",
field: record.get("FilterField").unwrap().clone(), field: record.get("FilterField").unwrap().clone(),
value: record.get("FilterValue").unwrap().clone(), value: record.get("FilterValue").unwrap().clone(),
source_type: record.get("FilterSourceType").unwrap().clone(), source_type: SourceType::from(&record.get("FilterSourceType").unwrap().clone()),
}; };
let all_filters = &mut all_definitions let all_filters = &mut all_definitions
.get_mut(record.get("Name").unwrap()) .get_mut(record.get("Name").unwrap())
@@ -306,7 +307,7 @@ where
} }
"Constraint" => { "Constraint" => {
let constraint = Constraint { let constraint = Constraint {
source_type: record.get("ConstraintSourceType").unwrap().to_owned(), source_type: SourceType::from(&record.get("ConstraintSourceType").unwrap().to_owned()),
field: record.get("ConstraintColumn").unwrap().to_owned(), field: record.get("ConstraintColumn").unwrap().to_owned(),
constraint_type: ConstraintType::from(record.get("ConstraintType").unwrap()), constraint_type: ConstraintType::from(record.get("ConstraintType").unwrap()),
value: record.get("ConstraintValue").unwrap().to_owned(), value: record.get("ConstraintValue").unwrap().to_owned(),