Kouhei Sutou
null+****@clear*****
Thu Mar 16 10:04:45 JST 2017
Kouhei Sutou 2017-03-16 10:04:45 +0900 (Thu, 16 Mar 2017) New Revision: f026b76c50cfd20b167306f4dc0ab535dddace98 https://github.com/groonga/groonga/commit/f026b76c50cfd20b167306f4dc0ab535dddace98 Message: Add grn_obj_is_data_column() Modified files: include/groonga/obj.h lib/obj.c test/unit/core/test-object.c Modified: include/groonga/obj.h (+1 -0) =================================================================== --- include/groonga/obj.h 2017-03-16 09:36:48 +0900 (0b7a7c6) +++ include/groonga/obj.h 2017-03-16 10:04:45 +0900 (d0722d7) @@ -38,6 +38,7 @@ GRN_API grn_bool grn_obj_is_column(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_vector_column(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_weight_vector_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_data_column(grn_ctx *ctx, grn_obj *obj); GRN_API grn_bool grn_obj_is_index_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); Modified: lib/obj.c (+11 -0) =================================================================== --- lib/obj.c 2017-03-16 09:36:48 +0900 (13e83c4) +++ lib/obj.c 2017-03-16 10:04:45 +0900 (be38286) @@ -186,6 +186,17 @@ grn_obj_is_reference_column(grn_ctx *ctx, grn_obj *obj) } grn_bool +grn_obj_is_data_column(grn_ctx *ctx, grn_obj *obj) +{ + if (!grn_obj_is_column(ctx, obj)) { + return GRN_FALSE; + } + + return obj->header.type == GRN_COLUMN_FIX_SIZE || + obj->header.type == GRN_COLUMN_VAR_SIZE; +} + +grn_bool grn_obj_is_index_column(grn_ctx *ctx, grn_obj *obj) { if (!grn_obj_is_column(ctx, obj)) { Modified: test/unit/core/test-object.c (+41 -1) =================================================================== --- test/unit/core/test-object.c 2017-03-16 09:36:48 +0900 (d082ee0) +++ test/unit/core/test-object.c 2017-03-16 10:04:45 +0900 (d0dee78) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2; coding: utf-8 -*- */ /* - Copyright (C) 2011-2016 Kouhei Sutou <kou �� clear-code.com> + Copyright (C) 2011-2017 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 @@ -39,6 +39,8 @@ void data_is_weight_vector_column(void); void test_is_weight_vector_column(gconstpointer data); void data_is_reference_column(void); void test_is_reference_column(gconstpointer data); +void data_is_data_column(void); +void test_is_data_column(gconstpointer data); void data_is_index_column(void); void test_is_index_column(gconstpointer data); void data_is_accessor(void); @@ -381,6 +383,44 @@ test_is_reference_column(gconstpointer data) } void +data_is_data_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("scalar column", TRUE, "Users.age"); + ADD_DATUM("vector column", TRUE, "Users.tags"); + ADD_DATUM("index column", FALSE, "Ages.users_age"); + +#undef ADD_DATUM +} + +void +test_is_data_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 tags COLUMN_VECTOR ShortText"); + assert_send_command("table_create Ages TABLE_PAT_KEY UInt8"); + assert_send_command("column_create Ages users_age COLUMN_INDEX Users age"); + + 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_data_column(context, object)); + } else { + cut_assert_false(grn_obj_is_data_column(context, object)); + } +} + +void data_is_index_column(void) { #define ADD_DATUM(label, expected, name) \ -------------- next part -------------- HTML����������������������������...Download