github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化全文搜索

Browse Source
This commit is contained in:
kuaifan 2025-04-17 16:45:13 +08:00
parent a2533ce7f9
commit 462705c4ed
1 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
app/Module/ZincSearch/ZincSearchUserMsg.php
View File

@ -166,7 +166,7 @@ class ZincSearchUserMsg
* @param WebSocketDialogUser $dialogUser * @param WebSocketDialogUser $dialogUser
* @return string * @return string
*/ */
public static function generateUserDocId(WebSocketDialogUser $dialogUser): string public static function generateJoinKeyFromUser(WebSocketDialogUser $dialogUser): string
{ {
return "dialog_{$dialogUser->dialog_id}_user_{$dialogUser->userid}"; return "dialog_{$dialogUser->dialog_id}_user_{$dialogUser->userid}";
} }
@ -255,7 +255,7 @@ class ZincSearchUserMsg
public static function deleteUser(WebSocketDialogUser $dialogUser): void public static function deleteUser(WebSocketDialogUser $dialogUser): void
{ {
try { try {
$docId = self::generateUserDocId($dialogUser); $docId = self::generateJoinKeyFromUser($dialogUser);
// 首先查询相关消息 // 首先查询相关消息
$searchParams = [ $searchParams = [
@ -290,18 +290,6 @@ class ZincSearchUserMsg
// 会话消息相关方法 // 会话消息相关方法
// ============================== // ==============================
/**
* 会话消息 - 生成父文档ID
*
* @param WebSocketDialogMsg $dialogMsg
* @param string $userid
* @return string
*/
public static function generateMsgJoinKey(WebSocketDialogMsg $dialogMsg, string $userid): string
{
return "dialog_{$dialogMsg->dialog_id}_user_{$userid}";
}
/** /**
* 会话消息 - 生成文档ID * 会话消息 - 生成文档ID
* *
@ -309,9 +297,9 @@ class ZincSearchUserMsg
* @param string $userid * @param string $userid
* @return string * @return string
*/ */
public static function generateMsgDocId(WebSocketDialogMsg $dialogMsg, string $userid): string public static function generateJoinKeyFromMsg(WebSocketDialogMsg $dialogMsg, string $userid): string
{ {
return "msg_{$dialogMsg->id}_user_{$userid}"; return "dialog_{$dialogMsg->dialog_id}_user_{$userid}";
} }
/** /**
@ -335,7 +323,7 @@ class ZincSearchUserMsg
'bot' => $dialogMsg->bot ? 1 : 0, 'bot' => $dialogMsg->bot ? 1 : 0,
'_join_type' => 'dialog_msg', '_join_type' => 'dialog_msg',
'_join_key' => self::generateMsgJoinKey($dialogMsg, $userid) '_join_key' => self::generateJoinKeyFromMsg($dialogMsg, $userid)
]; ];
} }
@ -357,18 +345,15 @@ class ZincSearchUserMsg
$docs = []; $docs = [];
foreach ($dialogUsers as $dialogUser) { foreach ($dialogUsers as $dialogUser) {
$docId = self::generateMsgDocId($dialogMsg, $dialogUser->userid);
$docFormat = self::generateMsgFormat($dialogMsg, $dialogUser->userid); $docFormat = self::generateMsgFormat($dialogMsg, $dialogUser->userid);
$docs[] = $docFormat; $docs[] = $docFormat;
} }
if (!empty($docs)) { if (!empty($docs)) {
if (ZincSearchBase::indexExists(self::$indexName)) { if (!ZincSearchBase::indexExists(self::$indexName)) {
ZincSearchBase::addDocs(self::$indexName, $docs);
} else {
self::generateIndex(); self::generateIndex();
ZincSearchBase::addDocs(self::$indexName, $docs);
} }
ZincSearchBase::addDocs(self::$indexName, $docs);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error('syncMsg: ' . $e->getMessage()); Log::error('syncMsg: ' . $e->getMessage());
@ -418,12 +403,10 @@ class ZincSearchUserMsg
// 批量写入 // 批量写入
if (!empty($docs)) { if (!empty($docs)) {
if (ZincSearchBase::indexExists(self::$indexName)) { if (!ZincSearchBase::indexExists(self::$indexName)) {
ZincSearchBase::addDocs(self::$indexName, $docs);
} else {
self::generateIndex(); self::generateIndex();
ZincSearchBase::addDocs(self::$indexName, $docs);
} }
ZincSearchBase::addDocs(self::$indexName, $docs);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error('batchSyncMsgs: ' . $e->getMessage()); Log::error('batchSyncMsgs: ' . $e->getMessage());
@ -441,17 +424,48 @@ class ZincSearchUserMsg
public static function deleteMsg(WebSocketDialogMsg $dialogMsg): void public static function deleteMsg(WebSocketDialogMsg $dialogMsg): void
{ {
try { try {
// 获取此会话的所有用户 $batchSize = 1000; // 每批处理的文档数量
$dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get(); $from = 0;
$totalDeleted = 0;
if ($dialogUsers->isEmpty()) { while (true) {
return; // 根据消息ID查找相关文档，使用分页
$searchParams = [
'search_type' => 'term',
'query' => [
'field' => 'msg_id',
'term' => $dialogMsg->id
],
'from' => $from,
'max_results' => $batchSize
];
$result = ZincSearchBase::advancedSearch(self::$indexName, $searchParams);
$hits = $result['data']['hits']['hits'] ?? [];
// 如果没有更多文档，退出循环
if (empty($hits)) {
break;
}
// 删除本批次找到的所有文档
foreach ($hits as $hit) {
if (isset($hit['_id'])) {
ZincSearchBase::deleteDoc(self::$indexName, $hit['_id']);
$totalDeleted++;
}
}
// 如果返回的文档数少于批次大小，说明已经没有更多文档了
if (count($hits) < $batchSize) {
break;
}
// 移动到下一批
$from += $batchSize;
} }
foreach ($dialogUsers as $dialogUser) { Log::info("deleteMsg: 已删除消息ID {$dialogMsg->id} 的 {$totalDeleted} 条相关文档");
$docId = self::generateMsgDocId($dialogMsg, $dialogUser->userid);
ZincSearchBase::deleteDoc(self::$indexName, $docId);
}
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error('deleteMsg: ' . $e->getMessage()); Log::error('deleteMsg: ' . $e->getMessage());
} }