Chaoscaot/schemsearch
1
0
Fork 0
mirror of https://github.com/Chaoscaot/schemsearch.git synced 2026-06-15 08:26:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add configurable thread pool size for MySQL connections and update schematics loading logic

Browse Source
This commit is contained in:
Chaoscaot
2026-05-12 10:01:35 +02:00
parent b2f6e23fc1
commit 34c3b88ca6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
schemsearch-cli/src/main.rs
+1 -1
View File
@@ -259,7 +259,7 @@ fn main() {
if let Some(x) = matches.get_many::<String>("sql-filter-name") { if let Some(x) = matches.get_many::<String>("sql-filter-name") {
filter = filter.name(x.collect()); filter = filter.name(x.collect());
} }
for schem in block_on(load_all_schematics(filter)) { for schem in block_on(load_all_schematics(filter, *matches.get_one::<usize>("threads").expect("Could not get Threads") as u32)) {
schematics.push(SchematicSupplierType::SQL(SqlSchematicSupplier { schematics.push(SchematicSupplierType::SQL(SqlSchematicSupplier {
node: schem node: schem
})) }))
schemsearch-sql/src/lib.rs
+5 -5
View File
@@ -30,12 +30,12 @@ pub struct SchematicNode {
pub name: String pub name: String
} }
pub async unsafe fn get_connection() { pub async unsafe fn get_connection(connections: u32) {
let mut conn = CONN.lock().unwrap(); let mut conn = CONN.lock().unwrap();
if conn.is_none() { if conn.is_none() {
let properties = properties::load_mysql_properties(); let properties = properties::load_mysql_properties();
let _ = conn.insert(MySqlPoolOptions::new() let _ = conn.insert(MySqlPoolOptions::new()
.max_connections(5) .max_connections(connections)
.connect_with(MySqlConnectOptions::new() .connect_with(MySqlConnectOptions::new()
.host(properties.host.as_str()) .host(properties.host.as_str())
.port(3306) .port(3306)
@@ -46,8 +46,8 @@ pub async unsafe fn get_connection() {
} }
} }
pub async fn load_all_schematics(filter: SchematicFilter) -> Vec<SchematicNode> { pub async fn load_all_schematics(filter: SchematicFilter, connections: u32) -> Vec<SchematicNode> {
unsafe { get_connection().await; } unsafe { get_connection(connections).await; }
let mut schematics = Vec::new(); let mut schematics = Vec::new();
let rows = unsafe { &CONN }.lock().unwrap().as_mut().unwrap().fetch_all(format!("SELECT SN.NodeId, SN.NodeName FROM NodeData ND INNER JOIN SchematicNode SN ON SN.NodeId = ND.NodeId WHERE NodeFormat >= 2 {}", filter.build()).as_str()).await.expect("Failed to fetch schematics"); let rows = unsafe { &CONN }.lock().unwrap().as_mut().unwrap().fetch_all(format!("SELECT SN.NodeId, SN.NodeName FROM NodeData ND INNER JOIN SchematicNode SN ON SN.NodeId = ND.NodeId WHERE NodeFormat >= 2 {}", filter.build()).as_str()).await.expect("Failed to fetch schematics");
for row in rows { for row in rows {
@@ -60,7 +60,7 @@ pub async fn load_all_schematics(filter: SchematicFilter) -> Vec<SchematicNode>
} }
pub async fn load_schemdata(id: i32) -> Vec<u8> { pub async fn load_schemdata(id: i32) -> Vec<u8> {
unsafe { get_connection().await; } unsafe { get_connection(5).await; }
let rows = unsafe { &CONN }.lock().unwrap().as_mut().unwrap().fetch_one(format!("SELECT SchemData FROM NodeData WHERE NodeId = {}", id).as_str()).await.expect("Failed to fetch schematics"); let rows = unsafe { &CONN }.lock().unwrap().as_mut().unwrap().fetch_one(format!("SELECT SchemData FROM NodeData WHERE NodeId = {}", id).as_str()).await.expect("Failed to fetch schematics");
rows.get(0) rows.get(0)
} }