From 73ac91b6b920bdaff68ac8eb43a0bb6c4cb2fd7a Mon Sep 17 00:00:00 2001 From: zhengchao Date: Thu, 10 Jan 2019 19:18:37 +0600 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3stat=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E7=9A=84sum=E8=A1=8C=E5=91=BD=E4=B8=AD=E7=8E=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E7=9A=84=E4=B8=8D=E5=87=86=E7=A1=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_rule.cpp | 2 +- src/entry/Maat_stat.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 62ba330..85f7f23 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -32,7 +32,7 @@ #include "stream_fuzzy_hash.h" #include "gram_index_engine.h" -int MAAT_FRAME_VERSION_2_6_20190107=1; +int MAAT_FRAME_VERSION_2_6_20190110=1; const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""}; diff --git a/src/entry/Maat_stat.cpp b/src/entry/Maat_stat.cpp index 61bf6d8..c5e4daf 100644 --- a/src/entry/Maat_stat.cpp +++ b/src/entry/Maat_stat.cpp @@ -73,7 +73,7 @@ void maat_stat_init(struct _Maat_feather_t* feather) feather->fs_status_id[STATUS_INNER_MID_NUM]=FS_register(feather->stat_handle, FS_STYLE_STATUS, FS_CALC_CURRENT,"inner_mid"); feather->fs_status_id[STATUS_ZOMBIE_RS_STREAM]=FS_register(feather->stat_handle, FS_STYLE_STATUS, FS_CALC_CURRENT,"z_stream"); - feather->fs_status_id[STATUS_ORPHAN_GROUP_SAVING]=FS_register(feather->stat_handle, FS_STYLE_STATUS, FS_CALC_CURRENT,"shutcut_sv"); + feather->fs_status_id[STATUS_ORPHAN_GROUP_SAVING]=FS_register(feather->stat_handle, FS_STYLE_STATUS, FS_CALC_CURRENT,"shortcut_sv"); feather->fs_status_id[STATUS_NOT_GROUP_HIT]=FS_register(feather->stat_handle, FS_STYLE_STATUS, FS_CALC_CURRENT,"nt_grp_hit"); feather->fs_status_id[STATUS_TOTAL_SCAN_LEN]=FS_register(feather->stat_handle, FS_STYLE_STATUS, FS_CALC_CURRENT,"scan_bytes"); @@ -342,6 +342,7 @@ void maat_stat_output(struct _Maat_feather_t* feather) total_cpu_time); } total_hit_cnt=alignment_int64_array_sum(feather->hit_cnt, feather->scan_thread_num); + alignment_int64_array_reset(feather->hit_cnt,feather->scan_thread_num); FS_operate(feather->stat_handle, feather->total_stat_id, feather->fs_column_id[COLUMN_TABLE_HIT_CNT],