Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mroonga/mroonga
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kentoku
Kentoku committed Nov 27, 2011
2 parents d0f473b + d6b0324 commit ab791c1
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 36 deletions.
5 changes: 5 additions & 0 deletions configure.ac
View file
Expand Up @@ -56,7 +56,12 @@ AC_DEFUN([CHECK_CXXFLAG], [

if test "$GCC" = "yes"; then
CHECK_CFLAG([-Wall])
CHECK_CFLAG([-Wextra])
CHECK_CFLAG([-Wno-unused-parameter])

CHECK_CXXFLAG([-Wall])
CHECK_CXXFLAG([-Wextra])
CHECK_CXXFLAG([-Wno-unused-parameter])
fi

standalone_build=
Expand Down
27 changes: 12 additions & 15 deletions ha_mroonga.cc
View file
Expand Up @@ -890,7 +890,6 @@ static int mrn_set_key_buf(grn_ctx *ctx, Field *field,

static uint mrn_alter_table_flags(uint flags) {
uint ret_flags = 0;
#ifdef MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE
ret_flags |=
HA_INPLACE_ADD_INDEX_NO_READ_WRITE |
HA_INPLACE_DROP_INDEX_NO_READ_WRITE |
Expand All @@ -904,7 +903,6 @@ static uint mrn_alter_table_flags(uint flags) {
HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE |
HA_INPLACE_ADD_PK_INDEX_NO_WRITE |
HA_INPLACE_DROP_PK_INDEX_NO_WRITE;
#endif
return ret_flags;
}

Expand Down Expand Up @@ -7777,7 +7775,7 @@ uint ha_mroonga::alter_table_flags(uint flags)
DBUG_RETURN(res);
}

#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
uint num_of_keys, handler_add_index **add)
#else
Expand Down Expand Up @@ -7817,7 +7815,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
(const uchar *) share->table_name,
(const uchar *) share->table_name + share->table_name_length);
mrn_table_name_gen(decode_name, grn_table_name);
#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
hnd_add_index = NULL;
#endif
bitmap_clear_all(table->read_set);
Expand Down Expand Up @@ -7930,7 +7928,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
{
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
res = wrap_handler->add_index(table_arg, wrap_key_info, j, &hnd_add_index);
#else
res = wrap_handler->add_index(table_arg, wrap_key_info, j);
Expand All @@ -7951,7 +7949,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
}
}
}
#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
else {
*add = new handler_add_index(table_arg, key_info, num_of_keys);
}
Expand All @@ -7961,7 +7959,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
DBUG_RETURN(res);
}

