Kouhei Sutou
null+****@clear*****
Wed Nov 18 12:08:58 JST 2015
Kouhei Sutou 2015-11-18 12:08:58 +0900 (Wed, 18 Nov 2015) New Revision: 0a5380f59e0556a7979298019bf992ca78c0008c https://github.com/groonga/groonga/commit/0a5380f59e0556a7979298019bf992ca78c0008c Message: Add predicates for accessor Modified files: include/groonga/obj.h lib/obj.c test/unit/core/test-object.c Modified: include/groonga/obj.h (+2 -0) =================================================================== --- include/groonga/obj.h 2015-11-18 11:23:06 +0900 (d829a92) +++ include/groonga/obj.h 2015-11-18 12:08:58 +0900 (0c76836) @@ -71,6 +71,8 @@ extern "C" { GRN_API grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_table(grn_ctx *ctx, grn_obj *obj); +GRN_API grn_bool grn_obj_is_accessor(grn_ctx *ctx, grn_obj *obj); +GRN_API grn_bool grn_obj_is_key_accessor(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_type(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_proc(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_tokenizer_proc(grn_ctx *ctx, grn_obj *obj); Modified: lib/obj.c (+28 -1) =================================================================== --- lib/obj.c 2015-11-18 11:23:06 +0900 (55fe4d7) +++ lib/obj.c 2015-11-18 12:08:58 +0900 (bfcf9ba) @@ -15,10 +15,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include "grn.h" #include "grn_db.h" #include "grn_index_column.h" -#include <groonga/obj.h> grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj) @@ -58,6 +58,33 @@ grn_obj_is_table(grn_ctx *ctx, grn_obj *obj) } grn_bool +grn_obj_is_accessor(grn_ctx *ctx, grn_obj *obj) +{ + if (!obj) { + return GRN_FALSE; + } + + return obj->header.type == GRN_ACCESSOR; +} + +grn_bool +grn_obj_is_key_accessor(grn_ctx *ctx, grn_obj *obj) +{ + grn_accessor *accessor; + + if (!grn_obj_is_accessor(ctx, obj)) { + return GRN_FALSE; + } + + accessor = (grn_accessor *)obj; + if (accessor->next) { + return GRN_FALSE; + } + + return accessor->action == GRN_ACCESSOR_GET_KEY; +} + +grn_bool grn_obj_is_type(grn_ctx *ctx, grn_obj *obj) { if (!obj) { Modified: test/unit/core/test-object.c (+79 -0) =================================================================== --- test/unit/core/test-object.c 2015-11-18 11:23:06 +0900 (c82a6f7) +++ test/unit/core/test-object.c 2015-11-18 12:08:58 +0900 (b1f0d0c) @@ -29,6 +29,10 @@ void data_is_builtin(void); void test_is_builtin(gconstpointer data); void data_is_table(void); void test_is_table(gconstpointer data); +void data_is_accessor(void); +void test_is_accessor(gconstpointer data); +void data_is_key_accessor(void); +void test_is_key_accessor(gconstpointer data); void data_is_type(void); void test_is_type(gconstpointer data); void data_is_proc(void); @@ -170,6 +174,81 @@ test_is_table(gconstpointer data) } void +data_is_accessor(void) +{ +#define ADD_DATUM(expected, name) \ + gcut_add_datum((expected ? \ + "accessor - " name : \ + "not accessor - " name), \ + "expected", G_TYPE_BOOLEAN, expected, \ + "name", G_TYPE_STRING, name, \ + NULL) + + ADD_DATUM(TRUE, "_key"); + ADD_DATUM(FALSE, "name"); + +#undef ADD_DATUM +} + +void +test_is_accessor(gconstpointer data) +{ + const gchar *name; + grn_obj *table; + grn_obj *object; + + assert_send_command("table_create Users TABLE_HASH_KEY ShortText"); + assert_send_command("column_create Users name COLUMN_SCALAR ShortText"); + + table = grn_ctx_get(context, "Users", -1); + name = gcut_data_get_string(data, "name"); + object = grn_obj_column(context, table, name, strlen(name)); + if (gcut_data_get_string(data, "expected")) { + cut_assert_true(grn_obj_is_accessor(context, object)); + } else { + cut_assert_false(grn_obj_is_accessor(context, object)); + } +} + +void +data_is_key_accessor(void) +{ +#define ADD_DATUM(expected, name) \ + gcut_add_datum((expected ? \ + "key accessor - " name : \ + "not key accessor - " name), \ + "expected", G_TYPE_BOOLEAN, expected, \ + "name", G_TYPE_STRING, name, \ + NULL) + + ADD_DATUM(TRUE, "_key"); + ADD_DATUM(FALSE, "name._key"); + +#undef ADD_DATUM +} + +void +test_is_key_accessor(gconstpointer data) +{ + const gchar *name; + grn_obj *table; + grn_obj *object; + + assert_send_command("table_create Names TABLE_HASH_KEY ShortText"); + assert_send_command("table_create Users TABLE_HASH_KEY ShortText"); + assert_send_command("column_create Users name COLUMN_SCALAR Names"); + + table = grn_ctx_get(context, "Users", -1); + name = gcut_data_get_string(data, "name"); + object = grn_obj_column(context, table, name, strlen(name)); + if (gcut_data_get_string(data, "expected")) { + cut_assert_true(grn_obj_is_key_accessor(context, object)); + } else { + cut_assert_false(grn_obj_is_key_accessor(context, object)); + } +} + +void data_is_type(void) { #define ADD_DATUM(expected, name) \ -------------- next part -------------- HTML����������������������������...Download