From fb9f5587ef9dac404ab98a57199d01500e70ac7a Mon Sep 17 00:00:00 2001 From: zhengchao Date: Thu, 19 Sep 2019 20:09:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=9A=E4=B8=8A?= =?UTF-8?q?=E6=AC=A1=E6=8F=90=E4=BA=A4=E6=9C=AA=E5=BD=BB=E5=BA=95=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E9=85=8D=E7=BD=AEID=E9=87=8D=E7=94=A8=E6=97=B6?= =?UTF-8?q?=E5=A4=96=E9=94=AE=E6=96=87=E4=BB=B6=E6=97=A0=E6=95=88=E7=9A=84?= =?UTF-8?q?bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_command.cpp | 14 +++++--------- src/inc_internal/Maat_rule_internal.h | 1 - 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp index 3496ef8..51d407d 100644 --- a/src/entry/Maat_command.cpp +++ b/src/entry/Maat_command.cpp @@ -1607,10 +1607,9 @@ void rewrite_table_line_with_foreign(struct serial_rule_t*p) } void _get_foregin_keys(struct serial_rule_t* p_rule, int* foreign_columns, int n_foreign, const char* dir, void* logger) { - int ret=0, i=0; + int i=0; const char* p_foreign=NULL; int foreign_key_size=0; - struct stat file_info; p_rule->n_foreign=n_foreign; p_rule->f_keys=ALLOC(struct foreign_key, n_foreign); for(i=0; if_keys[i].key=(char*)calloc(sizeof(char),foreign_key_size+1); memcpy(p_rule->f_keys[i].key, p_foreign, foreign_key_size); - p_rule->f_keys[i].filename=get_foreign_cont_filename(p_rule->table_name, p_rule->rule_id, p_rule->f_keys[i].key, dir); - ret=stat(p_rule->f_keys[i].filename, &file_info); - if(ret==0) - { - p_rule->f_keys[i].is_existed=1; - } } if(i!=n_foreign) { @@ -1729,6 +1722,8 @@ void _get_foreign_conts(redisContext *ctx, struct serial_rule_t* rule_list, int redisReply* reply=NULL; struct serial_rule_t*p=NULL; FILE* fp=NULL; + struct stat file_info; + for(i=0;in_foreign; j++) { - if(p->f_keys[j].is_existed==1) + ret=stat(p->f_keys[i].filename, &file_info); + if(ret==0) { continue; } diff --git a/src/inc_internal/Maat_rule_internal.h b/src/inc_internal/Maat_rule_internal.h index ecef3d2..8ccdb81 100644 --- a/src/inc_internal/Maat_rule_internal.h +++ b/src/inc_internal/Maat_rule_internal.h @@ -396,7 +396,6 @@ struct _maat_garbage_t struct foreign_key { int column; - int is_existed; char* key; char* filename; };