null+****@clear*****
null+****@clear*****
2011年 9月 23日 (金) 20:30:31 JST
Kouhei Sutou 2011-09-23 11:30:31 +0000 (Fri, 23 Sep 2011)
New Revision: 56d8b4cc0f31a9ca61a87325e72613e8287e43e2
Log:
col_name -> column_name.
Modified files:
ha_mroonga.cc
Modified: ha_mroonga.cc (+51 -51)
===================================================================
--- ha_mroonga.cc 2011-09-23 11:29:11 +0000 (9127bae)
+++ ha_mroonga.cc 2011-09-23 11:30:31 +0000 (f4ace72)
@@ -1562,9 +1562,9 @@ int ha_mroonga::storage_create(const char *name, TABLE *table,
int key_parts = key_info.key_parts;
if (key_parts == 1) {
Field *pkey_field = key_info.key_part[0].field;
- const char *col_name = pkey_field->field_name;
- int col_name_size = strlen(col_name);
- is_id = (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0);
+ const char *column_name = pkey_field->field_name;
+ int column_name_size = strlen(column_name);
+ is_id = (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0);
int mysql_field_type = pkey_field->type();
grn_builtin_type gtype = mrn_get_type(ctx, mysql_field_type);
@@ -1613,11 +1613,11 @@ int ha_mroonga::storage_create(const char *name, TABLE *table,
for (i = 0; i < n_columns; i++) {
grn_obj *col_obj, *col_type;
Field *field = table->s->field[i];
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) continue;
- if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) continue;
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) continue;
+ if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) continue;
grn_obj_flags col_flags = GRN_OBJ_PERSISTENT | GRN_OBJ_COLUMN_SCALAR;
int mysql_field_type = field->type();
@@ -1625,7 +1625,7 @@ int ha_mroonga::storage_create(const char *name, TABLE *table,
col_type = grn_ctx_at(ctx, gtype);
char *col_path = NULL; // we don't specify path
- col_obj = grn_column_create(ctx, tbl_obj, col_name, col_name_size,
+ col_obj = grn_column_create(ctx, tbl_obj, column_name, column_name_size,
col_path, col_flags, col_type);
if (ctx->rc) {
grn_obj_remove(ctx, tbl_obj);
@@ -1738,9 +1738,9 @@ int ha_mroonga::storage_create_validate_pseudo_column(TABLE *table)
n_columns = table->s->fields;
for (i = 0; i < n_columns; i++) {
Field *field = table->s->field[i];
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
switch (field->type()) {
case MYSQL_TYPE_TINY :
case MYSQL_TYPE_SHORT :
@@ -1754,7 +1754,7 @@ int ha_mroonga::storage_create_validate_pseudo_column(TABLE *table)
my_message(error, "_id must be numeric data type", MYF(0));
DBUG_RETURN(error);
}
- } else if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ } else if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
switch (field->type()) {
case MYSQL_TYPE_FLOAT :
case MYSQL_TYPE_DOUBLE :
@@ -1787,9 +1787,9 @@ int ha_mroonga::storage_create_validate_index(TABLE *table)
continue;
}
Field *field = key_info.key_part[0].field;
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
if (key_info.algorithm == HA_KEY_ALG_HASH) {
continue; // hash index is ok
}
@@ -1798,7 +1798,7 @@ int ha_mroonga::storage_create_validate_index(TABLE *table)
my_message(error, "only hash index can be defined for _id", MYF(0));
DBUG_RETURN(error);
}
- if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
GRN_LOG(ctx, GRN_LOG_ERROR, "_score cannot be used for index");
error = ER_CANT_CREATE_TABLE;
my_message(error, "_score cannot be used for index", MYF(0));
@@ -3092,19 +3092,19 @@ int ha_mroonga::storage_write_row(uchar *buf)
if (thd->abort_on_warning) {
for (i = 0; i < n_columns; i++) {
Field *field = table->field[i];
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
if (field->is_null()) continue;
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
#ifndef DBUG_OFF
dbug_tmp_restore_column_map(table->read_set, tmp_map);
#endif
my_message(ER_DATA_TOO_LONG, "cannot insert value to _id column", MYF(0));
DBUG_RETURN(ER_DATA_TOO_LONG);
}
- if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
#ifndef DBUG_OFF
dbug_tmp_restore_column_map(table->read_set, tmp_map);
#endif
@@ -3152,18 +3152,18 @@ int ha_mroonga::storage_write_row(uchar *buf)
GRN_VOID_INIT(&colbuf);
for (i = 0; i < n_columns; i++) {
Field *field = table->field[i];
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
if (field->is_null()) continue;
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
"data truncated for _id column");
continue;
}
- if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
"data truncated for _score column");
continue;
@@ -3413,16 +3413,16 @@ int ha_mroonga::storage_update_row(const uchar *old_data, uchar *new_data)
if (thd->abort_on_warning) {
for (i = 0; i < n_columns; i++) {
Field *field = table->field[i];
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
if (bitmap_is_set(table->write_set, field->field_index)) {
if (field->is_null()) continue;
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
my_message(ER_DATA_TOO_LONG, "cannot update value to _id column", MYF(0));
DBUG_RETURN(ER_DATA_TOO_LONG);
}
- if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
my_message(ER_DATA_TOO_LONG, "cannot update value to _score column", MYF(0));
DBUG_RETURN(ER_DATA_TOO_LONG);
}
@@ -3433,8 +3433,8 @@ int ha_mroonga::storage_update_row(const uchar *old_data, uchar *new_data)
GRN_VOID_INIT(&colbuf);
for (i = 0; i < n_columns; i++) {
Field *field = table->field[i];
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
if (bitmap_is_set(table->write_set, field->field_index)) {
#ifndef DBUG_OFF
my_bitmap_map *tmp_map = dbug_tmp_use_all_columns(table, table->read_set);
@@ -3443,7 +3443,7 @@ int ha_mroonga::storage_update_row(const uchar *old_data, uchar *new_data)
if (field->is_null()) continue;
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
"data truncated for _id column");
#ifndef DBUG_OFF
@@ -3452,7 +3452,7 @@ int ha_mroonga::storage_update_row(const uchar *old_data, uchar *new_data)
continue;
}
- if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
"data truncated for _score column");
#ifndef DBUG_OFF
@@ -3674,10 +3674,10 @@ ha_rows ha_mroonga::storage_records_in_range(uint key_nr, key_range *range_min,
} else {
KEY_PART_INFO key_part = key_info.key_part[0];
Field *field = key_part.field;
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
DBUG_RETURN((ha_rows)1) ;
}
@@ -3885,15 +3885,15 @@ int ha_mroonga::storage_index_read_map(uchar *buf, const uchar *key,
KEY_PART_INFO key_part = key_info.key_part[0];
Field *field = key_part.field;
if (find_flag == HA_READ_KEY_EXACT) {
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
mrn_set_key_buf(ctx, field, key, key_min[key_nr], &size_min);
val_min = key_min[key_nr];
val_max = key_min[key_nr];
size_max = size_min;
// for _id
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
grn_id found_record_id = *(grn_id *)key_min[key_nr];
if (grn_table_at(ctx, grn_table, found_record_id) != GRN_ID_NIL) { // found
store_fields_from_primary_table(buf, found_record_id);
@@ -4482,15 +4482,15 @@ int ha_mroonga::storage_read_range_first(const key_range *start_key,
} else {
KEY_PART_INFO key_part = key_info.key_part[0];
Field *field = key_part.field;
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
if (start_key) {
mrn_set_key_buf(ctx, field, start_key->key, key_min[active_index],
&size_min);
val_min = key_min[active_index];
if (start_key->flag == HA_READ_KEY_EXACT) {
// for _id
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
grn_id found_record_id = *(grn_id *)key_min[active_index];
if (grn_table_at(ctx, grn_table, found_record_id) != GRN_ID_NIL) { // found
store_fields_from_primary_table(table->record[0], found_record_id);
@@ -5208,12 +5208,12 @@ void ha_mroonga::check_fast_order_limit()
DBUG_VOID_RETURN;
}
Field *field = ((Item_field *) (*order->item))->field;
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
- sort_keys[i].key = grn_obj_column(ctx, grn_table, col_name, col_name_size);
- } else if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
+ sort_keys[i].key = grn_obj_column(ctx, grn_table, column_name, column_name_size);
+ } else if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
sort_keys[i].key = NULL;
} else {
sort_keys[i].key = grn_columns[field->field_index];
@@ -5258,12 +5258,12 @@ void ha_mroonga::store_fields_from_primary_table(uchar *buf, grn_id record_id)
if (bitmap_is_set(table->read_set, field->field_index) ||
bitmap_is_set(table->write_set, field->field_index)) {
- const char *col_name = field->field_name;
- int col_name_size = strlen(col_name);
+ const char *column_name = field->field_name;
+ int column_name_size = strlen(column_name);
if (ignoring_no_key_columns) {
KEY key_info = table->s->key_info[active_index];
- if (strcmp(key_info.key_part[0].field->field_name, col_name)) {
+ if (strcmp(key_info.key_part[0].field->field_name, column_name)) {
continue;
}
}
@@ -5274,11 +5274,11 @@ void ha_mroonga::store_fields_from_primary_table(uchar *buf, grn_id record_id)
#endif
DBUG_PRINT("info", ("mroonga store column %d(%d)",i,field->field_index));
field->move_field_offset(ptr_diff);
- if (strncmp(MRN_COLUMN_NAME_ID, col_name, col_name_size) == 0) {
+ if (strncmp(MRN_COLUMN_NAME_ID, column_name, column_name_size) == 0) {
// for _id column
field->set_notnull();
field->store((int) record_id);
- } else if (strncmp(MRN_COLUMN_NAME_SCORE, col_name, col_name_size) == 0) {
+ } else if (strncmp(MRN_COLUMN_NAME_SCORE, column_name, column_name_size) == 0) {
// for _score column
if (result && result->header.flags & GRN_OBJ_WITH_SUBREC) {
float score;