searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-05 04:28:55 +01:00
Code Issues Releases Wiki Activity

use a regex to count the number of filters instead of split + flatten

Browse Source
This commit is contained in:
Tamo 2021-10-27 17:08:00 +02:00 committed by marin postma
parent c4737749ab
commit d8b0d68840
No known key found for this signature in database
GPG Key ID: 6088B7721C3E39F9
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meilisearch-http/src/analytics.rs
View File

@ -63,6 +63,7 @@ mod segment {
use meilisearch_lib::index_controller::Stats; use meilisearch_lib::index_controller::Stats;
use meilisearch_lib::MeiliSearch; use meilisearch_lib::MeiliSearch;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex;
use segment::message::{Identify, Track, User}; use segment::message::{Identify, Track, User};
use segment::{AutoBatcher, Batcher, HttpClient}; use segment::{AutoBatcher, Batcher, HttpClient};
use serde_json::{json, Value}; use serde_json::{json, Value};
@ -82,7 +83,7 @@ mod segment {
.map(|header| header.to_str().ok()) .map(|header| header.to_str().ok())
.flatten() .flatten()
.unwrap_or("unknown") .unwrap_or("unknown")
.split(";") .split(';')
.map(str::trim) .map(str::trim)
.map(ToString::to_string) .map(ToString::to_string)
.collect() .collect()
@ -252,15 +253,17 @@ mod segment {
// to avoid blocking the search we are going to do the heavier computation and take the // to avoid blocking the search we are going to do the heavier computation and take the
// batcher's mutex in an async task // batcher's mutex in an async task
tokio::spawn(async move { tokio::spawn(async move {
const RE: Lazy<Regex> = Lazy::new(|| Regex::new("AND | OR").unwrap());
let filtered = filter.is_some() as usize; let filtered = filter.is_some() as usize;
let syntax = match filter.as_ref() { let syntax = match filter.as_ref() {
Some(Value::String(_)) => "string".to_string(), Some(Value::String(_)) => "string".to_string(),
Some(Value::Array(values)) => { Some(Value::Array(values)) => {
if values.iter().map(|v| v.to_string()).any(|s| { if values
s.contains(['=', '<', '>', '!'].as_ref()) .iter()
|| s.contains("_geoRadius") .map(|v| v.to_string())
|| s.contains("TO") .any(|s| RE.is_match(&s))
}) { {
"mixed".to_string() "mixed".to_string()
} else { } else {
"array".to_string() "array".to_string()
@ -270,20 +273,7 @@ mod segment {
}; };
let stringified_filters = filter.map_or(String::new(), |v| v.to_string()); let stringified_filters = filter.map_or(String::new(), |v| v.to_string());
let filter_with_geo_radius = stringified_filters.contains("_geoRadius("); let filter_with_geo_radius = stringified_filters.contains("_geoRadius(");
let filter_number_of_criteria = stringified_filters let filter_number_of_criteria = RE.split(&stringified_filters).count();
.split("!=")
.map(|s| s.split("<="))
.flatten()
.map(|s| s.split(">="))
.flatten()
.map(|s| s.split(['=', '<', '>', '!'].as_ref()))
.flatten()
.map(|s| s.split("_geoRadius("))
.flatten()
.map(|s| s.split("TO"))
.flatten()
.count()
- 1;
let mut search_batcher = batcher.lock().await; let mut search_batcher = batcher.lock().await;
user_agent.into_iter().for_each(|ua| { user_agent.into_iter().for_each(|ua| {