snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

struct destructuring for DocumentsAggregator

Browse Source
This commit is contained in:
Vivek Kumar 2023-09-11 23:29:52 +05:30
parent 26f34ec7a2
commit 3cdb3e4eaf
No known key found for this signature in database
GPG Key ID: 5F915FFA1FD3B841
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meilisearch/src/analytics/segment_analytics.rs
View File

@ -1282,14 +1282,17 @@ impl DocumentsAggregator {
index_creation: bool, index_creation: bool,
request: &HttpRequest, request: &HttpRequest,
) -> Self { ) -> Self {
let UpdateDocumentsQuery { primary_key, csv_delimiter: _ } = documents_query;
let mut ret = Self::default(); let mut ret = Self::default();
ret.timestamp = Some(OffsetDateTime::now_utc()); ret.timestamp = Some(OffsetDateTime::now_utc());
ret.updated = true; ret.updated = true;
ret.user_agents = extract_user_agents(request).into_iter().collect(); ret.user_agents = extract_user_agents(request).into_iter().collect();
if let Some(primary_key) = documents_query.primary_key.clone() { if let Some(primary_key) = primary_key.clone() {
ret.primary_keys.insert(primary_key); ret.primary_keys.insert(primary_key);
} }
let content_type = request let content_type = request
.headers() .headers()
.get(CONTENT_TYPE) .get(CONTENT_TYPE)
@ -1304,37 +1307,43 @@ impl DocumentsAggregator {
/// Aggregate one [DocumentsAggregator] into another. /// Aggregate one [DocumentsAggregator] into another.
pub fn aggregate(&mut self, other: Self) { pub fn aggregate(&mut self, other: Self) {
let Self { timestamp, user_agents, primary_keys, content_types, index_creation, updated } =
other;
if self.timestamp.is_none() { if self.timestamp.is_none() {
self.timestamp = other.timestamp; self.timestamp = timestamp;
} }
self.updated |= other.updated; self.updated |= updated;
// we can't create a union because there is no `into_union` method // we can't create a union because there is no `into_union` method
for user_agent in other.user_agents { for user_agent in user_agents {
self.user_agents.insert(user_agent); self.user_agents.insert(user_agent);
} }
for primary_key in other.primary_keys { for primary_key in primary_keys {
self.primary_keys.insert(primary_key); self.primary_keys.insert(primary_key);
} }
for content_type in other.content_types { for content_type in content_types {
self.content_types.insert(content_type); self.content_types.insert(content_type);
} }
self.index_creation |= other.index_creation; self.index_creation |= index_creation;
} }
pub fn into_event(self, user: &User, event_name: &str) -> Option<Track> { pub fn into_event(self, user: &User, event_name: &str) -> Option<Track> {
if !self.updated { let Self { timestamp, user_agents, primary_keys, content_types, index_creation, updated } =
self;
if !updated {
None None
} else { } else {
let properties = json!({ let properties = json!({
"user-agent": self.user_agents, "user-agent": user_agents,
"payload_type": self.content_types, "payload_type": content_types,
"primary_key": self.primary_keys, "primary_key": primary_keys,
"index_creation": self.index_creation, "index_creation": index_creation,
}); });
Some(Track { Some(Track {
timestamp: self.timestamp, timestamp: timestamp,
user: user.clone(), user: user.clone(),
event: event_name.to_string(), event: event_name.to_string(),
properties, properties,