null+****@clear*****
null+****@clear*****
2011年 6月 20日 (月) 16:05:31 JST
Kouhei Sutou 2011-06-20 07:05:31 +0000 (Mon, 20 Jun 2011)
New Revision: 7f55d888e687e6794439d484a0fb037b489d969a
Log:
[wrapper][insert] extract groonga related code.
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+82 -41)
===================================================================
--- ha_mroonga.cc 2011-06-20 06:34:34 +0000 (627f7c6)
+++ ha_mroonga.cc 2011-06-20 07:05:31 +0000 (de30ae3)
@@ -61,10 +61,12 @@
#include "mrn_table.h"
#include "ha_mroonga.h"
+#define MRN_MESSAGE_BUFFER_SIZE 1024
+
#define MRN_DBUG_ENTER_FUNCTION() DBUG_ENTER(__FUNCTION__)
#if !defined(DBUG_OFF) && !defined(_lint)
# define MRN_DBUG_ENTER_METHOD() \
- char method_name[512]; \
+ char method_name[MRN_MESSAGE_BUFFER_SIZE]; \
method_name[0] = '\0'; \
strcat(method_name, "ha_mroonga::"); \
strcat(method_name, __FUNCTION__); \
@@ -73,7 +75,6 @@
# define MRN_DBUG_ENTER_METHOD() MRN_DBUG_ENTER_FUNCTION()
#endif
-
#if MYSQL_VERSION_ID >= 50500
extern mysql_mutex_t LOCK_open;
#else
@@ -2565,61 +2566,101 @@ int ha_mroonga::wrapper_write_row(uchar *buf)
MRN_SET_BASE_TABLE_KEY(this, table);
if (!error) {
- // TODO: extract as a method.
- grn_id record_id;
+ error = wrapper_write_row_index(buf);
+ }
- grn_obj key;
- GRN_TEXT_INIT(&key, 0);
+ DBUG_RETURN(error);
+}
- grn_bulk_space(ctx, &key, table->key_info->key_length);
- key_copy((uchar *)(GRN_TEXT_VALUE(&key)),
- table->record[0],
- &(table->key_info[table_share->primary_key]),
- table->key_info[table_share->primary_key].key_length);
+int ha_mroonga::wrapper_write_row_index(uchar *buf)
+{
+ MRN_DBUG_ENTER_METHOD();
- int added;
- record_id = grn_table_add(ctx, grn_table,
- GRN_TEXT_VALUE(&key), GRN_TEXT_LEN(&key),
- &added);
- grn_obj_unlink(ctx, &key);
+ int error = 0;
+
+ bool have_fulltext_index = FALSE;
+
+ uint i;
+ uint n_keys = table->s->keys;
+ for (i = 0; i < n_keys; i++) {
+ KEY key_info = table->key_info[i];
+
+ if (key_info.algorithm == HA_KEY_ALG_FULLTEXT) {
+ have_fulltext_index = TRUE;
+ break;
+ }
+ }
+ if (!have_fulltext_index) {
+ DBUG_RETURN(error);
+ }
+
+ grn_obj key;
+ GRN_TEXT_INIT(&key, 0);
+
+ grn_bulk_space(ctx, &key, table->key_info->key_length);
+ key_copy((uchar *)(GRN_TEXT_VALUE(&key)),
+ buf,
+ &(table->key_info[table_share->primary_key]),
+ table->key_info[table_share->primary_key].key_length);
+
+ int added;
+ grn_id record_id;
+ record_id = grn_table_add(ctx, grn_table,
+ GRN_TEXT_VALUE(&key), GRN_TEXT_LEN(&key),
+ &added);
+ if (record_id == GRN_ID_NIL) {
+ char error_message[MRN_MESSAGE_BUFFER_SIZE];
+ snprintf(error_message, MRN_MESSAGE_BUFFER_SIZE,
+ "failed to add a new row into groonga: key=<%.*s>",
+ GRN_TEXT_LEN(&key), GRN_TEXT_VALUE(&key));
+ error = ER_ERROR_ON_WRITE;
+ my_message(error, error_message, MYF(0));
+ }
+ grn_obj_unlink(ctx, &key);
+ if (error) {
+ DBUG_RETURN(error);
+ }
- grn_obj value;
- GRN_VOID_INIT(&value);
+ grn_obj new_value;
+ GRN_VOID_INIT(&new_value);
#ifndef DBUG_OFF
- my_bitmap_map *tmp_map = dbug_tmp_use_all_columns(table, table->read_set);
+ my_bitmap_map *tmp_map = dbug_tmp_use_all_columns(table, table->read_set);
#endif
- uint i;
- uint n_keys = table->s->keys;
- for (i = 0; i < n_keys; i++) {
- grn_rc rc;
- KEY key_info = table->key_info[i];
+ for (i = 0; i < n_keys; i++) {
+ grn_rc rc;
+ KEY key_info = table->key_info[i];
- if (key_info.algorithm != HA_KEY_ALG_FULLTEXT) {
- continue;
- }
+ if (key_info.algorithm != HA_KEY_ALG_FULLTEXT) {
+ continue;
+ }
- grn_obj *index_column = grn_index_columns[i];
+ grn_obj *index_column = grn_index_columns[i];
- uint j;
- for (j = 0; j < key_info.key_parts; j++) {
- Field *field = key_info.key_part[j].field;
- const char *column_name = field->field_name;
+ uint j;
+ for (j = 0; j < key_info.key_parts; j++) {
+ Field *field = key_info.key_part[j].field;
+ const char *column_name = field->field_name;
- if (field->is_null())
- continue;
+ if (field->is_null())
+ continue;
- int column_size;
- mrn_set_buf(ctx, field, &value, &column_size);
- rc = grn_column_index_update(ctx, index_column, record_id, 1, NULL, &value);
- // TODO: check rc;
+ int new_column_size;
+ mrn_set_buf(ctx, field, &new_value, &new_column_size);
+ rc = grn_column_index_update(ctx, index_column, record_id, 1,
+ NULL, &new_value);
+ if (rc) {
+ error = ER_ERROR_ON_WRITE;
+ my_message(error, ctx->errbuf, MYF(0));
+ goto err;
}
}
+ }
+err:
#ifndef DBUG_OFF
- dbug_tmp_restore_column_map(table->read_set, tmp_map);
+ dbug_tmp_restore_column_map(table->read_set, tmp_map);
#endif
- grn_obj_unlink(ctx, &value);
- }
+ grn_obj_unlink(ctx, &new_value);
DBUG_RETURN(error);
}
Modified: ha_mroonga.h (+1 -0)
===================================================================
--- ha_mroonga.h 2011-06-20 06:34:34 +0000 (327241c)
+++ ha_mroonga.h 2011-06-20 07:05:31 +0000 (18cf64b)
@@ -263,6 +263,7 @@ private:
int wrapper_end_bulk_insert();
int default_end_bulk_insert();
int wrapper_write_row(uchar *buf);
+ int wrapper_write_row_index(uchar *buf);
int default_write_row(uchar *buf);
int wrapper_update_row(const uchar *old_data, uchar *new_data);
int default_update_row(const uchar *old_data, uchar *new_data);