diff --git a/src/entry/Maat_api.cpp b/src/entry/Maat_api.cpp index c9b75f2..583b2b2 100644 --- a/src/entry/Maat_api.cpp +++ b/src/entry/Maat_api.cpp @@ -1934,8 +1934,13 @@ void Maat_stream_scan_string_end(stream_para_t* stream_para) { struct _stream_para_t* sp=(struct _stream_para_t*)(*stream_para); struct Maat_scanner_t* scanner=sp->feather->scanner; - struct Maat_table_runtime* table_rt=scanner->table_rt[sp->table_id]; - alignment_int64_array_add(table_rt->stream_num, sp->thread_num, -1); + struct Maat_table_runtime* table_rt=NULL; + if(scanner!=NULL) + { + table_rt=scanner->table_rt[sp->table_id]; + alignment_int64_array_add(table_rt->stream_num, sp->thread_num, -1); + + } if(sp->rs_stream_para!=NULL) { if(scanner!=NULL&&sp->version>=sp->feather->last_full_version) diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 85f7f23..e2561e0 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_20190110=1; +int MAAT_FRAME_VERSION_2_6_20190118=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",""}; @@ -2474,8 +2474,7 @@ void update_group_rule(struct Maat_table_desc* table,const char* table_line,stru &(db_group_rule.compile_id), &(db_group_rule.is_valid), &(db_group_rule.not_flag)); - if((ret!=3&&ret!=4) || - (db_group_rule.not_flag!=0&&db_group_rule.not_flag!=1)) + if(ret!=3&&ret!=4) { MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module , "update error,invalid format of group table %s:%s", @@ -2483,6 +2482,10 @@ void update_group_rule(struct Maat_table_desc* table,const char* table_line,stru table->udpate_err_cnt++; return; } + if(db_group_rule.not_flag!=1)//compatible to old format that 4th column is op_time + { + db_group_rule.not_flag=0; + } if(db_group_rule.is_valid==FALSE) { del_group_rule(table, &db_group_rule, scanner, logger);