Kouhei Sutou
null+****@clear*****
Fri Dec 6 15:48:59 JST 2013
Kouhei Sutou 2013-12-06 15:48:59 +0900 (Fri, 06 Dec 2013) New Revision: 26642a52600de799e0672804a8f843a7e831523b https://github.com/mroonga/mroonga/commit/26642a52600de799e0672804a8f843a7e831523b Message: Use more suitable name Modified files: lib/mrn_condition_converter.cpp lib/mrn_condition_converter.hpp Modified: lib/mrn_condition_converter.cpp (+4 -4) =================================================================== --- lib/mrn_condition_converter.cpp 2013-12-06 15:43:39 +0900 (18d163e) +++ lib/mrn_condition_converter.cpp 2013-12-06 15:48:59 +0900 (8261abb) @@ -158,7 +158,7 @@ namespace mrn { case STRING_TYPE: if (value_item->type() == Item::STRING_ITEM && func_type == Item_func::EQ_FUNC) { - convertable = is_convertable_string(field_item, value_item); + convertable = have_index(field_item, GRN_OP_EQUAL); } break; case INT_TYPE: @@ -253,8 +253,8 @@ namespace mrn { DBUG_RETURN(type); } - bool ConditionConverter::is_convertable_string(const Item_field *field_item, - const Item *string_item) { + bool ConditionConverter::have_index(const Item_field *field_item, + grn_operator _operator) { MRN_DBUG_ENTER_METHOD(); grn_obj *column; @@ -265,7 +265,7 @@ namespace mrn { DBUG_RETURN(false); } - int n_indexes = grn_column_index(ctx_, column, GRN_OP_EQUAL, NULL, 0, NULL); + int n_indexes = grn_column_index(ctx_, column, _operator, NULL, 0, NULL); bool convertable = (n_indexes > 0); grn_obj_unlink(ctx_, column); Modified: lib/mrn_condition_converter.hpp (+1 -2) =================================================================== --- lib/mrn_condition_converter.hpp 2013-12-06 15:43:39 +0900 (b66eb8b) +++ lib/mrn_condition_converter.hpp 2013-12-06 15:48:59 +0900 (c91681c) @@ -53,8 +53,7 @@ namespace mrn { bool is_convertable_binary_operation(const Item_field *field_item, const Item *value_item, Item_func::Functype func_type); - bool is_convertable_string(const Item_field *field_item, - const Item *string_item); + bool have_index(const Item_field *field_item, grn_operator _operator); NormalizedType normalize_field_type(enum_field_types field_type); -------------- next part -------------- HTML����������������������������...Download