diff options
| author | zhengchao <[email protected]> | 2018-10-26 10:26:48 +0800 |
|---|---|---|
| committer | zhengchao <[email protected]> | 2018-10-26 10:26:48 +0800 |
| commit | cbd3cf4ab2f5dfae95fae38d1773b71ee17e62ec (patch) | |
| tree | ed58b57dbd4bd4f26d99732cda7998d05ef7497c | |
| parent | 0b237a07a8adb5857c983bea5ba022ffc0608376 (diff) | |
同步修改maat_redis_tool支持64位的Maat redis key。v2.3.3
| -rw-r--r-- | tools/maat_redis_tool.cpp | 6 | ||||
| -rw-r--r-- | vendor/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/maat_redis_tool.cpp b/tools/maat_redis_tool.cpp index 6bbc26d..f9340ce 100644 --- a/tools/maat_redis_tool.cpp +++ b/tools/maat_redis_tool.cpp @@ -34,8 +34,8 @@ static int compare_serial_rule(const void *a, const void *b) struct serial_rule_t *rb=(struct serial_rule_t *)b; char p_str[256],q_str[256]; - snprintf(p_str,sizeof(p_str),"%s.%d",ra->table_name,ra->rule_id); - snprintf(q_str,sizeof(q_str),"%s.%d",rb->table_name,rb->rule_id); + snprintf(p_str,sizeof(p_str),"%s.%ld",ra->table_name,ra->rule_id); + snprintf(q_str,sizeof(q_str),"%s.%ld",rb->table_name,rb->rule_id); return strcmp(p_str,q_str); } static redisContext * connect_redis(const char*redis_ip, int redis_port, int redis_db) @@ -160,7 +160,7 @@ void read_rule_from_redis(redisContext * ctx, long long desire_version, const ch cur_table=rule_list[i].table_name; } - fprintf(table_fp,"%s\tkey=%d\n",rule_list[i].table_line,rule_list[i].rule_id); + fprintf(table_fp,"%s\tkey=%ld\n",rule_list[i].table_line,rule_list[i].rule_id); line_count++; } fclose(table_fp); diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 52db358..9f5a378 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -24,8 +24,8 @@ ExternalProject_Add(hiredis-vip PREFIX hiredis-vip BUILD_IN_SOURCE 1) ExternalProject_Get_Property(hiredis-vip SOURCE_DIR) -set(HTTP_PARSER_INCLUDE_DIRECTORIES ${SOURCE_DIR}) -file(MAKE_DIRECTORY ${HTTP_PARSER_INCLUDE_DIRECTORIES}) +set(HIREDIS_INCLUDE_DIRECTORIES ${SOURCE_DIR}) +file(MAKE_DIRECTORY ${HIREDIS_INCLUDE_DIRECTORIES}) add_library(hiredis-vip-static STATIC IMPORTED GLOBAL) set_property(TARGET hiredis-vip-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/libhiredis_vip.a) |