summaryrefslogtreecommitdiff
path: root/storage/mroonga
diff options
context:
space:
mode:
Diffstat (limited to 'storage/mroonga')
-rw-r--r--storage/mroonga/ha_mroonga.cpp28
-rw-r--r--storage/mroonga/lib/mrn_debug_column_access.cpp2
-rw-r--r--storage/mroonga/lib/mrn_debug_column_access.hpp6
3 files changed, 18 insertions, 18 deletions
diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp
index 8638399717e..128bc9b3583 100644
--- a/storage/mroonga/ha_mroonga.cpp
+++ b/storage/mroonga/ha_mroonga.cpp
@@ -5919,7 +5919,7 @@ int ha_mroonga::wrapper_write_row_index(const uchar *buf)
DBUG_RETURN(0);
}
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
uint i;
uint n_keys = table->s->keys;
for (i = 0; i < n_keys; i++) {
@@ -5994,7 +5994,7 @@ int ha_mroonga::storage_write_row(const uchar *buf)
DBUG_RETURN(error);
}
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
for (i = 0; i < n_columns; i++) {
Field *field = table->field[i];
@@ -6275,7 +6275,7 @@ int ha_mroonga::storage_write_row_multiple_column_indexes(const uchar *buf,
int error = 0;
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
uint i;
uint n_keys = table->s->keys;
for (i = 0; i < n_keys; i++) {
@@ -6569,7 +6569,7 @@ int ha_mroonga::wrapper_update_row_index(const uchar *old_data,
DBUG_RETURN(0);
}
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
uint i;
uint n_keys = table->s->keys;
for (i = 0; i < n_keys; i++) {
@@ -6690,7 +6690,7 @@ int ha_mroonga::storage_update_row(const uchar *old_data,
grn_obj new_value;
GRN_VOID_INIT(&new_value);
{
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
generic_store_bulk(field, &new_value);
}
grn_obj casted_value;
@@ -6719,7 +6719,7 @@ int ha_mroonga::storage_update_row(const uchar *old_data,
storage_store_fields_for_prep_update(old_data, new_data, record_id);
{
mrn::Lock lock(&(share->record_mutex), have_unique_index());
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
if ((error = storage_prepare_delete_row_unique_indexes(old_data,
record_id))) {
DBUG_RETURN(error);
@@ -6744,7 +6744,7 @@ int ha_mroonga::storage_update_row(const uchar *old_data,
#endif
if (bitmap_is_set(table->write_set, field->field_index)) {
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
DBUG_PRINT("info", ("mroonga: update column %d(%d)",i,field->field_index));
if (field->is_null()) continue;
@@ -6821,7 +6821,7 @@ int ha_mroonga::storage_update_row(const uchar *old_data,
if (table->found_next_number_field &&
!table->s->next_number_keypart &&
new_data == table->record[0]) {
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
Field_num *field = (Field_num *) table->found_next_number_field;
if (field->unsigned_flag || field->val_int() > 0) {
MRN_LONG_TERM_SHARE *long_term_share = share->long_term_share;
@@ -6878,7 +6878,7 @@ int ha_mroonga::storage_update_row_index(const uchar *old_data,
my_ptrdiff_t ptr_diff = PTR_BYTE_DIFF(old_data, table->record[0]);
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
uint i;
uint n_keys = table->s->keys;
mrn_change_encoding(ctx, NULL);
@@ -7094,7 +7094,7 @@ int ha_mroonga::wrapper_delete_row_index(const uchar *buf)
DBUG_RETURN(0);
}
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
uint i;
uint n_keys = table->s->keys;
for (i = 0; i < n_keys; i++) {
@@ -7245,7 +7245,7 @@ int ha_mroonga::storage_delete_row_index(const uchar *buf)
GRN_TEXT_INIT(&key, 0);
GRN_TEXT_INIT(&encoded_key, 0);
- mrn::DebugColumnAccess debug_column_access(table, table->read_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->read_set);
uint i;
uint n_keys = table->s->keys;
mrn_change_encoding(ctx, NULL);
@@ -11436,7 +11436,7 @@ void ha_mroonga::storage_store_fields(uchar *buf, grn_id record_id)
}
}
- mrn::DebugColumnAccess debug_column_access(table, table->write_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->write_set);
DBUG_PRINT("info", ("mroonga: store column %d(%d)",i,field->field_index));
field->move_field_offset(ptr_diff);
if (strcmp(MRN_COLUMN_NAME_ID, column_name) == 0) {
@@ -11501,7 +11501,7 @@ void ha_mroonga::storage_store_fields_for_prep_update(const uchar *old_data,
)
#endif
) {
- mrn::DebugColumnAccess debug_column_access(table, table->write_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->write_set);
DBUG_PRINT("info", ("mroonga: store column %d(%d)",i,field->field_index));
grn_obj value;
GRN_OBJ_INIT(&value, GRN_BULK, 0, grn_obj_get_range(ctx, grn_columns[i]));
@@ -11537,7 +11537,7 @@ void ha_mroonga::storage_store_fields_by_index(uchar *buf)
if (KEY_N_KEY_PARTS(key_info) == 1) {
my_ptrdiff_t ptr_diff = PTR_BYTE_DIFF(buf, table->record[0]);
Field *field = key_info->key_part->field;
- mrn::DebugColumnAccess debug_column_access(table, table->write_set);
+ mrn::DebugColumnAccess debug_column_access(table, &table->write_set);
field->move_field_offset(ptr_diff);
storage_store_field(field, (const char *)key, key_length);
field->move_field_offset(-ptr_diff);
diff --git a/storage/mroonga/lib/mrn_debug_column_access.cpp b/storage/mroonga/lib/mrn_debug_column_access.cpp
index 778300a33d6..cb2ce7e35ca 100644
--- a/storage/mroonga/lib/mrn_debug_column_access.cpp
+++ b/storage/mroonga/lib/mrn_debug_column_access.cpp
@@ -20,7 +20,7 @@
#include "mrn_debug_column_access.hpp"
namespace mrn {
- DebugColumnAccess::DebugColumnAccess(TABLE *table, MY_BITMAP *bitmap)
+ DebugColumnAccess::DebugColumnAccess(TABLE *table, MY_BITMAP **bitmap)
: table_(table),
bitmap_(bitmap) {
#ifdef DBUG_ASSERT_EXISTS
diff --git a/storage/mroonga/lib/mrn_debug_column_access.hpp b/storage/mroonga/lib/mrn_debug_column_access.hpp
index 7c2fd60344e..954e04135f8 100644
--- a/storage/mroonga/lib/mrn_debug_column_access.hpp
+++ b/storage/mroonga/lib/mrn_debug_column_access.hpp
@@ -25,12 +25,12 @@
namespace mrn {
class DebugColumnAccess {
TABLE *table_;
- MY_BITMAP *bitmap_;
+ MY_BITMAP **bitmap_;
#ifdef DBUG_ASSERT_EXISTS
- my_bitmap_map *map_;
+ MY_BITMAP *map_;
#endif
public:
- DebugColumnAccess(TABLE *table, MY_BITMAP *bitmap);
+ DebugColumnAccess(TABLE *table, MY_BITMAP **bitmap);
~DebugColumnAccess();
};
}
View Lorry Controller Status