Kouhei Sutou
null+****@clear*****
Fri Feb 5 18:36:05 JST 2016
Kouhei Sutou 2016-02-05 18:36:05 +0900 (Fri, 05 Feb 2016) New Revision: e197202733905cdc1a3a7dcc06f8c2339de0ed06 https://github.com/groonga/groonga/commit/e197202733905cdc1a3a7dcc06f8c2339de0ed06 Message: Add predicates for column and reference column 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 2016-02-05 17:54:11 +0900 (27de09b) +++ include/groonga/obj.h 2016-02-05 18:36:05 +0900 (35c04bf) @@ -32,6 +32,8 @@ GRN_API grn_bool grn_obj_is_true(grn_ctx *ctx, grn_obj *obj); 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_column(grn_ctx *ctx, grn_obj *obj); +GRN_API grn_bool grn_obj_is_reference_column(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); Modified: lib/obj.c (+46 -0) =================================================================== --- lib/obj.c 2016-02-05 17:54:11 +0900 (2072898) +++ lib/obj.c 2016-02-05 18:36:05 +0900 (df1bb43) @@ -103,6 +103,52 @@ grn_obj_is_table(grn_ctx *ctx, grn_obj *obj) } grn_bool +grn_obj_is_column(grn_ctx *ctx, grn_obj *obj) +{ + grn_bool is_column = GRN_FALSE; + + if (!obj) { + return GRN_FALSE; + } + + switch (obj->header.type) { + case GRN_COLUMN_FIX_SIZE : + case GRN_COLUMN_VAR_SIZE : + case GRN_COLUMN_INDEX : + is_column = GRN_TRUE; + default : + break; + } + + return is_column; +} + +grn_bool +grn_obj_is_reference_column(grn_ctx *ctx, grn_obj *obj) +{ + grn_obj *range; + + if (!grn_obj_is_column(ctx, obj)) { + return GRN_FALSE; + } + + range = grn_ctx_at(ctx, grn_obj_get_range(ctx, obj)); + if (!range) { + return GRN_FALSE; + } + + switch (range->header.type) { + case GRN_TABLE_HASH_KEY: + case GRN_TABLE_PAT_KEY: + case GRN_TABLE_DAT_KEY: + case GRN_TABLE_NO_KEY: + return GRN_TRUE; + default: + return GRN_FALSE; + } +} + +grn_bool grn_obj_is_accessor(grn_ctx *ctx, grn_obj *obj) { if (!obj) { Modified: test/unit/core/test-object.c (+79 -1) =================================================================== --- test/unit/core/test-object.c 2016-02-05 17:54:11 +0900 (9828271) +++ test/unit/core/test-object.c 2016-02-05 18:36:05 +0900 (ee194d7) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2; coding: utf-8 -*- */ /* - Copyright (C) 2011-2015 Kouhei Sutou <kou �� clear-code.com> + Copyright (C) 2011-2016 Kouhei Sutou <kou �� clear-code.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -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_column(void); +void test_is_column(gconstpointer data); +void data_is_reference_column(void); +void test_is_reference_column(gconstpointer data); void data_is_accessor(void); void test_is_accessor(gconstpointer data); void data_is_key_accessor(void); @@ -176,6 +180,80 @@ test_is_table(gconstpointer data) } void +data_is_column(void) +{ +#define ADD_DATUM(label, expected, name) \ + gcut_add_datum(label, \ + "expected", G_TYPE_BOOLEAN, expected, \ + "name", G_TYPE_STRING, name, \ + NULL) + + ADD_DATUM("table", FALSE, "Users"); + ADD_DATUM("fix size column", TRUE, "Users.age"); + ADD_DATUM("var size column", TRUE, "Users.name"); + ADD_DATUM("index column", TRUE, "Names.users"); + +#undef ADD_DATUM +} + +void +test_is_column(gconstpointer data) +{ + const gchar *name; + grn_obj *object; + + assert_send_command("table_create Users TABLE_HASH_KEY ShortText"); + assert_send_command("column_create Users age COLUMN_SCALAR UInt8"); + assert_send_command("column_create Users name COLUMN_SCALAR ShortText"); + assert_send_command("table_create Names TABLE_PAT_KEY ShortText"); + assert_send_command("column_create Names users COLUMN_INDEX Users name"); + + name = gcut_data_get_string(data, "name"); + object = grn_ctx_get(context, name, strlen(name)); + if (gcut_data_get_string(data, "expected")) { + cut_assert_true(grn_obj_is_column(context, object)); + } else { + cut_assert_false(grn_obj_is_column(context, object)); + } +} + +void +data_is_reference_column(void) +{ +#define ADD_DATUM(label, expected, name) \ + gcut_add_datum(label, \ + "expected", G_TYPE_BOOLEAN, expected, \ + "name", G_TYPE_STRING, name, \ + NULL) + + ADD_DATUM("table", FALSE, "Users"); + ADD_DATUM("value column", TRUE, "Users.age"); + ADD_DATUM("reference column", TRUE, "Users.name"); + +#undef ADD_DATUM +} + +void +test_is_reference_column(gconstpointer data) +{ + const gchar *name; + grn_obj *object; + + assert_send_command("table_create Names TABLE_PAT_KEY ShortText"); + assert_send_command("table_create Users TABLE_HASH_KEY ShortText"); + assert_send_command("column_create Users age COLUMN_SCALAR UInt8"); + assert_send_command("column_create Users name COLUMN_SCALAR Names"); + + name = gcut_data_get_string(data, "name"); + object = grn_ctx_get(context, name, strlen(name)); + if (gcut_data_get_string(data, "expected")) { + cut_assert_true(grn_obj_is_reference_column(context, object)); + } else { + cut_assert_false(grn_obj_is_reference_column(context, object)); + } +} + +void data_is_accessor(void) { #define ADD_DATUM(expected, name) \ -------------- next part -------------- HTML����������������������������...Download