gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加异常处理，修复#19

Browse Source
This commit is contained in:
zhengchao
2019-08-27 09:24:42 +08:00
parent 9e29df54f1
commit 9e0ae6f10d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/entry/Maat_api.cpp
View File

@@ -982,7 +982,11 @@ int Maat_table_callback_register(Maat_feather_t feather,short table_id,
pthread_mutex_unlock(&(_feather->background_update_mutex));
return -1;
}
if(!_feather->scanner)
{
pthread_mutex_unlock(&(_feather->background_update_mutex));
return 1;
}
const char* line=NULL;
struct Maat_table_runtime* table_rt=NULL;
table_rt=Maat_table_runtime_get(_feather->scanner->table_rt_mgr, table_id);

6
src/entry/Maat_command.cpp
View File

@@ -2374,7 +2374,7 @@ int Maat_cmd_commit(Maat_feather_t feather)
int Maat_cmd_commit(Maat_feather_t feather)
{
_Maat_feather_t* _feather=(_Maat_feather_t*)feather;
int ret=-1, i=0;
int new_region_num=0,new_group_num=0;
int serial_rule_num=0,serial_rule_idx=0;
@@ -2386,7 +2386,7 @@ int Maat_cmd_commit(Maat_feather_t feather)
struct serial_rule_t* s_rule=NULL;
if(_feather->input_mode!=SOURCE_REDIS)
{
{
return ret;
}
if(_feather->cmd_q_cnt==0)
@@ -2414,7 +2414,6 @@ int Maat_cmd_commit(Maat_feather_t feather)
data_reply=_wrap_redisCommand(write_ctx,"INCRBY %s %d", mr_region_id_var, new_region_num);
if(data_reply->type!=REDIS_REPLY_INTEGER)
{
freeReplyObject(data_reply);
freeReplyObject(data_reply);
goto error_out;
}
@@ -2424,7 +2423,6 @@ int Maat_cmd_commit(Maat_feather_t feather)
data_reply=_wrap_redisCommand(write_ctx,"INCRBY %s %d", mr_group_id_var, new_group_num);
if(data_reply->type!=REDIS_REPLY_INTEGER)
{
freeReplyObject(data_reply);
freeReplyObject(data_reply);
goto error_out;
}

2
src/entry/Maat_rule.cpp
View File

@@ -33,7 +33,7 @@
#include "stream_fuzzy_hash.h"
#include "gram_index_engine.h"
int MAAT_FRAME_VERSION_2_8_20190816=1;
int MAAT_FRAME_VERSION_2_8_20190827=1;
int is_valid_table_name(const char* str)
{