null+****@clear*****
null+****@clear*****
2011年 9月 25日 (日) 23:17:08 JST
Kouhei Sutou 2011-09-25 14:17:08 +0000 (Sun, 25 Sep 2011)
New Revision: 0c125c857baa8fb3c4bb9fbaf9c16f82fc35e7f6
Log:
tokenizer -> parser.
Modified files:
configure.ac
ha_mroonga.cc
mrn_sys.h
Renamed files:
test/sql/groonga_storage/r/fulltext_parser_comment.result
(from test/sql/groonga_storage/r/fulltext_tokenizer.result)
test/sql/groonga_storage/t/fulltext_parser_comment.test
(from test/sql/groonga_storage/t/fulltext_tokenizer.test)
test/sql/groonga_wrapper/r/fulltext_parser_comment.result
(from test/sql/groonga_wrapper/r/fulltext_tokenizer.result)
test/sql/groonga_wrapper/t/fulltext_parser_comment.test
(from test/sql/groonga_wrapper/t/fulltext_tokenizer.test)
Modified: configure.ac (+10 -10)
===================================================================
--- configure.ac 2011-09-25 14:09:33 +0000 (4efa015)
+++ configure.ac 2011-09-25 14:17:08 +0000 (c84f03e)
@@ -167,17 +167,17 @@ AC_SUBST(plugindir)
CONFIG_OPTION_MECAB
CONFIG_OPTION_GROONGA
-AC_ARG_WITH(default_tokenizer,
- [AC_HELP_STRING([--with-default-tokenizer=TOKENIZER],
- [specify the default tokenizer like
- --with-default-tokenizer=TokenMecab.
+AC_ARG_WITH(default_parser,
+ [AC_HELP_STRING([--with-default-parser=PARSER],
+ [specify the default fulltext parser like
+ --with-default-parser=TokenMecab.
(default: TokenBigram)])],
- [default_tokenizer=$withval],
- [default_tokenizer=no])
-if test x"$default_tokenizer" != x"no"; then
- AC_DEFINE_UNQUOTED(MRN_TOKENIZER_DEFAULT,
- "$default_tokenizer",
- "specified default tokenizer")
+ [default_parser=$withval],
+ [default_parser=no])
+if test x"$default_parser" != x"no"; then
+ AC_DEFINE_UNQUOTED(MRN_PARSER_DEFAULT,
+ "$default_parser",
+ "specified default fulltext parser")
fi
# check Cutter with GLib support if available
Modified: ha_mroonga.cc (+9 -8)
===================================================================
--- ha_mroonga.cc 2011-09-25 14:09:33 +0000 (d6f6e50)
+++ ha_mroonga.cc 2011-09-25 14:17:08 +0000 (2b8fd65)
@@ -240,7 +240,7 @@ static void mrn_default_parser_update(THD *thd, struct st_mysql_sys_var *var,
grn_ctx ctx;
grn_ctx_init(&ctx, 0);
GRN_LOG(&ctx, GRN_LOG_NOTICE,
- "default tokenizer changed from '%s' to '%s'",
+ "default parser changed from '%s' to '%s'",
old_value, new_value);
grn_ctx_fin(&ctx);
strcpy(mrn_default_parser_name, new_value);
@@ -253,7 +253,7 @@ static MYSQL_SYSVAR_STR(default_parser, mrn_default_parser,
"default fulltext parser",
NULL,
mrn_default_parser_update,
- MRN_TOKENIZER_DEFAULT);
+ MRN_PARSER_DEFAULT);
struct st_mysql_sys_var *mrn_system_variables[] =
{
@@ -5256,21 +5256,22 @@ grn_obj *ha_mroonga::find_tokenizer(const char *name, int name_length)
if (!tokenizer) {
char message[MRN_BUFFER_SIZE];
sprintf(message,
- "specified tokenizer <%.*s> doesn't exist. "
- "default tokenizer <%s> is used instead.",
+ "specified fulltext parser <%.*s> doesn't exist. "
+ "default fulltext parser <%s> is used instead.",
name_length, name,
- MRN_TOKENIZER_DEFAULT);
+ MRN_PARSER_DEFAULT);
push_warning(ha_thd(),
MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNSUPPORTED_EXTENSION,
message);
tokenizer = grn_ctx_get(ctx,
- MRN_TOKENIZER_DEFAULT,
- strlen(MRN_TOKENIZER_DEFAULT));
+ MRN_PARSER_DEFAULT,
+ strlen(MRN_PARSER_DEFAULT));
}
if (!tokenizer) {
push_warning(ha_thd(),
MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNSUPPORTED_EXTENSION,
- "couldn't find tokenizer. use bigram tokenizer instead.");
+ "couldn't find fulltext parser. "
+ "Bigram fulltext parser is used instead.");
tokenizer = grn_ctx_at(ctx, GRN_DB_BIGRAM);
}
DBUG_RETURN(tokenizer);
Modified: mrn_sys.h (+2 -2)
===================================================================
--- mrn_sys.h 2011-09-25 14:09:33 +0000 (3e8bf26)
+++ mrn_sys.h 2011-09-25 14:17:08 +0000 (2bae815)
@@ -37,8 +37,8 @@
#define MRN_COLUMN_NAME_ID "_id"
#define MRN_COLUMN_NAME_KEY "_key"
#define MRN_COLUMN_NAME_SCORE "_score"
-#ifndef MRN_TOKENIZER_DEFAULT
-# define MRN_TOKENIZER_DEFAULT "TokenBigram"
+#ifndef MRN_PARSER_DEFAULT
+# define MRN_PARSER_DEFAULT "TokenBigram"
#endif
/* functions */
Renamed: test/sql/groonga_storage/r/fulltext_parser_comment.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/t/fulltext_parser_comment.test (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/r/fulltext_parser_comment.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/t/fulltext_parser_comment.test (+0 -0) 100%
===================================================================