From dd98aaa2db160742b6016a531772b9686208b85a Mon Sep 17 00:00:00 2001
From: zhengchao <zhengchao@iie.ac.cn>
Date: Wed, 20 Feb 2019 15:16:04 +0600
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=9A?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95redis=E4=BA=8B=E5=8A=A1=E9=87=8C=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BB=E7=89=88=E6=9C=AC=E5=8F=B7=E5=92=8C=E9=A2=84=E5=A4=87?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E7=9A=84=E5=8F=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entry/Maat_command.cpp | 24 +++++++++++++++++-------
 src/entry/Maat_rule.cpp    |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp
index 6887ab0..c5a8227 100644
--- a/src/entry/Maat_command.cpp
+++ b/src/entry/Maat_command.cpp
@@ -1255,7 +1255,7 @@ int exec_serial_rule(redisContext* ctx,struct serial_rule_t* s_rule, unsigned in
 	unsigned int max_multi_cmd_num=MAX_REDIS_OP_PER_SRULE*serial_rule_num+2;// 2 for operation in _exec_serial_rule_end()
 	
 	struct expected_reply *expected_reply=(struct expected_reply*)calloc(sizeof(struct expected_reply), max_multi_cmd_num);
-	long long new_version=0;
+	long long new_version=0, transaction_finished_version=0;
 	int renew_num=0,ret=0;
 	for(i=0;i<serial_rule_num;i++)
 	{
@@ -1266,7 +1266,7 @@ int exec_serial_rule(redisContext* ctx,struct serial_rule_t* s_rule, unsigned in
 	}
 
 	ret=_exec_serial_rule_begin(ctx,serial_rule_num,renew_num, &renew_allowed, &new_version);
-	if(ret!=0)//Preconditions of transaction is not qualified.
+	if(ret!=0)//Preconditions for transaction are not satisfied.
 	{
 		success_cnt=-1;
 		goto error_out;
@@ -1293,10 +1293,10 @@ int exec_serial_rule(redisContext* ctx,struct serial_rule_t* s_rule, unsigned in
 				continue;
 			}
 			rule_seq=expected_reply[i].srule_seq;
-			MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_command 
-					,"%s %s %d failed, rule id maybe conflict or not exist."
-					,mr_op_str[s_rule[rule_seq].op]
-					,s_rule[rule_seq].table_name,s_rule[rule_seq].rule_id);
+			MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_command,
+					"%s %s %d failed, rule id maybe conflict or not exist.",
+					mr_op_str[s_rule[rule_seq].op],
+					s_rule[rule_seq].table_name,s_rule[rule_seq].rule_id);
 			success_cnt--;
 			last_failed=rule_seq;
 		}
@@ -1304,7 +1304,17 @@ int exec_serial_rule(redisContext* ctx,struct serial_rule_t* s_rule, unsigned in
 	else
 	{
 		success_cnt=-1;
-	}	
+	}
+	if(new_version>0)
+	{
+		transaction_finished_version=read_redis_integer(transaction_reply->element[multi_cmd_cnt-1]);
+		MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_command,
+								"Redis transaction version: %lld, transaction finished version: %lld, status: %s",
+								new_version,
+								transaction_finished_version,
+								transaction_finished_version==new_version?"OK":"Weird");
+	}
+
 	freeReplyObject(transaction_reply);
 	
 error_out:
diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp
index b778e7b..9017822 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_20190127=1;
+int MAAT_FRAME_VERSION_2_6_20190220=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",""};