Skip to content

Do not define static variables in a header file #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Do not define static variables in a header file #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions storage/rocksdb/nosql_access.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,17 @@ bool inline is_supported_item_func(Item_func::Functype type) {

namespace {

LEX_CSTRING select_tok{STRING_WITH_LEN("SELECT")};
LEX_CSTRING from_tok{STRING_WITH_LEN("FROM")};
LEX_CSTRING where_tok{STRING_WITH_LEN("WHERE")};
LEX_CSTRING force_tok{STRING_WITH_LEN("FORCE")};
LEX_CSTRING index_tok{STRING_WITH_LEN("INDEX")};
LEX_CSTRING order_tok{STRING_WITH_LEN("ORDER")};
LEX_CSTRING by_tok{STRING_WITH_LEN("BY")};
LEX_CSTRING limit_tok{STRING_WITH_LEN("LIMIT")};
LEX_CSTRING asc_tok{STRING_WITH_LEN("ASC")};
LEX_CSTRING desc_tok{STRING_WITH_LEN("DESC")};

bool check_field_name_match(Field *field, const char *field_name) {
return (field->field_name &&
!my_strcasecmp(system_charset_info, field->field_name, field_name));
Expand Down
23 changes: 6 additions & 17 deletions storage/rocksdb/rdb_nosql_digest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,14 @@

namespace myrocks {

static LEX_CSTRING select_tok{STRING_WITH_LEN("SELECT")};
static LEX_CSTRING from_tok{STRING_WITH_LEN("FROM")};
static LEX_CSTRING where_tok{STRING_WITH_LEN("WHERE")};
static LEX_CSTRING force_tok{STRING_WITH_LEN("FORCE")};
static LEX_CSTRING index_tok{STRING_WITH_LEN("INDEX")};
static LEX_CSTRING order_tok{STRING_WITH_LEN("ORDER")};
static LEX_CSTRING by_tok{STRING_WITH_LEN("BY")};
static LEX_CSTRING limit_tok{STRING_WITH_LEN("LIMIT")};
static LEX_CSTRING asc_tok{STRING_WITH_LEN("ASC")};
static LEX_CSTRING desc_tok{STRING_WITH_LEN("DESC")};

static LEX_CSTRING eq_tok{STRING_WITH_LEN("=")};
static LEX_CSTRING lt_tok{STRING_WITH_LEN("<")};
static LEX_CSTRING gt_tok{STRING_WITH_LEN(">")};
static LEX_CSTRING le_tok{STRING_WITH_LEN("<=")};
static LEX_CSTRING ge_tok{STRING_WITH_LEN(">=")};

// This should always be synced with rocksdb::convert_where_op
inline LEX_CSTRING get_op_lex_string(Item_func::Functype op) {
static LEX_CSTRING eq_tok{STRING_WITH_LEN("=")};
static LEX_CSTRING lt_tok{STRING_WITH_LEN("<")};
static LEX_CSTRING gt_tok{STRING_WITH_LEN(">")};
static LEX_CSTRING le_tok{STRING_WITH_LEN("<=")};
static LEX_CSTRING ge_tok{STRING_WITH_LEN(">=")};

switch (op) {
case Item_func::EQ_FUNC:
return eq_tok;
Expand Down