hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1346: Make Rule methods const

Browse Source 
Most of the methods can be const functions.
This commit is contained in:
Markus Mäkelä
2017-09-04 10:25:55 +03:00
parent 3648b5e702
commit fa6f155d29
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/modules/filter/dbfwfilter/rules.cc
View File

@ -39,14 +39,14 @@ Rule::~Rule()
{ {
} }
bool Rule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) bool Rule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
*msg = create_error("Permission denied at this time."); *msg = create_error("Permission denied at this time.");
MXS_NOTICE("rule '%s': query denied at this time.", name().c_str()); MXS_NOTICE("rule '%s': query denied at this time.", name().c_str());
return true; return true;
} }
bool Rule::matches_query_type(GWBUF* buffer) bool Rule::matches_query_type(GWBUF* buffer) const
{ {
qc_query_op_t optype = qc_get_operation(buffer); qc_query_op_t optype = qc_get_operation(buffer);
@ -66,15 +66,15 @@ const std::string& Rule::type() const
return m_type; return m_type;
} }
bool WildCardRule::matches_query(FW_SESSION* session, GWBUF *queue, char **msg) bool WildCardRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
bool rval = false; bool rval = false;
if (query_is_sql(queue)) if (query_is_sql(buffer))
{ {
const QC_FIELD_INFO* infos; const QC_FIELD_INFO* infos;
size_t n_infos; size_t n_infos;
qc_get_field_info(queue, &infos, &n_infos); qc_get_field_info(buffer, &infos, &n_infos);
for (size_t i = 0; i < n_infos; ++i) for (size_t i = 0; i < n_infos; ++i)
{ {
@ -90,7 +90,7 @@ bool WildCardRule::matches_query(FW_SESSION* session, GWBUF *queue, char **msg)
return rval; return rval;
} }
bool NoWhereClauseRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) bool NoWhereClauseRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
bool rval = false; bool rval = false;
@ -105,7 +105,7 @@ bool NoWhereClauseRule::matches_query(FW_SESSION* session, GWBUF* buffer, char**
return rval; return rval;
} }
bool RegexRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) bool RegexRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
bool rval = false; bool rval = false;
@ -132,7 +132,7 @@ bool RegexRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg)
return rval; return rval;
} }
bool ColumnsRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) bool ColumnsRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
bool rval = false; bool rval = false;
@ -162,7 +162,7 @@ bool ColumnsRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg)
} }
bool FunctionRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) bool FunctionRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
bool rval = false; bool rval = false;
@ -199,7 +199,7 @@ bool FunctionRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg)
return rval; return rval;
} }
bool FunctionUsageRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) bool FunctionUsageRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
if (query_is_sql(buffer)) if (query_is_sql(buffer))
{ {
@ -228,7 +228,7 @@ bool FunctionUsageRule::matches_query(FW_SESSION* session, GWBUF* buffer, char**
return false; return false;
} }
bool LimitQueriesRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) bool LimitQueriesRule::matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const
{ {
if (session->query_speed == NULL) if (session->query_speed == NULL)
{ {

18
server/modules/filter/dbfwfilter/rules.hh
View File

@ -30,14 +30,14 @@ class Rule
public: public:
Rule(std::string name, std::string type = "PERMISSION"); Rule(std::string name, std::string type = "PERMISSION");
virtual ~Rule(); virtual ~Rule();
virtual bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); virtual bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
virtual bool need_full_parsing(GWBUF* buffer) const virtual bool need_full_parsing(GWBUF* buffer) const
{ {
return false; return false;
} }
bool matches_query_type(GWBUF* buffer); bool matches_query_type(GWBUF* buffer) const;
const std::string& name() const; const std::string& name() const;
const std::string& type() const; const std::string& type() const;
@ -73,7 +73,7 @@ public:
return true; return true;
} }
bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
}; };
/** /**
@ -99,7 +99,7 @@ public:
return true; return true;
} }
bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
}; };
@ -138,7 +138,7 @@ public:
{ {
} }
bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
}; };
/** /**
@ -155,7 +155,7 @@ public:
{ {
} }
bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
}; };
@ -173,7 +173,7 @@ public:
{ {
} }
bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
}; };
@ -203,7 +203,7 @@ public:
return true; return true;
} }
bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
private: private:
int m_max; int m_max;
@ -235,7 +235,7 @@ public:
return false; return false;
} }
bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg); bool matches_query(FW_SESSION* session, GWBUF* buffer, char** msg) const;
private: private:
mxs::Closer<pcre2_code*> m_re; mxs::Closer<pcre2_code*> m_re;