Kouhei Sutou
null+****@clear*****
Fri Aug 12 17:35:14 JST 2016
Kouhei Sutou 2016-08-12 17:35:14 +0900 (Fri, 12 Aug 2016) New Revision: f0f36363de2e2fc167aa00db86410524ca26a6c7 https://github.com/ranguba/rroonga/commit/f0f36363de2e2fc167aa00db86410524ca26a6c7 Message: Fix wrong flags value in VariableSizeColumn#inspect Modified files: ext/groonga/rb-grn-object.c test/test-variable-size-column.rb Modified: ext/groonga/rb-grn-object.c (+18 -21) =================================================================== --- ext/groonga/rb-grn-object.c 2016-08-12 17:28:45 +0900 (e367da0) +++ ext/groonga/rb-grn-object.c 2016-08-12 17:35:14 +0900 (99dd121) @@ -850,30 +850,27 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected, } switch (object->header.type) { - case GRN_COLUMN_FIX_SIZE: - case GRN_COLUMN_VAR_SIZE: + case GRN_TYPE: if (flags & GRN_OBJ_KEY_VAR_SIZE) { rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_VAR_SIZE")); + } else { + switch (flags & GRN_OBJ_KEY_MASK) { + case GRN_OBJ_KEY_UINT: + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_UINT")); + break; + case GRN_OBJ_KEY_INT: + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_INT")); + break; + case GRN_OBJ_KEY_FLOAT: + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_FLOAT")); + break; + case GRN_OBJ_KEY_GEO_POINT: + rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_GEO_POINT")); + break; + default: + break; + } } - break; - case GRN_TYPE: - switch (flags & GRN_OBJ_KEY_MASK) { - case GRN_OBJ_KEY_UINT: - rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_UINT")); - break; - case GRN_OBJ_KEY_INT: - rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_INT")); - break; - case GRN_OBJ_KEY_FLOAT: - rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_FLOAT")); - break; - case GRN_OBJ_KEY_GEO_POINT: - rb_ary_push(inspected_flags, rb_str_new_cstr("KEY_GEO_POINT")); - break; - default: - break; - } - break; default: break; } Modified: test/test-variable-size-column.rb (+1 -1) =================================================================== --- test/test-variable-size-column.rb 2016-08-12 17:28:45 +0900 (63932c5) +++ test/test-variable-size-column.rb 2016-08-12 17:35:14 +0900 (f25096f) @@ -103,7 +103,7 @@ class VariableSizeColumnTest < Test::Unit::TestCase "path: <#{@users_name_column_path}>, " + "domain: <Users>, " + "range: <ShortText>, " + - "flags: <KEY_VAR_SIZE>" + + "flags: <>" + ">", @name.inspect) end -------------- next part -------------- HTML����������������������������...Download