From fb4043f225ac033350126c287ee5fb6ba7e28026 Mon Sep 17 00:00:00 2001 From: liuwentan Date: Wed, 15 Mar 2023 14:07:29 +0800 Subject: [PATCH] change sudo make -> make --- src/maat_command.c | 28 ++++++++++++++-------------- src/maat_redis_monitor.c | 11 +---------- test/maat_framework_gtest.cpp | 8 +++----- vendor/CMakeLists.txt | 12 ++++++------ 4 files changed, 24 insertions(+), 35 deletions(-) diff --git a/src/maat_command.c b/src/maat_command.c index fbcc1ee..b3d0959 100644 --- a/src/maat_command.c +++ b/src/maat_command.c @@ -150,7 +150,7 @@ int redis_flushDB(redisContext *ctx, int db_index, struct log_handle *logger) for (int i = 0; i < append_cmd_cnt; i++) { ret = maat_cmd_wrap_redis_get_reply(ctx, &data_reply); if (ret == REDIS_OK) { - if (0 == mr_transaction_success(data_reply)) { + if (data_reply->type == REDIS_REPLY_NIL) { redis_transaction_success = 0; } freeReplyObject(data_reply); @@ -167,6 +167,19 @@ int redis_flushDB(redisContext *ctx, int db_index, struct log_handle *logger) return redis_transaction_success; } +static int connect_redis_for_write(struct source_redis_ctx *mr_ctx, + struct log_handle *logger) +{ + assert(mr_ctx->write_ctx == NULL); + mr_ctx->write_ctx = maat_cmd_connect_redis(mr_ctx->redis_ip, mr_ctx->redis_port, + mr_ctx->redis_db, logger); + if (NULL == mr_ctx->write_ctx) { + return -1; + } else { + return 0; + } +} + redisContext *get_redis_ctx_for_write(struct maat *maat_instance) { if (NULL == maat_instance->mr_ctx.write_ctx) { @@ -216,19 +229,6 @@ void maat_cmd_clear_rule_cache(struct serial_rule *s_rule) memset(s_rule, 0, sizeof(struct serial_rule)); } -int connect_redis_for_write(struct source_redis_ctx *mr_ctx, - struct log_handle *logger) -{ - assert(mr_ctx->write_ctx == NULL); - mr_ctx->write_ctx = maat_cmd_connect_redis(mr_ctx->redis_ip, mr_ctx->redis_port, - mr_ctx->redis_db, logger); - if (NULL == mr_ctx->write_ctx) { - return -1; - } else { - return 0; - } -} - void maat_cmd_set_serial_rule(struct serial_rule *rule, enum maat_operation op, long long rule_id, const char *table_name, const char *line, long long timeout) diff --git a/src/maat_redis_monitor.c b/src/maat_redis_monitor.c index 73fe261..2947e4f 100644 --- a/src/maat_redis_monitor.c +++ b/src/maat_redis_monitor.c @@ -1097,15 +1097,6 @@ void exec_serial_rule(redisContext *c, const char *transaction_list, } } -int mr_transaction_success(redisReply *data_reply) -{ - if (data_reply->type == REDIS_REPLY_NIL) { - return 0; - } else { - return 1; - } -} - int mr_operation_success(redisReply *actual_reply, struct expected_reply *expected) { if (expected->possible_replies[0].type != actual_reply->type) { @@ -1179,7 +1170,7 @@ int maat_cmd_write_rule(redisContext *c, struct serial_rule *s_rule, transaction_reply = exec_serial_rule_end(c, transaction_list, server_time, renew_allowed, expected_reply, &multi_cmd_cnt); - if (1 == mr_transaction_success(transaction_reply)) { + if (transaction_reply->type != REDIS_REPLY_NIL) { assert(transaction_reply->elements == multi_cmd_cnt); for (i = 0; i < multi_cmd_cnt; i++) { p = transaction_reply->element[i]; diff --git a/test/maat_framework_gtest.cpp b/test/maat_framework_gtest.cpp index 5ab9268..6dd7126 100644 --- a/test/maat_framework_gtest.cpp +++ b/test/maat_framework_gtest.cpp @@ -497,7 +497,7 @@ TEST_F(MaatFlagScan, FlagPlus) { EXPECT_NE(n_read, 0); maat_state_free(&state); } -#if 1 + class MaatStringScan : public testing::Test { protected: @@ -2488,9 +2488,8 @@ TEST_F(MaatCmdTest, SetIP) { IPv4, "mask", src_ip, src_ip_mask, 0); EXPECT_EQ(ret, 1); - //version_before = maat_cmd_get_config_version(maat_instance); - //wait_for_cmd_effective(maat_instance, version_before); - sleep(WAIT_FOR_EFFECTIVE_S * 2); + version_before = maat_cmd_get_config_version(maat_instance); + wait_for_cmd_effective(maat_instance, version_before); uint32_t sip; ret = inet_pton(AF_INET, src_ip, &sip); @@ -2759,7 +2758,6 @@ TEST_F(MaatCmdTest, PluginEXData) { table_id, key2); ASSERT_TRUE(uinfo == NULL); } -#endif int main(int argc, char ** argv) { diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index c29d99d..e79b4a3 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -25,7 +25,7 @@ set_property(TARGET gtest_static PROPERTY INTERFACE_LINK_LIBRARIES pthread) # colm-0.13.0.5 ExternalProject_Add(colm PREFIX colm URL ${CMAKE_CURRENT_SOURCE_DIR}/colm-0.13.0.5.tar.gz - CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=/usr --libdir=/usr/lib64 + CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=${VENDOR_BUILD} BUILD_COMMAND make INSTALL_COMMAND make install BUILD_IN_SOURCE 1) @@ -33,7 +33,7 @@ ExternalProject_Add(colm PREFIX colm # ragel-7.0.0.10 ExternalProject_Add(ragel PREFIX ragel URL ${CMAKE_CURRENT_SOURCE_DIR}/ragel-7.0.0.10.tar.gz - CONFIGURE_COMMAND ./autogen.sh && ./configure + CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=${VENDOR_BUILD} DEPENDS colm BUILD_COMMAND make INSTALL_COMMAND make install @@ -80,15 +80,15 @@ endif() ExternalProject_Add(igraph PREFIX igraph URL ${CMAKE_CURRENT_SOURCE_DIR}/igraph-0.7.1.tar.gz URL_MD5 4f6e7c16b45fce8ed423516a9786e4e8 - CONFIGURE_COMMAND ./configure --prefix= --disable-shared --with-pic + CONFIGURE_COMMAND ./configure --prefix=${VENDOR_BUILD} --disable-shared --with-pic BUILD_COMMAND make INSTALL_COMMAND make install BUILD_IN_SOURCE 1) ExternalProject_Get_Property(igraph INSTALL_DIR) -file(MAKE_DIRECTORY ${INSTALL_DIR}/include) +file(MAKE_DIRECTORY ${VENDOR_BUILD}/include) add_library(igraph-static STATIC IMPORTED GLOBAL) add_dependencies(igraph-static igraph) -set_property(TARGET igraph-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libigraph.a) -set_property(TARGET igraph-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) \ No newline at end of file +set_property(TARGET igraph-static PROPERTY IMPORTED_LOCATION ${VENDOR_BUILD}/lib/libigraph.a) +set_property(TARGET igraph-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VENDOR_BUILD}/include) \ No newline at end of file