Kouhei Sutou
null+****@clear*****
Wed Jan 7 13:03:57 JST 2015
Kouhei Sutou 2015-01-07 13:03:57 +0900 (Wed, 07 Jan 2015) New Revision: 9c575ce03ed44bf6a88c1ce4f146e4cb3f6c8c85 https://github.com/mroonga/mroonga/commit/9c575ce03ed44bf6a88c1ce4f146e4cb3f6c8c85 Message: Use String.length() to get value length Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+5 -4) =================================================================== --- ha_mroonga.cpp 2014-12-30 14:01:38 +0900 (d21a6b2) +++ ha_mroonga.cpp 2015-01-07 13:03:57 +0900 (f1947f7) @@ -9600,9 +9600,9 @@ int ha_mroonga::generic_store_bulk_blob(Field *field, grn_obj *buf) int error = 0; String buffer; Field_blob *blob = (Field_blob *)field; - const char *value = blob->val_str(0, &buffer)->ptr(); + String *value = blob->val_str(0, &buffer); grn_obj_reinit(ctx, buf, GRN_DB_TEXT, 0); - GRN_TEXT_SET(ctx, buf, value, blob->get_length()); + GRN_TEXT_SET(ctx, buf, value->ptr(), value->length()); DBUG_RETURN(error); } @@ -9613,8 +9613,9 @@ int ha_mroonga::generic_store_bulk_geometry(Field *field, grn_obj *buf) #ifdef HAVE_SPATIAL String buffer; Field_geom *geometry = (Field_geom *)field; - const char *wkb = geometry->val_str(0, &buffer)->ptr(); - int len = geometry->get_length(); + String *value = geometry->val_str(0, &buffer); + const char *wkb = value->ptr(); + int len = value->length(); error = mrn_set_geometry(ctx, buf, wkb, len); #endif DBUG_RETURN(error); -------------- next part -------------- HTML����������������������������...ダウンロード
