Cache: Make everything C++ and rename some files

server/modules/filter/cache/CMakeLists.txt

@@ -1,5 +1,5 @@
 if (JANSSON_FOUND)
-  add_library(cache SHARED cache.cc rules.c storage.c)
+  add_library(cache SHARED cachefilter.cc rules.cc storage.cc)
   target_link_libraries(cache maxscale-common jansson)
   set_target_properties(cache PROPERTIES VERSION "1.0.0")
   set_target_properties(cache PROPERTIES LINK_FLAGS -Wl,-z,defs)

server/modules/filter/cache/cachefilter.cc

@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "cache.h"
+#include "cachefilter.h"
 #include <maxscale/alloc.h>
 #include <maxscale/filter.h>
 #include <maxscale/gwdirs.h>

server/modules/filter/cache/rules.cc

@@ -20,7 +20,7 @@
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.h>
-#include "cache.h"
+#include "cachefilter.h"
 
 static const char KEY_ATTRIBUTE[] = "attribute";
 static const char KEY_OP[]        = "op";
@@ -41,8 +41,8 @@ static const char VALUE_OP_UNLIKE[] = "unlike";
 
 struct cache_attribute_mapping
 {
-    const char* name;
-    int         value;
+    const char*            name;
+    cache_rule_attribute_t value;
 };
 
 static struct cache_attribute_mapping cache_store_attributes[] =
@@ -51,13 +51,13 @@ static struct cache_attribute_mapping cache_store_attributes[] =
     { VALUE_ATTRIBUTE_DATABASE, CACHE_ATTRIBUTE_DATABASE },
     { VALUE_ATTRIBUTE_QUERY,    CACHE_ATTRIBUTE_QUERY },
     { VALUE_ATTRIBUTE_TABLE,    CACHE_ATTRIBUTE_TABLE },
-    { NULL,                     0 }
+    { NULL,                     static_cast<cache_rule_attribute_t>(0) }
 };
 
 static struct cache_attribute_mapping cache_use_attributes[] =
 {
     { VALUE_ATTRIBUTE_USER, CACHE_ATTRIBUTE_USER },
-    { NULL,                 0 }
+    { NULL,                 static_cast<cache_rule_attribute_t>(0) }
 };
 
 static bool cache_rule_attribute_get(struct cache_attribute_mapping *mapping,
@@ -567,6 +567,7 @@ static CACHE_RULE *cache_rule_create_simple_user(cache_rule_attribute_t attribut
     char *at = strchr(value, '@');
     char *user = value;
     char *host;
+    char any[2]; // sizeof("%")
 
     if (at)
     {
@@ -575,7 +576,8 @@ static CACHE_RULE *cache_rule_create_simple_user(cache_rule_attribute_t attribut
     }
     else
     {
-        host = "%";
+        strcpy(any, "%");
+        host = any;
     }
 
     if (dequote_mysql(user))
@@ -610,7 +612,7 @@ static CACHE_RULE *cache_rule_create_simple_user(cache_rule_attribute_t attribut
                 // No wildcard, no need to use regexp.
 
                 rule = (CACHE_RULE*)MXS_CALLOC(1, sizeof(CACHE_RULE));
-                char *value = MXS_MALLOC(strlen(user) + 1 + strlen(host) + 1);
+                char *value = (char*)MXS_MALLOC(strlen(user) + 1 + strlen(host) + 1);
 
                 if (rule && value)
                 {
@@ -827,7 +829,7 @@ static CACHE_RULE *cache_rule_create_simple_query(cache_rule_attribute_t attribu
     ss_dassert(attribute == CACHE_ATTRIBUTE_QUERY);
     ss_dassert((op == CACHE_OP_EQ) || (op == CACHE_OP_NEQ));
 
-    CACHE_RULE *rule = MXS_CALLOC(1, sizeof(CACHE_RULE));
+    CACHE_RULE *rule = (CACHE_RULE*)MXS_CALLOC(1, sizeof(CACHE_RULE));
     char *value = MXS_STRDUP(cvalue);
 
     if (rule && value)

server/modules/filter/cache/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_executable(testrules testrules.c ../rules.c)
+add_executable(testrules testrules.cc ../rules.cc)
 include_directories(..)
 target_link_libraries(testrules maxscale-common jansson)
 

server/modules/filter/cache/test/testrules.cc

@@ -80,7 +80,7 @@ int test_user()
 {
     int errors = 0;
 
-    for (int i = 0; i < n_user_test_cases; ++i)
+    for (size_t i = 0; i < n_user_test_cases; ++i)
     {
         const struct user_test_case *test_case = &user_test_cases[i];
 
@@ -182,9 +182,9 @@ int test_store()
 {
     int errors = 0;
 
-    for (int i = 0; i < n_store_test_cases; ++i)
+    for (size_t i = 0; i < n_store_test_cases; ++i)
     {
-        printf("TC      : %d\n", i + 1);
+        printf("TC      : %d\n", (int)(i + 1));
         const struct store_test_case *test_case = &store_test_cases[i];
 
         CACHE_RULES *rules = cache_rules_parse(test_case->rule, 0);