fix: pattern search 接口 size 参数不符合预期 问题 --bug=152884849 (#9424)

Author: Hywabwm

bklog/apps/log_clustering/handlers/pattern.py

@@ -104,8 +104,10 @@ def pattern_search(self):
             }
         }
         """
-
-        result = self._multi_query()
+        if self._show_new_pattern:
+            result = self._new_class_multi_query()
+        else:
+            result = self._multi_query()
         pattern_aggs = result.get("pattern_aggs", [])
         year_on_year_result = result.get("year_on_year_result", {})
         new_class = result.get("new_class", set())
@@ -226,8 +228,6 @@ def pattern_search(self):
                     "strategy_enabled": strategy_enabled,
                 }
             )
-        if self._show_new_pattern:
-            result = map_if(result, if_func=lambda x: x["is_new_class"])
         result = self._get_remark_and_owner(result)
         return result
 
@@ -251,6 +251,44 @@ def _get_remark_and_owner(self, result):
             result = [pattern for pattern in result if pattern["owners"] and set(self._owners) & set(pattern["owners"])]
         return result
 
+    def _new_class_multi_query(self):
+        new_class_query_result = self._get_new_class()
+        new_class_signature_list = [
+            new_class_tuple[0]
+            for new_class_tuple in new_class_query_result
+            if new_class_tuple and len(new_class_tuple) > 0
+        ]
+
+        if not new_class_signature_list:
+            return {"pattern_aggs": [], "year_on_year_result": {}, "new_class": set()}
+
+        # 添加新类日志数据指纹 ID 列表作为条件查询的参数
+        new_class_signature_query_condition = {
+            "field": self.pattern_aggs_field,
+            "operator": "is one of",
+            "value": new_class_signature_list,
+            "condition": "and",
+        }
+
+        copy_query = copy.deepcopy(self._query)
+        copy_query.setdefault("addition", []).append(new_class_signature_query_condition)
+
+        multi_execute_func = MultiExecuteFunc()
+        multi_execute_func.append(
+            "pattern_aggs",
+            lambda p: self._get_pattern_aggs_result(p["index_set_id"], p["query"]),
+            {"index_set_id": self._index_set_id, "query": copy_query},
+        )
+        multi_execute_func.append(
+            "year_on_year_result", lambda p: self._get_year_on_year_aggs_result(p["query"]), {"query": copy_query}
+        )
+
+        multi_result = multi_execute_func.run()
+
+        multi_result["new_class"] = new_class_query_result
+
+        return multi_result
+
     def _multi_query(self):
         multi_execute_func = MultiExecuteFunc()
         multi_execute_func.append(
@@ -278,12 +316,15 @@ def _build_aggs_group(self):
             aggs_group = aggs_group["sub_fields"]
         return aggs_group_reuslt
 
-    def _get_year_on_year_aggs_result(self) -> dict:
+    def _get_year_on_year_aggs_result(self, query=None) -> dict:
         if self._year_on_year_hour == MIN_COUNT:
             return {}
-        new_query = copy.deepcopy(self._query)
+        if query:
+            new_query = copy.deepcopy(query)
+        else:
+            new_query = copy.deepcopy(self._query)
         start_time, end_time = generate_time_range_shift(
-            self._query["start_time"], self._query["end_time"], self._year_on_year_hour * HOUR_MINUTES
+            new_query["start_time"], new_query["end_time"], self._year_on_year_hour * HOUR_MINUTES
         )
         new_query["start_time"] = start_time.strftime("%Y-%m-%d %H:%M:%S")
         new_query["end_time"] = end_time.strftime("%Y-%m-%d %H:%M:%S")