null+****@clear*****
null+****@clear*****
2011年 9月 22日 (木) 11:29:19 JST
Kouhei Sutou 2011-09-22 02:29:19 +0000 (Thu, 22 Sep 2011)
New Revision: 25cd0815a3e739009f952442cf1db3fe18c7d7cd
Log:
mrn_index_name_gen -> rn_index_table_name_gen.
Modified files:
ha_mroonga.cc
mrn_sys.c
mrn_sys.h
test/unit/test_mrn_sys.c
Modified: ha_mroonga.cc (+8 -8)
===================================================================
--- ha_mroonga.cc 2011-09-22 02:22:16 +0000 (6ec7c3f)
+++ ha_mroonga.cc 2011-09-22 02:29:19 +0000 (c4b5ebe)
@@ -1277,7 +1277,7 @@ int ha_mroonga::wrapper_create_index_table(grn_obj *grn_table,
int error = 0;
char index_name[MRN_MAX_PATH_SIZE];
- mrn_index_name_gen(grn_table_name, key_info->name, index_name);
+ mrn_index_table_name_gen(grn_table_name, key_info->name, index_name);
grn_obj_flags index_table_flags =
GRN_OBJ_TABLE_PAT_KEY |
@@ -1523,7 +1523,7 @@ int ha_mroonga::storage_create(const char *name, TABLE *table,
DBUG_RETURN(error);
}
- mrn_index_name_gen(tbl_name, key_info.name, idx_name);
+ mrn_index_table_name_gen(tbl_name, key_info.name, idx_name);
Field *field = key_info.key_part[0].field;
const char *col_name = field->field_name;
@@ -1900,7 +1900,7 @@ int ha_mroonga::wrapper_open_indexes(const char *name)
}
char index_name[MRN_MAX_PATH_SIZE];
- mrn_index_name_gen(table_name, key_info.name, index_name);
+ mrn_index_table_name_gen(table_name, key_info.name, index_name);
grn_index_tables[i] = grn_ctx_get(ctx, index_name, strlen(index_name));
if (ctx->rc) {
error = ER_CANT_OPEN_FILE;
@@ -2066,7 +2066,7 @@ int ha_mroonga::storage_open_indexes(const char *name)
}
KEY key_info = table->s->key_info[i];
- mrn_index_name_gen(table_name, key_info.name, index_name);
+ mrn_index_table_name_gen(table_name, key_info.name, index_name);
grn_index_tables[i] = grn_ctx_get(ctx, index_name, strlen(index_name));
if (ctx->rc) {
error = ER_CANT_OPEN_FILE;
@@ -2255,7 +2255,7 @@ int ha_mroonga::wrapper_delete_index(const char *name, MRN_SHARE *tmp_share,
int i;
for (i = 0; i < tmp_table_share->keys; i++) {
char index_name[MRN_MAX_PATH_SIZE];
- mrn_index_name_gen(table_name, tmp_table_share->key_info[i].name,
+ mrn_index_table_name_gen(table_name, tmp_table_share->key_info[i].name,
index_name);
grn_obj *index_table = grn_ctx_get(ctx, index_name, strlen(index_name));
if (index_table != NULL) {
@@ -2287,7 +2287,7 @@ int ha_mroonga::storage_delete_table(const char *name, MRN_SHARE *tmp_share,
int i;
for (i = 0; i < tmp_table_share->keys; i++) {
- mrn_index_name_gen(tbl_name, tmp_table_share->key_info[i].name, idx_name);
+ mrn_index_table_name_gen(tbl_name, tmp_table_share->key_info[i].name, idx_name);
grn_obj *idx_tbl_obj = grn_ctx_get(ctx, idx_name, strlen(idx_name));
if (idx_tbl_obj != NULL) {
grn_obj_remove(ctx, idx_tbl_obj);
@@ -6347,8 +6347,8 @@ int ha_mroonga::wrapper_prepare_drop_index(TABLE *table_arg, uint *key_num,
}
char index_name[MRN_MAX_PATH_SIZE];
- mrn_index_name_gen(grn_table_name, key_info[key_num[i]].name,
- index_name);
+ mrn_index_table_name_gen(grn_table_name, key_info[key_num[i]].name,
+ index_name);
grn_obj *index_table = grn_ctx_get(ctx, index_name, strlen(index_name));
if (index_table != NULL) {
grn_obj_remove(ctx, index_table);
Modified: mrn_sys.c (+9 -9)
===================================================================
--- mrn_sys.c 2011-09-22 02:22:16 +0000 (c2dd580)
+++ mrn_sys.c 2011-09-22 02:29:19 +0000 (b0fae90)
@@ -1,5 +1,7 @@
-/* Copyright(C) 2010 Tetsuro IKEDA
- Copyright(C) 2011 Kentoku SHIBA
+/*
+ Copyright(C) 2010 Tetsuro IKEDA
+ Copyright(C) 2011 Kentoku SHIBA
+ Copyright(C) 2011 Kouhei Sutou <kou****@clear*****>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -122,14 +124,12 @@ char *mrn_table_name_gen(const char *arg, char *dest)
}
/**
- * "${tbl}" ==> "${tbl}#${idx}"
- * "${tbl}" ==> "${tbl}#${idx}"
- * "${tbl}" ==> "${tbl}#${idx}"
- * "${tbl}" ==> "${tbl}#${idx}"
- * ...
+ * "${table}" ==> "${table}_${index_name}"
*/
-char *mrn_index_name_gen(const char *table_name, const char *idx_name, char *dest)
+char *mrn_index_table_name_gen(const char *table_name,
+ const char *index_name,
+ char *dest)
{
- snprintf(dest, MRN_MAX_PATH_SIZE, "%s_%s", table_name, idx_name);
+ snprintf(dest, MRN_MAX_PATH_SIZE, "%s_%s", table_name, index_name);
return dest;
}
Modified: mrn_sys.h (+5 -3)
===================================================================
--- mrn_sys.h 2011-09-22 02:22:16 +0000 (912b8a0)
+++ mrn_sys.h 2011-09-22 02:29:19 +0000 (0e3be5a)
@@ -1,5 +1,7 @@
-/* Copyright(C) 2010 Tetsuro IKEDA
- Copyright(C) 2011 Kentoku SHIBA
+/*
+ Copyright(C) 2010 Tetsuro IKEDA
+ Copyright(C) 2011 Kentoku SHIBA
+ Copyright(C) 2011 Kouhei Sutou <kou****@clear*****>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -42,6 +44,6 @@ int mrn_hash_remove(grn_ctx *ctx, grn_hash *hash, const char *key);
char *mrn_db_path_gen(const char *arg, char *dest);
char *mrn_db_name_gen(const char *arg, char *dest);
char *mrn_table_name_gen(const char *arg, char *dest);
-char *mrn_index_name_gen(const char *arg, const char *idx_name, char *dest);
+char *mrn_index_table_name_gen(const char *arg, const char *idx_name, char *dest);
#endif /* _mrn_sys_h */
Modified: test/unit/test_mrn_sys.c (+3 -2)
===================================================================
--- test/unit/test_mrn_sys.c 2011-09-22 02:22:16 +0000 (dafc9e7)
+++ test/unit/test_mrn_sys.c 2011-09-22 02:29:19 +0000 (7f983cf)
@@ -191,10 +191,11 @@ void test_mrn_table_name_gen()
cut_assert_equal_string("b", mrn_table_name_gen(arg3, buf));
}
-void test_mrn_index_name_gen()
+void test_mrn_index_table_name_gen()
{
char buf[64], buf2[64];
const char *arg = "./db/users";
mrn_table_name_gen(arg, buf);
- cut_assert_equal_string("users_name", mrn_index_name_gen(buf, "name", buf2));
+ cut_assert_equal_string("users_name",
+ mrn_index_table_name_gen(buf, "name", buf2));
}