Tetsuro IKEDA
null+****@clear*****
Thu Oct 4 10:18:32 JST 2012
Tetsuro IKEDA 2009-03-05 17:13:28 +0900 (Thu, 05 Mar 2009) New Revision: 4efe4d769ab8df71a468cd522079739b49bcfe93 https://github.com/mroonga/mroonga/commit/4efe4d769ab8df71a468cd522079739b49bcfe93 Log: removed path from mrn_field. now use custom path for each column. Modified files: src/ha_groonga.cc src/ha_groonga.h Modified: src/ha_groonga.cc (+6 -8) =================================================================== --- src/ha_groonga.cc 2009-03-05 15:47:24 +0900 (d06d676) +++ src/ha_groonga.cc 2009-03-05 17:13:28 +0900 (9835d89) @@ -152,12 +152,11 @@ int ha_groonga::create(const char *name, TABLE *form, HA_CREATE_INFO *info) case MYSQL_TYPE_LONG: MRN_COLUMN_PATH(buf, form->s->db.str, form->s->table_name.str, field->field_name); type = grn_ctx_get(mrn_ctx_tls, GRN_DB_INT); - /* NOTE: currently using NULL as path but this should be replaced by buf */ MRN_LOG(GRN_LOG_DEBUG, "-> grn_column_create: name='%s', path='%s', type=GRN_DB_INT", - field->field_name, NULL); + field->field_name, buf); column_obj = grn_column_create(mrn_ctx_tls, table_obj, field->field_name, strlen(field->field_name), - NULL, GRN_OBJ_PERSISTENT|GRN_OBJ_COLUMN_SCALAR, type); + buf, GRN_OBJ_PERSISTENT|GRN_OBJ_COLUMN_SCALAR, type); grn_obj_close(mrn_ctx_tls, column_obj); break; default: @@ -208,16 +207,15 @@ int ha_groonga::open(const char *name, int mode, uint test_if_locked) mrn_field *field = (mrn_field*) MRN_MALLOC(sizeof(mrn_field)); field->name = mysql_field->field_name; field->name_len = strlen(field->name); - /* NOTE: currently using NULL as path but this should be replaced */ - field->path = NULL; + snprintf(buf,1023,"%s.%s.grn", share->name, field->name); /* NOTE: currently only support INT */ grn_obj *type = grn_ctx_get(mrn_ctx_tls, GRN_DB_INT); MRN_LOG(GRN_LOG_DEBUG, "-> grn_column_open: name='%s', path='%s'", - field->name, field->path); + field->name, buf); field->obj = grn_column_open(mrn_ctx_tls, share->obj, field->name, field->name_len, - field->path, type); - + buf, type); + MRN_LOG(GRN_LOG_DEBUG, "-> field->obj=%p", field->obj); share->field[i] = field; } share->field[i] = NULL; Modified: src/ha_groonga.h (+0 -2) =================================================================== --- src/ha_groonga.h 2009-03-05 15:47:24 +0900 (c513c28) +++ src/ha_groonga.h 2009-03-05 17:13:28 +0900 (1042d89) @@ -9,9 +9,7 @@ typedef struct _mrn_share_field { const char *name; - const char *path; uint name_len; - uint path_len; grn_obj *obj; grn_id gid; } mrn_field; -------------- next part -------------- HTML����������������������������...Download