facebook / mysql-5.6

Facebook's branch of the Oracle MySQL database. This includes MyRocks.
http://myrocks.io
Other
2.47k stars 711 forks source link

Do not define static variables in a header file #1409

Closed laurynas-biveinis closed 5 months ago

laurynas-biveinis commented 6 months ago

Since they are used only once, move them to their respective use locations. This fixes a GCC compilation error:

In file included from /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/rdb_nosql_digest.cc:1: /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:28:20: error: ‘myrocks::desc_tok’ defined but not used [-Werror=unused-variable] 28 | static LEX_CSTRING desc_tok{STRING_WITH_LEN("DESC")}; | ^~~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:27:20: error: ‘myrocks::asc_tok’ defined but not used [-Werror=unused-variable] 27 | static LEX_CSTRING asc_tok{STRING_WITH_LEN("ASC")}; | ^~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:26:20: error: ‘myrocks::limit_tok’ defined but not used [-Werror=unused-variable] 26 | static LEX_CSTRING limit_tok{STRING_WITH_LEN("LIMIT")}; | ^~~~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:25:20: error: ‘myrocks::by_tok’ defined but not used [-Werror=unused-variable] 25 | static LEX_CSTRING by_tok{STRING_WITH_LEN("BY")}; | ^~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:24:20: error: ‘myrocks::order_tok’ defined but not used [-Werror=unused-variable] 24 | static LEX_CSTRING order_tok{STRING_WITH_LEN("ORDER")}; | ^~~~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:23:20: error: ‘myrocks::index_tok’ defined but not used [-Werror=unused-variable] 23 | static LEX_CSTRING index_tok{STRING_WITH_LEN("INDEX")}; | ^~~~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:22:20: error: ‘myrocks::force_tok’ defined but not used [-Werror=unused-variable] 22 | static LEX_CSTRING force_tok{STRING_WITH_LEN("FORCE")}; | ^~~~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:21:20: error: ‘myrocks::where_tok’ defined but not used [-Werror=unused-variable] 21 | static LEX_CSTRING where_tok{STRING_WITH_LEN("WHERE")}; | ^~~~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:20:20: error: ‘myrocks::from_tok’ defined but not used [-Werror=unused-variable] 20 | static LEX_CSTRING from_tok{STRING_WITH_LEN("FROM")}; | ^~~~ /home/laurynas/vilniusdb/fb-mysql/storage/rocksdb/./rdb_nosql_digest.h:19:20: error: ‘myrocks::select_tok’ defined but not used [-Werror=unused-variable] 19 | static LEX_CSTRING select_tok{STRING_WITH_LEN("SELECT")}; | ^~~~~~

facebook-github-bot commented 6 months ago

@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

facebook-github-bot commented 5 months ago

@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

facebook-github-bot commented 5 months ago

This pull request has been merged in facebook/mysql-5.6@06d2b8355848fc8052a5a102711c55679468cb81.