From 0b237a07a8adb5857c983bea5ba022ffc0608376 Mon Sep 17 00:00:00 2001
From: zhengchao <zhengchao@iie.ac.cn>
Date: Fri, 26 Oct 2018 10:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86Maat=20Redis=20Key=E4=B8=ADrule=20id?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=BB=8Eint=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=BAlong=E3=80=82=E4=BB=A5=E6=BB=A1=E8=B6=B3=E7=9B=98?=
 =?UTF-8?q?=E5=8F=A4=E9=A1=B9=E7=9B=AE=EF=BC=8C=E4=BD=BF=E7=94=A8compile?=
 =?UTF-8?q?=20id=20+=20group=20id=E6=8B=BC=E6=8E=A5=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E8=A1=A8redis=20key=E7=9A=84rule=20id?=
 =?UTF-8?q?=E7=9A=84=E9=9C=80=E6=B1=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/CMakeLists.txt                    |  2 +-
 src/entry/Maat_command.cpp            | 14 +++++++-------
 src/entry/Maat_rule.cpp               |  2 +-
 src/inc_internal/Maat_rule_internal.h |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c220b0f..373448c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ project(maatframe)
 
 set(MAAT_FRAME_MAJOR_VERSION 2)
 set(MAAT_FRAME_MINOR_VERSION 3)
-set(MAAT_FRAME_PATCH_VERSION 20181025)
+set(MAAT_FRAME_PATCH_VERSION 20181026)
 set(MAAT_FRAME_VERSION ${MAAT_FRAME_MAJOR_VERSION}.${MAAT_FRAME_MINOR_VERSION}.${MAAT_FRAME_PATCH_VERSION})
 
 message(STATUS "Maat Frame, Version: ${MAAT_FRAME_VERSION}")
diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp
index d900913..63fd2f6 100644
--- a/src/entry/Maat_command.cpp
+++ b/src/entry/Maat_command.cpp
@@ -391,7 +391,7 @@ int get_inc_key_list(long long instance_version, long long target_version, redis
 	for(i=0, j=0;i<reply->elements;i++)
 	{
 		assert(reply->element[i]->type==REDIS_REPLY_STRING);
-		ret=sscanf(reply->element[i]->str,"%[^,],%[^,],%d",op_str,s_rule[j].table_name,&(s_rule[j].rule_id));
+		ret=sscanf(reply->element[i]->str,"%[^,],%[^,],%ld",op_str,s_rule[j].table_name,&(s_rule[j].rule_id));
 		if(ret!=3||s_rule[i].rule_id<0)
 		{
 			MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
@@ -464,14 +464,14 @@ int recovery_history_version(const struct serial_rule_t* current, int current_nu
 
 	for(i=0;i<current_num;i++)
 	{
-		snprintf(hkey,sizeof(hkey),"%d,%s",current[i].rule_id,current[i].table_name);
+		snprintf(hkey,sizeof(hkey),"%ld,%s",current[i].rule_id,current[i].table_name);
 		ret=MESA_htable_add(htable, (uchar*)hkey, strlen(hkey), current+i);
 		assert(ret>0);
 	}
 
 	for(i=changed_num-1;i>=0;i--)
 	{
-		snprintf(hkey,sizeof(hkey),"%d,%s",changed[i].rule_id,changed[i].table_name);
+		snprintf(hkey,sizeof(hkey),"%ld,%s",changed[i].rule_id,changed[i].table_name);
 		if(changed[i].op==MAAT_OP_ADD)//newly added rule is need to delete from current, so that history version can be recovered.
 		{
 			ret=MESA_htable_del(htable, (uchar*)hkey, strlen(hkey), NULL);
@@ -643,7 +643,7 @@ FULL_UPDATE:
 											"Invalid Redis Key Type: %d", sub_reply->element[i]->type);
 			continue;
 		}
-		ret=sscanf(sub_reply->element[i]->str,"%*[^:]:%[^,],%d",s_rule_array[full_idx].table_name,&(s_rule_array[full_idx].rule_id));
+		ret=sscanf(sub_reply->element[i]->str,"%*[^:]:%[^,],%ld",s_rule_array[full_idx].table_name,&(s_rule_array[full_idx].rule_id));
 		s_rule_array[full_idx].op=MAAT_OP_ADD;
 		if(ret!=2||s_rule_array[full_idx].rule_id<0||strlen(s_rule_array[full_idx].table_name)==0)
 		{
@@ -699,7 +699,7 @@ int _get_maat_redis_value(redisContext *c,struct serial_rule_t* rule_list,int ru
 	redisReply* reply=NULL;
 	for(i=0;i<rule_num;i++)
 	{
-		snprintf(redis_cmd,sizeof(redis_cmd),"GET %s:%s,%d",rm_key_prefix[rule_list[i].op]
+		snprintf(redis_cmd,sizeof(redis_cmd),"GET %s:%s,%ld",rm_key_prefix[rule_list[i].op]
 				,rule_list[i].table_name
 				,rule_list[i].rule_id);
 		ret=redisAppendCommand(c, redis_cmd);
@@ -739,7 +739,7 @@ int _get_maat_redis_value(redisContext *c,struct serial_rule_t* rule_list,int ru
 	for(i=0;i<failed_cnt;i++)
 	{
 		idx=retry_ids[i];
-		snprintf(redis_cmd,sizeof(redis_cmd),"GET %s:%s,%d",rm_key_prefix[MAAT_OP_DEL]
+		snprintf(redis_cmd,sizeof(redis_cmd),"GET %s:%s,%ld",rm_key_prefix[MAAT_OP_DEL]
 				,rule_list[idx].table_name
 				,rule_list[idx].rule_id);
 		ret=redisAppendCommand(c, redis_cmd);
@@ -1365,7 +1365,7 @@ void check_maat_expiration(redisContext *ctx, void *logger)
 	for(i=0;i<s_rule_num;i++)
 	{
 		s_rule[i].op=MAAT_OP_DEL;
-		ret=sscanf(data_reply->element[i]->str,"%[^,],%d",s_rule[i].table_name,&(s_rule[i].rule_id));
+		ret=sscanf(data_reply->element[i]->str,"%[^,],%ld",s_rule[i].table_name,&(s_rule[i].rule_id));
 		assert(ret==2);
 	}
 	freeReplyObject(data_reply);
diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp
index 810b0e5..f6bda98 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_2_20181025=1;
+int MAAT_FRAME_VERSION_2_2_20181026=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/inc_internal/Maat_rule_internal.h b/src/inc_internal/Maat_rule_internal.h
index 55bb52d..7ce5d08 100644
--- a/src/inc_internal/Maat_rule_internal.h
+++ b/src/inc_internal/Maat_rule_internal.h
@@ -470,7 +470,7 @@ struct foreign_key
 struct serial_rule_t		//rm= Redis Maat
 {
 	enum MAAT_OPERATION op;//0: delete, 1: add.
-	int rule_id;
+	long rule_id;
 	int label_id;
 	long long timeout;			// absolute unix time.
 	char table_name[256];