Navigation Menu

Skip to content

Commit

Permalink
removed path from mrn_field. now use custom path for each column.
Browse files Browse the repository at this point in the history
  • Loading branch information
ikdttr committed Mar 5, 2009
1 parent 46100db commit 4efe4d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
14 changes: 6 additions & 8 deletions src/ha_groonga.cc
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/ha_groonga.h
Expand Up @@ -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;
Expand Down

0 comments on commit 4efe4d7

Please sign in to comment.