null+****@clear*****
null+****@clear*****
2012年 3月 19日 (月) 18:56:53 JST
Kouhei Sutou 2012-03-19 18:56:53 +0900 (Mon, 19 Mar 2012)
New Revision: 1c83d78a03bc9d1479c141e2ca980ad03300cef2
Log:
Remove mrn_table_name_gen() and mrn_table_name_gen_for_mysql()
Modified files:
mrn_sys.c
mrn_sys.h
test/unit/test_mrn_sys.cpp
Modified: mrn_sys.c (+0 -38)
===================================================================
--- mrn_sys.c 2012-03-19 18:55:16 +0900 (b90cfc6)
+++ mrn_sys.c 2012-03-19 18:56:53 +0900 (a1e3107)
@@ -84,44 +84,6 @@ int mrn_hash_remove(grn_ctx *ctx, grn_hash *hash, const char *key)
}
/**
- * "./${db}/${table}" ==> "${table}" (with encoding first '_')
- */
-char *mrn_table_name_gen(const char *arg, char *dest)
-{
- int len = strlen(arg);
- int i=len, j=0;
- for (; arg[--i] != '/' ;) {}
- if (arg[i + 1] == '_') {
- dest[j++] = '@';
- dest[j++] = '0';
- dest[j++] = '0';
- dest[j++] = '5';
- dest[j++] = 'f';
- i++;
- }
- for (; i < len ;) {
- dest[j++] = arg[++i];
- }
- dest[j] = '\0';
- return dest;
-}
-
-/**
- * "./${db}/${table}" ==> "${table}" (without encoding first '_')
- */
-char *mrn_table_name_gen_for_mysql(const char *arg, char *dest)
-{
- int len = strlen(arg);
- int i=len, j=0;
- for (; arg[--i] != '/' ;) {}
- for (; i < len ;) {
- dest[j++] = arg[++i];
- }
- dest[j] = '\0';
- return dest;
-}
-
-/**
* "${table}" ==> "${table}-${index_name}"
*/
char *mrn_index_table_name_gen(const char *table_name,
Modified: mrn_sys.h (+0 -2)
===================================================================
--- mrn_sys.h 2012-03-19 18:55:16 +0900 (45e74f3)
+++ mrn_sys.h 2012-03-19 18:56:53 +0900 (08b8cab)
@@ -52,8 +52,6 @@ int mrn_hash_put(grn_ctx *ctx, grn_hash *hash, const char *key, grn_obj *value);
int mrn_hash_get(grn_ctx *ctx, grn_hash *hash, const char *key, grn_obj **value);
int mrn_hash_remove(grn_ctx *ctx, grn_hash *hash, const char *key);
-char *mrn_table_name_gen(const char *arg, char *dest);
-char *mrn_table_name_gen_for_mysql(const char *arg, char *dest);
char *mrn_index_table_name_gen(const char *arg, const char *idx_name, char *dest);
MRN_END_DECLS
Modified: test/unit/test_mrn_sys.cpp (+2 -30)
===================================================================
--- test/unit/test_mrn_sys.cpp 2012-03-19 18:55:16 +0900 (55b58aa)
+++ test/unit/test_mrn_sys.cpp 2012-03-19 18:56:53 +0900 (952e239)
@@ -93,38 +93,10 @@ namespace test_mrn_sys
cut_assert_equal_int(-1, mrn_hash_remove(ctx, hash, key));
}
- void test_mrn_table_name_gen()
- {
- char buf[64];
- const char *arg1 = "./hoge/fuga";
- const char *arg2 = "./foobar/mysql";
- const char *arg3 = "./d/b";
- const char *arg4 = "./d/_b";
- cut_assert_equal_string("fuga", mrn_table_name_gen(arg1, buf));
- cut_assert_equal_string("mysql", mrn_table_name_gen(arg2, buf));
- cut_assert_equal_string("b", mrn_table_name_gen(arg3, buf));
- cut_assert_equal_string("@005fb", mrn_table_name_gen(arg4, buf));
- }
-
- void test_mrn_table_name_gen_for_mysql()
- {
- char buf[64];
- const char *arg1 = "./hoge/fuga";
- const char *arg2 = "./foobar/mysql";
- const char *arg3 = "./d/b";
- const char *arg4 = "./d/_b";
- cut_assert_equal_string("fuga", mrn_table_name_gen_for_mysql(arg1, buf));
- cut_assert_equal_string("mysql", mrn_table_name_gen_for_mysql(arg2, buf));
- cut_assert_equal_string("b", mrn_table_name_gen_for_mysql(arg3, buf));
- cut_assert_equal_string("_b", mrn_table_name_gen_for_mysql(arg4, buf));
- }
-
void test_mrn_index_table_name_gen()
{
- char buf[64], buf2[64];
- const char *arg = "./db/users";
- mrn_table_name_gen(arg, buf);
+ char buf[64];
cut_assert_equal_string("users-name",
- mrn_index_table_name_gen(buf, "name", buf2));
+ mrn_index_table_name_gen("users", "name", buf));
}
}