Kouhei Sutou
null+****@clear*****
Thu Mar 17 12:25:58 JST 2016
Kouhei Sutou 2016-03-17 12:25:58 +0900 (Thu, 17 Mar 2016) New Revision: d92f13776c0361fa433a6f13b91e4ca04323e087 https://github.com/groonga/groonga/commit/d92f13776c0361fa433a6f13b91e4ca04323e087 Message: table_remove: recursive -> dependent Because "recursive" doesn't describe this behavior well. Modified files: include/groonga/groonga.h lib/db.c lib/proc/proc_table.c Renamed files: test/command/suite/table_remove/double_array_trie/referenced/dependent/column_scalar.expected (from test/command/suite/table_remove/double_array_trie/referenced/recursive/column_scalar.expected) test/command/suite/table_remove/double_array_trie/referenced/dependent/column_scalar.test (from test/command/suite/table_remove/double_array_trie/referenced/recursive/column_scalar.test) test/command/suite/table_remove/double_array_trie/referenced/dependent/column_vector.expected (from test/command/suite/table_remove/double_array_trie/referenced/recursive/column_vector.expected) test/command/suite/table_remove/double_array_trie/referenced/dependent/column_vector.test (from test/command/suite/table_remove/double_array_trie/referenced/recursive/column_vector.test) test/command/suite/table_remove/double_array_trie/referenced/dependent/table_double_array_trie.expected (from test/command/suite/table_remove/double_array_trie/referenced/recursive/table_double_array_trie.expected) test/command/suite/table_remove/double_array_trie/referenced/dependent/table_double_array_trie.test (from test/command/suite/table_remove/double_array_trie/referenced/recursive/table_double_array_trie.test) test/command/suite/table_remove/double_array_trie/referenced/dependent/table_hash.expected (from test/command/suite/table_remove/double_array_trie/referenced/recursive/table_hash.expected) test/command/suite/table_remove/double_array_trie/referenced/dependent/table_hash.test (from test/command/suite/table_remove/double_array_trie/referenced/recursive/table_hash.test) test/command/suite/table_remove/double_array_trie/referenced/dependent/table_patricia_trie.expected (from test/command/suite/table_remove/double_array_trie/referenced/recursive/table_patricia_trie.expected) test/command/suite/table_remove/double_array_trie/referenced/dependent/table_patricia_trie.test (from test/command/suite/table_remove/double_array_trie/referenced/recursive/table_patricia_trie.test) test/command/suite/table_remove/hash/referenced/dependent/column_scalar.expected (from test/command/suite/table_remove/hash/referenced/recursive/column_scalar.expected) test/command/suite/table_remove/hash/referenced/dependent/column_scalar.test (from test/command/suite/table_remove/hash/referenced/recursive/column_scalar.test) test/command/suite/table_remove/hash/referenced/dependent/column_vector.expected (from test/command/suite/table_remove/hash/referenced/recursive/column_vector.expected) test/command/suite/table_remove/hash/referenced/dependent/column_vector.test (from test/command/suite/table_remove/hash/referenced/recursive/column_vector.test) test/command/suite/table_remove/hash/referenced/dependent/table_double_array_trie.expected (from test/command/suite/table_remove/hash/referenced/recursive/table_double_array_trie.expected) test/command/suite/table_remove/hash/referenced/dependent/table_double_array_trie.test (from test/command/suite/table_remove/hash/referenced/recursive/table_double_array_trie.test) test/command/suite/table_remove/hash/referenced/dependent/table_hash.expected (from test/command/suite/table_remove/hash/referenced/recursive/table_hash.expected) test/command/suite/table_remove/hash/referenced/dependent/table_hash.test (from test/command/suite/table_remove/hash/referenced/recursive/table_hash.test) test/command/suite/table_remove/hash/referenced/dependent/table_patricia_trie.expected (from test/command/suite/table_remove/hash/referenced/recursive/table_patricia_trie.expected) test/command/suite/table_remove/hash/referenced/dependent/table_patricia_trie.test (from test/command/suite/table_remove/hash/referenced/recursive/table_patricia_trie.test) test/command/suite/table_remove/patricia_trie/referenced/dependent/column_scalar.expected (from test/command/suite/table_remove/patricia_trie/referenced/recursive/column_scalar.expected) test/command/suite/table_remove/patricia_trie/referenced/dependent/column_scalar.test (from test/command/suite/table_remove/patricia_trie/referenced/recursive/column_scalar.test) test/command/suite/table_remove/patricia_trie/referenced/dependent/column_vector.expected (from test/command/suite/table_remove/patricia_trie/referenced/recursive/column_vector.expected) test/command/suite/table_remove/patricia_trie/referenced/dependent/column_vector.test (from test/command/suite/table_remove/patricia_trie/referenced/recursive/column_vector.test) test/command/suite/table_remove/patricia_trie/referenced/dependent/table_double_array_trie.expected (from test/command/suite/table_remove/patricia_trie/referenced/recursive/table_double_array_trie.expected) test/command/suite/table_remove/patricia_trie/referenced/dependent/table_double_array_trie.test (from test/command/suite/table_remove/patricia_trie/referenced/recursive/table_double_array_trie.test) test/command/suite/table_remove/patricia_trie/referenced/dependent/table_hash.expected (from test/command/suite/table_remove/patricia_trie/referenced/recursive/table_hash.expected) test/command/suite/table_remove/patricia_trie/referenced/dependent/table_hash.test (from test/command/suite/table_remove/patricia_trie/referenced/recursive/table_hash.test) test/command/suite/table_remove/patricia_trie/referenced/dependent/table_patricia_trie.expected (from test/command/suite/table_remove/patricia_trie/referenced/recursive/table_patricia_trie.expected) test/command/suite/table_remove/patricia_trie/referenced/dependent/table_patricia_trie.test (from test/command/suite/table_remove/patricia_trie/referenced/recursive/table_patricia_trie.test) Modified: include/groonga/groonga.h (+1 -1) =================================================================== --- include/groonga/groonga.h 2016-03-16 23:25:32 +0900 (f4729d1) +++ include/groonga/groonga.h 2016-03-17 12:25:58 +0900 (645a4ae) @@ -896,7 +896,7 @@ GRN_API int grn_obj_get_values(grn_ctx *ctx, grn_obj *obj, grn_id offset, void * GRN_API grn_rc grn_obj_set_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value, int flags); GRN_API grn_rc grn_obj_remove(grn_ctx *ctx, grn_obj *obj); -GRN_API grn_rc grn_obj_remove_recursive(grn_ctx *ctx, grn_obj *obj); +GRN_API grn_rc grn_obj_remove_dependent(grn_ctx *ctx, grn_obj *obj); GRN_API grn_rc grn_obj_rename(grn_ctx *ctx, grn_obj *obj, const char *name, unsigned int name_size); GRN_API grn_rc grn_table_rename(grn_ctx *ctx, grn_obj *table, Modified: lib/db.c (+15 -15) =================================================================== --- lib/db.c 2016-03-16 23:25:32 +0900 (40425c7) +++ lib/db.c 2016-03-17 12:25:58 +0900 (0482899) @@ -872,7 +872,7 @@ calc_rec_size(grn_obj_flags flags, uint32_t max_n_subrecs, uint32_t range_size, *value_size += additional_value_size; } -static grn_rc _grn_obj_remove(grn_ctx *ctx, grn_obj *obj, grn_bool recursive); +static grn_rc _grn_obj_remove(grn_ctx *ctx, grn_obj *obj, grn_bool dependent); static grn_rc grn_table_create_validate(grn_ctx *ctx, const char *name, unsigned int name_size, @@ -8898,11 +8898,11 @@ is_removable_table(grn_ctx *ctx, grn_obj *table, grn_obj *db) static grn_rc _grn_obj_remove_pat(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, - const char *path, grn_bool recursive) + const char *path, grn_bool dependent) { grn_rc rc = GRN_SUCCESS; - if (recursive) { + if (dependent) { rc = remove_reference_tables(ctx, obj, db); if (rc != GRN_SUCCESS) { return rc; @@ -8937,11 +8937,11 @@ _grn_obj_remove_pat(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, static grn_rc _grn_obj_remove_dat(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, - const char *path, grn_bool recursive) + const char *path, grn_bool dependent) { grn_rc rc = GRN_SUCCESS; - if (recursive) { + if (dependent) { rc = remove_reference_tables(ctx, obj, db); if (rc != GRN_SUCCESS) { return rc; @@ -8976,11 +8976,11 @@ _grn_obj_remove_dat(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, static grn_rc _grn_obj_remove_hash(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, - const char *path, grn_bool recursive) + const char *path, grn_bool dependent) { grn_rc rc = GRN_SUCCESS; - if (recursive) { + if (dependent) { rc = remove_reference_tables(ctx, obj, db); if (rc != GRN_SUCCESS) { return rc; @@ -9015,11 +9015,11 @@ _grn_obj_remove_hash(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, static grn_rc _grn_obj_remove_array(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, - const char *path, grn_bool recursive) + const char *path, grn_bool dependent) { grn_rc rc = GRN_SUCCESS; - if (recursive) { + if (dependent) { rc = remove_reference_tables(ctx, obj, db); if (rc != GRN_SUCCESS) { return rc; @@ -9157,7 +9157,7 @@ _grn_obj_remove_other(grn_ctx *ctx, grn_obj *obj, grn_obj *db, grn_id id, } static grn_rc -_grn_obj_remove(grn_ctx *ctx, grn_obj *obj, grn_bool recursive) +_grn_obj_remove(grn_ctx *ctx, grn_obj *obj, grn_bool dependent) { grn_rc rc = GRN_SUCCESS; grn_id id = GRN_ID_NIL; @@ -9189,16 +9189,16 @@ _grn_obj_remove(grn_ctx *ctx, grn_obj *obj, grn_bool recursive) rc = _grn_obj_remove_db(ctx, obj, db, id, path); break; case GRN_TABLE_PAT_KEY : - rc = _grn_obj_remove_pat(ctx, obj, db, id, path, recursive); + rc = _grn_obj_remove_pat(ctx, obj, db, id, path, dependent); break; case GRN_TABLE_DAT_KEY : - rc = _grn_obj_remove_dat(ctx, obj, db, id, path, recursive); + rc = _grn_obj_remove_dat(ctx, obj, db, id, path, dependent); break; case GRN_TABLE_HASH_KEY : - rc = _grn_obj_remove_hash(ctx, obj, db, id, path, recursive); + rc = _grn_obj_remove_hash(ctx, obj, db, id, path, dependent); break; case GRN_TABLE_NO_KEY : - rc = _grn_obj_remove_array(ctx, obj, db, id, path, recursive); + rc = _grn_obj_remove_array(ctx, obj, db, id, path, dependent); break; case GRN_COLUMN_VAR_SIZE : rc = _grn_obj_remove_ja(ctx, obj, db, id, path); @@ -9239,7 +9239,7 @@ grn_obj_remove(grn_ctx *ctx, grn_obj *obj) } grn_rc -grn_obj_remove_recursive(grn_ctx *ctx, grn_obj *obj) +grn_obj_remove_dependent(grn_ctx *ctx, grn_obj *obj) { grn_rc rc = GRN_SUCCESS; GRN_API_ENTER; Modified: lib/proc/proc_table.c (+5 -5) =================================================================== --- lib/proc/proc_table.c 2016-03-16 23:25:32 +0900 (0997a8e) +++ lib/proc/proc_table.c 2016-03-17 12:25:58 +0900 (1cf3548) @@ -476,10 +476,10 @@ command_table_remove(grn_ctx *ctx, { grn_obj *name; grn_obj *table; - grn_bool recursive; + grn_bool dependent; name = grn_plugin_proc_get_var(ctx, user_data, "name", -1); - recursive = grn_plugin_proc_get_var_bool(ctx, user_data, "recursive", -1, + dependent = grn_plugin_proc_get_var_bool(ctx, user_data, "dependent", -1, GRN_FALSE); table = grn_ctx_get(ctx, GRN_TEXT_VALUE(name), @@ -500,8 +500,8 @@ command_table_remove(grn_ctx *ctx, } if (table) { - if (recursive) { - grn_obj_remove_recursive(ctx, table); + if (dependent) { + grn_obj_remove_dependent(ctx, table); } else { grn_obj_remove(ctx, table); } @@ -522,7 +522,7 @@ grn_proc_init_table_remove(grn_ctx *ctx) grn_expr_var vars[2]; grn_plugin_expr_var_init(ctx, &(vars[0]), "name", -1); - grn_plugin_expr_var_init(ctx, &(vars[1]), "recursive", -1); + grn_plugin_expr_var_init(ctx, &(vars[1]), "dependent", -1); grn_plugin_command_create(ctx, "table_remove", -1, command_table_remove, Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/column_scalar.expected (+1 -1) 88% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/column_scalar.expected 2016-03-16 23:25:32 +0900 (5c8c103) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/column_scalar.expected 2016-03-17 12:25:58 +0900 (437dffd) @@ -4,7 +4,7 @@ table_create Users TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] column_create Users name COLUMN_SCALAR Names [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Users TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/column_scalar.test (+1 -1) 79% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/column_scalar.test 2016-03-16 23:25:32 +0900 (cc88b37) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/column_scalar.test 2016-03-17 12:25:58 +0900 (00a0cd8) @@ -2,6 +2,6 @@ table_create Names TABLE_DAT_KEY ShortText table_create Users TABLE_HASH_KEY ShortText column_create Users name COLUMN_SCALAR Names -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/column_vector.expected (+1 -1) 88% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/column_vector.expected 2016-03-16 23:25:32 +0900 (6627d67) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/column_vector.expected 2016-03-17 12:25:58 +0900 (2ec7edc) @@ -4,7 +4,7 @@ table_create Users TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] column_create Users name COLUMN_VECTOR Names [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Users TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/column_vector.test (+1 -1) 79% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/column_vector.test 2016-03-16 23:25:32 +0900 (3c09125) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/column_vector.test 2016-03-17 12:25:58 +0900 (a5de54c) @@ -2,6 +2,6 @@ table_create Names TABLE_DAT_KEY ShortText table_create Users TABLE_HASH_KEY ShortText column_create Users name COLUMN_VECTOR Names -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/table_double_array_trie.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/table_double_array_trie.expected 2016-03-16 23:25:32 +0900 (2a512e2) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/table_double_array_trie.expected 2016-03-17 12:25:58 +0900 (c1f6eff) @@ -6,7 +6,7 @@ table_create Administrators TABLE_DAT_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_DAT_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_DAT_KEY ShortText Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/table_double_array_trie.test (+1 -1) 83% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/table_double_array_trie.test 2016-03-16 23:25:32 +0900 (e53097f) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/table_double_array_trie.test 2016-03-17 12:25:58 +0900 (e3e6919) @@ -3,6 +3,6 @@ table_create Users TABLE_DAT_KEY Names table_create Administrators TABLE_DAT_KEY Names table_create Machines TABLE_DAT_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/table_hash.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/table_hash.expected 2016-03-16 23:25:32 +0900 (bdd0427) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/table_hash.expected 2016-03-17 12:25:58 +0900 (f2fa03b) @@ -6,7 +6,7 @@ table_create Administrators TABLE_HASH_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/table_hash.test (+1 -1) 84% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/table_hash.test 2016-03-16 23:25:32 +0900 (be2b0d6) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/table_hash.test 2016-03-17 12:25:58 +0900 (14a81d8) @@ -3,6 +3,6 @@ table_create Users TABLE_HASH_KEY Names table_create Administrators TABLE_HASH_KEY Names table_create Machines TABLE_HASH_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/table_patricia_trie.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/table_patricia_trie.expected 2016-03-16 23:25:32 +0900 (0de472e) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/table_patricia_trie.expected 2016-03-17 12:25:58 +0900 (7a4638b) @@ -6,7 +6,7 @@ table_create Administrators TABLE_PAT_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_PAT_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_PAT_KEY ShortText Renamed: test/command/suite/table_remove/double_array_trie/referenced/dependent/table_patricia_trie.test (+1 -1) 83% =================================================================== --- test/command/suite/table_remove/double_array_trie/referenced/recursive/table_patricia_trie.test 2016-03-16 23:25:32 +0900 (2073b6e) +++ test/command/suite/table_remove/double_array_trie/referenced/dependent/table_patricia_trie.test 2016-03-17 12:25:58 +0900 (9e75e74) @@ -3,6 +3,6 @@ table_create Users TABLE_PAT_KEY Names table_create Administrators TABLE_PAT_KEY Names table_create Machines TABLE_PAT_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/hash/referenced/dependent/column_scalar.expected (+1 -1) 88% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/column_scalar.expected 2016-03-16 23:25:32 +0900 (3b2f44e) +++ test/command/suite/table_remove/hash/referenced/dependent/column_scalar.expected 2016-03-17 12:25:58 +0900 (a99d9f9) @@ -4,7 +4,7 @@ table_create Users TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] column_create Users name COLUMN_SCALAR Names [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Users TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/hash/referenced/dependent/column_scalar.test (+1 -1) 80% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/column_scalar.test 2016-03-16 23:25:32 +0900 (2307c5c) +++ test/command/suite/table_remove/hash/referenced/dependent/column_scalar.test 2016-03-17 12:25:58 +0900 (8e5b09d) @@ -2,6 +2,6 @@ table_create Names TABLE_HASH_KEY ShortText table_create Users TABLE_HASH_KEY ShortText column_create Users name COLUMN_SCALAR Names -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/hash/referenced/dependent/column_vector.expected (+1 -1) 88% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/column_vector.expected 2016-03-16 23:25:32 +0900 (2970abe) +++ test/command/suite/table_remove/hash/referenced/dependent/column_vector.expected 2016-03-17 12:25:58 +0900 (072d555) @@ -4,7 +4,7 @@ table_create Users TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] column_create Users name COLUMN_VECTOR Names [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Users TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/hash/referenced/dependent/column_vector.test (+1 -1) 80% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/column_vector.test 2016-03-16 23:25:32 +0900 (6a13d00) +++ test/command/suite/table_remove/hash/referenced/dependent/column_vector.test 2016-03-17 12:25:58 +0900 (4744605) @@ -2,6 +2,6 @@ table_create Names TABLE_HASH_KEY ShortText table_create Users TABLE_HASH_KEY ShortText column_create Users name COLUMN_VECTOR Names -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/hash/referenced/dependent/table_double_array_trie.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/table_double_array_trie.expected 2016-03-16 23:25:32 +0900 (6bea662) +++ test/command/suite/table_remove/hash/referenced/dependent/table_double_array_trie.expected 2016-03-17 12:25:58 +0900 (9c34221) @@ -6,7 +6,7 @@ table_create Administrators TABLE_DAT_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_DAT_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_DAT_KEY ShortText Renamed: test/command/suite/table_remove/hash/referenced/dependent/table_double_array_trie.test (+1 -1) 84% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/table_double_array_trie.test 2016-03-16 23:25:32 +0900 (bbc839f) +++ test/command/suite/table_remove/hash/referenced/dependent/table_double_array_trie.test 2016-03-17 12:25:58 +0900 (3fa8dec) @@ -3,6 +3,6 @@ table_create Users TABLE_DAT_KEY Names table_create Administrators TABLE_DAT_KEY Names table_create Machines TABLE_DAT_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/hash/referenced/dependent/table_hash.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/table_hash.expected 2016-03-16 23:25:32 +0900 (7d5b641) +++ test/command/suite/table_remove/hash/referenced/dependent/table_hash.expected 2016-03-17 12:25:58 +0900 (28b60d4) @@ -6,7 +6,7 @@ table_create Administrators TABLE_HASH_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/hash/referenced/dependent/table_hash.test (+1 -1) 84% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/table_hash.test 2016-03-16 23:25:32 +0900 (65efaea) +++ test/command/suite/table_remove/hash/referenced/dependent/table_hash.test 2016-03-17 12:25:58 +0900 (324c839) @@ -3,6 +3,6 @@ table_create Users TABLE_HASH_KEY Names table_create Administrators TABLE_HASH_KEY Names table_create Machines TABLE_HASH_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/hash/referenced/dependent/table_patricia_trie.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/table_patricia_trie.expected 2016-03-16 23:25:32 +0900 (0dd9575) +++ test/command/suite/table_remove/hash/referenced/dependent/table_patricia_trie.expected 2016-03-17 12:25:58 +0900 (f858c1c) @@ -6,7 +6,7 @@ table_create Administrators TABLE_PAT_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_PAT_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_PAT_KEY ShortText Renamed: test/command/suite/table_remove/hash/referenced/dependent/table_patricia_trie.test (+1 -1) 84% =================================================================== --- test/command/suite/table_remove/hash/referenced/recursive/table_patricia_trie.test 2016-03-16 23:25:32 +0900 (e18d635) +++ test/command/suite/table_remove/hash/referenced/dependent/table_patricia_trie.test 2016-03-17 12:25:58 +0900 (3ebc5c7) @@ -3,6 +3,6 @@ table_create Users TABLE_PAT_KEY Names table_create Administrators TABLE_PAT_KEY Names table_create Machines TABLE_PAT_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/column_scalar.expected (+1 -1) 88% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/column_scalar.expected 2016-03-16 23:25:32 +0900 (eaf6921) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/column_scalar.expected 2016-03-17 12:25:58 +0900 (c7ad37c) @@ -4,7 +4,7 @@ table_create Users TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] column_create Users name COLUMN_SCALAR Names [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Users TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/column_scalar.test (+1 -1) 79% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/column_scalar.test 2016-03-16 23:25:32 +0900 (ec6f25b) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/column_scalar.test 2016-03-17 12:25:58 +0900 (266a7d9) @@ -2,6 +2,6 @@ table_create Names TABLE_PAT_KEY ShortText table_create Users TABLE_HASH_KEY ShortText column_create Users name COLUMN_SCALAR Names -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/column_vector.expected (+1 -1) 88% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/column_vector.expected 2016-03-16 23:25:32 +0900 (be6cab4) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/column_vector.expected 2016-03-17 12:25:58 +0900 (5174058) @@ -4,7 +4,7 @@ table_create Users TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] column_create Users name COLUMN_VECTOR Names [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Users TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/column_vector.test (+1 -1) 79% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/column_vector.test 2016-03-16 23:25:32 +0900 (20221d0) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/column_vector.test 2016-03-17 12:25:58 +0900 (d3ae16d) @@ -2,6 +2,6 @@ table_create Names TABLE_PAT_KEY ShortText table_create Users TABLE_HASH_KEY ShortText column_create Users name COLUMN_VECTOR Names -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/table_double_array_trie.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/table_double_array_trie.expected 2016-03-16 23:25:32 +0900 (f07e399) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/table_double_array_trie.expected 2016-03-17 12:25:58 +0900 (98e87fa) @@ -6,7 +6,7 @@ table_create Administrators TABLE_DAT_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_DAT_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_DAT_KEY ShortText Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/table_double_array_trie.test (+1 -1) 83% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/table_double_array_trie.test 2016-03-16 23:25:32 +0900 (7389988) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/table_double_array_trie.test 2016-03-17 12:25:58 +0900 (a8fbd62) @@ -3,6 +3,6 @@ table_create Users TABLE_DAT_KEY Names table_create Administrators TABLE_DAT_KEY Names table_create Machines TABLE_DAT_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/table_hash.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/table_hash.expected 2016-03-16 23:25:32 +0900 (0440b06) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/table_hash.expected 2016-03-17 12:25:58 +0900 (6e605f8) @@ -6,7 +6,7 @@ table_create Administrators TABLE_HASH_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_HASH_KEY ShortText Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/table_hash.test (+1 -1) 84% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/table_hash.test 2016-03-16 23:25:32 +0900 (94e17cc) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/table_hash.test 2016-03-17 12:25:58 +0900 (facdf95) @@ -3,6 +3,6 @@ table_create Users TABLE_HASH_KEY Names table_create Administrators TABLE_HASH_KEY Names table_create Machines TABLE_HASH_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/table_patricia_trie.expected (+1 -1) 90% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/table_patricia_trie.expected 2016-03-16 23:25:32 +0900 (6a345d3) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/table_patricia_trie.expected 2016-03-17 12:25:58 +0900 (6401a7f) @@ -6,7 +6,7 @@ table_create Administrators TABLE_PAT_KEY Names [[0,0.0,0.0],true] table_create Machines TABLE_PAT_KEY ShortText [[0,0.0,0.0],true] -table_remove Names --recursive yes +table_remove Names --dependent yes [[0,0.0,0.0],true] dump table_create Machines TABLE_PAT_KEY ShortText Renamed: test/command/suite/table_remove/patricia_trie/referenced/dependent/table_patricia_trie.test (+1 -1) 83% =================================================================== --- test/command/suite/table_remove/patricia_trie/referenced/recursive/table_patricia_trie.test 2016-03-16 23:25:32 +0900 (03dce35) +++ test/command/suite/table_remove/patricia_trie/referenced/dependent/table_patricia_trie.test 2016-03-17 12:25:58 +0900 (a434d9a) @@ -3,6 +3,6 @@ table_create Users TABLE_PAT_KEY Names table_create Administrators TABLE_PAT_KEY Names table_create Machines TABLE_PAT_KEY ShortText -table_remove Names --recursive yes +table_remove Names --dependent yes dump -------------- next part -------------- HTML����������������������������...Download