⚗️ (stop): 继续优化查询

opensound-org · Jan 13, 2025 · 1a6f80a · 1a6f80a
1 parent 6fd7913
commit 1a6f80a
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/tracing-surreal/src/stop.rs b/tracing-surreal/src/stop.rs
@@ -241,7 +241,7 @@ impl<C: Connection> Stop<C> {
         })
     }
 
-    pub async fn query_last_n(&self, n: u8) -> Result<Vec<String>, surrealdb::Error> {
+    pub async fn query_last_n(&self, n: u8) -> Result<Vec<(String, String)>, surrealdb::Error> {
         #[derive(Serialize)]
         struct Bind {
             table_name: String,
@@ -250,14 +250,21 @@ impl<C: Connection> Stop<C> {
 
         let table_name = format!("{}-msg", self.formatted_timestamp);
 
+        #[derive(Deserialize)]
+        struct ClientInfo {
+            c_client_name: String,
+        }
+
         #[derive(Deserialize)]
         struct Msg {
             message: String,
+            client_id: ClientInfo,
         }
 
         // last_id: 01JH8CBYAKFSRK8Y9HY02QVTDS
         // SELECT * FROM (SELECT *, client_id[*] FROM type::thing($table_name, ..=$last_id) ORDER BY id DESC LIMIT $n) ORDER BY id
-        let query = "SELECT * FROM type::thing($table_name, ..) ORDER BY id DESC LIMIT $n";
+        let query =
+            "SELECT *, client_id[*] FROM type::thing($table_name, ..) ORDER BY id DESC LIMIT $n";
         let msgs: Vec<Msg> = self
             .db
             .query(query)
@@ -267,7 +274,11 @@ impl<C: Connection> Stop<C> {
 
         // clients + disconnects & merge
 
-        Ok(msgs.iter().rev().map(|m| m.message.clone()).collect())
+        Ok(msgs
+            .iter()
+            .rev()
+            .map(|m| (m.message.clone(), m.client_id.c_client_name.clone()))
+            .collect())
     }
 
     pub async fn print(&self) {