#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info,
uint num_of_keys, handler_add_index **add)
#else
Expand All @@ -7970,13 +7968,12 @@ int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info,
#endif
{
int res = 0;
uint i, j, k;
uint i;
uint n_keys = table->s->keys;
grn_obj *index_tables[num_of_keys + n_keys];
grn_obj *index_columns[num_of_keys + n_keys];
char grn_table_name[MRN_MAX_PATH_SIZE];
char decode_name[MRN_MAX_PATH_SIZE];
THD *thd = ha_thd();
MRN_SHARE *tmp_share;
TABLE_SHARE tmp_table_share;
char **key_parser;
Expand Down Expand Up @@ -8032,14 +8029,14 @@ int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info,
bitmap_set_all(table->read_set);
if (res)
{
for (k = 0; k < i; k++) {
if (index_tables[k + n_keys])
for (uint j = 0; j < i; j++) {
if (index_tables[j + n_keys])
{
grn_obj_remove(ctx, index_tables[k + n_keys]);
grn_obj_remove(ctx, index_tables[j + n_keys]);
}
}
}
#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
else {
*add = new handler_add_index(table_arg, key_info, num_of_keys);
}
Expand Down Expand Up @@ -8102,7 +8099,7 @@ int ha_mroonga::storage_add_index_multiple_columns(KEY *key_info,
DBUG_RETURN(error);
}

#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::add_index(TABLE *table_arg, KEY *key_info,
uint num_of_keys, handler_add_index **add)
{
Expand Down Expand Up @@ -8132,7 +8129,7 @@ int ha_mroonga::add_index(TABLE *table_arg, KEY *key_info,
}
#endif

#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::wrapper_final_add_index(handler_add_index *add, bool commit)
{
int res = 0;
Expand Down
14 changes: 5 additions & 9 deletions ha_mroonga.h
View file
Expand Up @@ -41,7 +41,7 @@ extern "C" {

#if (MYSQL_VERSION_ID >= 50603) || \
(MYSQL_VERSION_ID >= 50514)
# define MRN_HANDLER_HAVE_ADD_INDEX 1
# define MRN_HANDLER_HAVE_FINAL_ADD_INDEX 1
#endif

#if (MYSQL_VERSION_ID >= 50603) || \
Expand All @@ -63,10 +63,6 @@ extern "C" {
# define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1
#endif

#if MYSQL_VERSION_ID >= 50512
# define MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE
#endif

#ifndef MRN_MARIADB_P
# define MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
#endif
Expand Down Expand Up @@ -165,7 +161,7 @@ class ha_mroonga: public handler
bool ignoring_duplicated_key;
bool fulltext_searching;

#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
handler_add_index *hnd_add_index;
#endif

Expand Down Expand Up @@ -312,7 +308,7 @@ class ha_mroonga: public handler
bool check_if_incompatible_data(HA_CREATE_INFO *create_info,
uint table_changes);
uint alter_table_flags(uint flags);
#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys,
handler_add_index **add);
int final_add_index(handler_add_index *add, bool commit);
Expand Down Expand Up @@ -648,7 +644,7 @@ class ha_mroonga: public handler
uint table_changes);
uint wrapper_alter_table_flags(uint flags);
uint storage_alter_table_flags(uint flags);
#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int wrapper_add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys,
handler_add_index **add);
int storage_add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys,
Expand All @@ -659,7 +655,7 @@ class ha_mroonga: public handler
#endif
int storage_add_index_multiple_columns(KEY *key_info, uint num_of_keys,
grn_obj **index_columns);
#ifdef MRN_HANDLER_HAVE_ADD_INDEX
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int wrapper_final_add_index(handler_add_index *add, bool commit);
int storage_final_add_index(handler_add_index *add, bool commit);
#endif
Expand Down
16 changes: 16 additions & 0 deletions mrn_mysql_compat.h
View file
Expand Up @@ -24,6 +24,22 @@
# define my_free(PTR, FLAG) my_free(PTR)
#endif

#ifndef HA_INPLACE_ADD_INDEX_NO_READ_WRITE
# define HA_INPLACE_ADD_INDEX_NO_READ_WRITE HA_ONLINE_ADD_INDEX_NO_WRITES
# define HA_INPLACE_DROP_INDEX_NO_READ_WRITE HA_ONLINE_DROP_INDEX_NO_WRITES
# define HA_INPLACE_ADD_UNIQUE_INDEX_NO_READ_WRITE HA_ONLINE_ADD_UNIQUE_INDEX_NO_WRITES
# define HA_INPLACE_DROP_UNIQUE_INDEX_NO_READ_WRITE HA_ONLINE_DROP_UNIQUE_INDEX_NO_WRITES
# define HA_INPLACE_ADD_PK_INDEX_NO_READ_WRITE HA_ONLINE_ADD_PK_INDEX_NO_WRITES
# define HA_INPLACE_DROP_PK_INDEX_NO_READ_WRITE HA_ONLINE_DROP_PK_INDEX_NO_WRITES

# define HA_INPLACE_ADD_INDEX_NO_WRITE HA_ONLINE_ADD_INDEX
# define HA_INPLACE_DROP_INDEX_NO_WRITE HA_ONLINE_DROP_INDEX
# define HA_INPLACE_ADD_UNIQUE_INDEX_NO_WRITE HA_ONLINE_ADD_UNIQUE_INDEX
# define HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE HA_ONLINE_DROP_UNIQUE_INDEX
# define HA_INPLACE_ADD_PK_INDEX_NO_WRITE HA_ONLINE_ADD_PK_INDEX
# define HA_INPLACE_DROP_PK_INDEX_NO_WRITE HA_ONLINE_DROP_PK_INDEX
#endif

#if MYSQL_VERSION_ID < 50600
typedef Item COND;
#endif
Expand Down
7 changes: 0 additions & 7 deletions test/sql/include/have_inplace_index_change.inc
View file

This file was deleted.

1 change: 0 additions & 1 deletion test/sql/suite/groonga_storage/t/fulltext_index_recreate.test
View file
Expand Up @@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

--source include/have_inplace_index_change.inc
--source include/have_groonga.inc

--disable_warnings
Expand Down
1 change: 0 additions & 1 deletion test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test
View file
Expand Up @@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

--source include/have_inplace_index_change.inc
--source include/have_groonga.inc

--disable_warnings
Expand Down
1 change: 0 additions & 1 deletion test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test
View file
Expand Up @@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

--source include/have_inplace_index_change.inc
--source include/have_groonga.inc

--disable_warnings
Expand Down
1 change: 0 additions & 1 deletion test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test
View file
Expand Up @@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

--source include/have_inplace_index_change.inc
--source include/have_groonga.inc

--disable_warnings
Expand Down
1 change: 0 additions & 1 deletion test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test
View file
Expand Up @@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

--source include/have_inplace_index_change.inc
--source include/have_groonga.inc

--disable_warnings
Expand Down

0 comments on commit ab791c1

Please sign in to comment.