Kouhei Sutou
null+****@clear*****
Wed Jul 25 18:45:42 JST 2018
Kouhei Sutou 2018-07-25 18:45:42 +0900 (Wed, 25 Jul 2018) New Revision: 6e52cd609b4d78d484c59c7d4a5f9413959aa569 https://github.com/mroonga/mroonga/commit/6e52cd609b4d78d484c59c7d4a5f9413959aa569 Message: Put tokenizer parameter details into ParametersParser Modified files: ha_mroonga.cpp lib/mrn_parameters_parser.cpp lib/mrn_parameters_parser.hpp Modified: ha_mroonga.cpp (+1 -12) =================================================================== --- ha_mroonga.cpp 2018-07-25 16:11:06 +0900 (83a92063) +++ ha_mroonga.cpp 2018-07-25 18:45:42 +0900 (94284ba8) @@ -10273,18 +10273,7 @@ void ha_mroonga::set_tokenizer(grn_obj *lexicon, KEY *key) mrn::ParametersParser parser(key->comment.str, key->comment.length); parser.parse(); - const char *parser_value = parser["parser"]; - if (parser_value) { - push_warning_printf(ha_thd(), - MRN_SEVERITY_WARNING, - ER_WARN_DEPRECATED_SYNTAX, - MRN_GET_ERR_MSG(ER_WARN_DEPRECATED_SYNTAX), - "parser", "tokenizer"); - } - const char *tokenizer = parser["tokenizer"]; - if (!tokenizer) { - tokenizer = parser_value; - } + const char *tokenizer = parser.tokenizer(); if (tokenizer) { set_tokenizer(lexicon, tokenizer); DBUG_VOID_RETURN; Modified: lib/mrn_parameters_parser.cpp (+16 -0) =================================================================== --- lib/mrn_parameters_parser.cpp 2018-07-25 16:11:06 +0900 (bc075b07) +++ lib/mrn_parameters_parser.cpp 2018-07-25 18:45:42 +0900 (f676d175) @@ -174,4 +174,20 @@ namespace mrn { } return NULL; } + + const char *ParametersParser::tokenizer() { + const char *parser = (*this)["parser"]; + if (parser) { + push_warning_printf(current_thd, + MRN_SEVERITY_WARNING, + ER_WARN_DEPRECATED_SYNTAX, + MRN_GET_ERR_MSG(ER_WARN_DEPRECATED_SYNTAX), + "parser", "tokenizer"); + } + const char *tokenizer = (*this)["tokenizer"]; + if (!tokenizer) { + tokenizer = parser; + } + return tokenizer; + } } Modified: lib/mrn_parameters_parser.hpp (+1 -0) =================================================================== --- lib/mrn_parameters_parser.hpp 2018-07-25 16:11:06 +0900 (a15371ca) +++ lib/mrn_parameters_parser.hpp 2018-07-25 18:45:42 +0900 (ec05a9c1) @@ -31,6 +31,7 @@ namespace mrn { ~ParametersParser(); void parse(); const char *operator[](const char *key); + const char *tokenizer(); private: const char *input_; -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180725/72c55357/attachment-0001.htm
