Skip to content

M
MariaDB
Commit 61df84de authored by Nayuta Yanagisawa's avatar Nayuta Yanagisawa
Browse files
Options

MDEV-27657 Spider: remove #ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS

parent 284f9226
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 159 deletions
storage/spider/spd_db_conn.cc
View file @ 61df84de
...@@ -1801,12 +1801,6 @@ int spider_db_append_key_where_internal( ...@@ -1801,12 +1801,6 @@ int spider_db_append_key_where_internal(
if (use_key == start_key) if (use_key == start_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_EQUAL_LEN)) if (str->reserve(SPIDER_SQL_EQUAL_LEN))
...@@ -1817,7 +1811,6 @@ int spider_db_append_key_where_internal( ...@@ -1817,7 +1811,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
} else { } else {
...@@ -1855,18 +1848,6 @@ int spider_db_append_key_where_internal( ...@@ -1855,18 +1848,6 @@ int spider_db_append_key_where_internal(
if (use_key == start_key) if (use_key == start_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_key_part_map == 1 || !end_key_part_map)
{
if (str->reserve(SPIDER_SQL_EQUAL_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
}
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_EQUAL_LEN)) if (str->reserve(SPIDER_SQL_EQUAL_LEN))
...@@ -1877,7 +1858,6 @@ int spider_db_append_key_where_internal( ...@@ -1877,7 +1858,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
break; break;
...@@ -1927,18 +1907,6 @@ int spider_db_append_key_where_internal( ...@@ -1927,18 +1907,6 @@ int spider_db_append_key_where_internal(
if (use_key == start_key) if (use_key == start_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_key_part_map == 1 || !end_key_part_map)
{
if (str->reserve(SPIDER_SQL_GT_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_GT_STR, SPIDER_SQL_GT_LEN);
}
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_GT_LEN)) if (str->reserve(SPIDER_SQL_GT_LEN))
...@@ -1949,7 +1917,6 @@ int spider_db_append_key_where_internal( ...@@ -1949,7 +1917,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
break; break;
...@@ -2000,18 +1967,6 @@ int spider_db_append_key_where_internal( ...@@ -2000,18 +1967,6 @@ int spider_db_append_key_where_internal(
if (use_key == start_key) if (use_key == start_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_key_part_map == 1 || !end_key_part_map)
{
if (str->reserve(SPIDER_SQL_LT_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_LT_STR, SPIDER_SQL_LT_LEN);
}
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_LT_LEN)) if (str->reserve(SPIDER_SQL_LT_LEN))
...@@ -2022,7 +1977,6 @@ int spider_db_append_key_where_internal( ...@@ -2022,7 +1977,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
break; break;
...@@ -2067,18 +2021,6 @@ int spider_db_append_key_where_internal( ...@@ -2067,18 +2021,6 @@ int spider_db_append_key_where_internal(
if (use_key == start_key) if (use_key == start_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_key_part_map == 1 || !end_key_part_map)
{
if (str->reserve(SPIDER_SQL_LTEQUAL_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_LTEQUAL_STR, SPIDER_SQL_LTEQUAL_LEN);
}
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_LTEQUAL_LEN)) if (str->reserve(SPIDER_SQL_LTEQUAL_LEN))
...@@ -2089,7 +2031,6 @@ int spider_db_append_key_where_internal( ...@@ -2089,7 +2031,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
break; break;
...@@ -2221,18 +2162,6 @@ int spider_db_append_key_where_internal( ...@@ -2221,18 +2162,6 @@ int spider_db_append_key_where_internal(
if (use_key == start_key) if (use_key == start_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_key_part_map == 1 || !end_key_part_map)
{
if (str->reserve(SPIDER_SQL_GTEQUAL_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_GTEQUAL_STR, SPIDER_SQL_GTEQUAL_LEN);
}
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_GTEQUAL_LEN)) if (str->reserve(SPIDER_SQL_GTEQUAL_LEN))
...@@ -2243,7 +2172,6 @@ int spider_db_append_key_where_internal( ...@@ -2243,7 +2172,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
break; break;
...@@ -2262,14 +2190,6 @@ int spider_db_append_key_where_internal( ...@@ -2262,14 +2190,6 @@ int spider_db_append_key_where_internal(
str_part2->q_append(SPIDER_SQL_AND_STR, str_part2->q_append(SPIDER_SQL_AND_STR,
SPIDER_SQL_AND_LEN); SPIDER_SQL_AND_LEN);
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (use_key == start_key)
{
if (str_part->reserve(SPIDER_SQL_COMMA_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str_part->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
}
#endif
} }
} }
...@@ -2321,12 +2241,6 @@ int spider_db_append_key_where_internal( ...@@ -2321,12 +2241,6 @@ int spider_db_append_key_where_internal(
if (use_key == end_key) if (use_key == end_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_EQUAL_LEN)) if (str->reserve(SPIDER_SQL_EQUAL_LEN))
...@@ -2337,7 +2251,6 @@ int spider_db_append_key_where_internal( ...@@ -2337,7 +2251,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
} else { } else {
...@@ -2389,18 +2302,6 @@ int spider_db_append_key_where_internal( ...@@ -2389,18 +2302,6 @@ int spider_db_append_key_where_internal(
if (use_key == end_key) if (use_key == end_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_key_part_map == 1 || !start_key_part_map)
{
if (str->reserve(SPIDER_SQL_LT_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_LT_STR, SPIDER_SQL_LT_LEN);
}
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_LT_LEN)) if (str->reserve(SPIDER_SQL_LT_LEN))
...@@ -2411,7 +2312,6 @@ int spider_db_append_key_where_internal( ...@@ -2411,7 +2312,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
break; break;
...@@ -2453,18 +2353,6 @@ int spider_db_append_key_where_internal( ...@@ -2453,18 +2353,6 @@ int spider_db_append_key_where_internal(
if (use_key == end_key) if (use_key == end_key)
{ {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_key_part_map == 1 || !start_key_part_map)
{
if (str->reserve(SPIDER_SQL_LTEQUAL_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_LTEQUAL_STR, SPIDER_SQL_LTEQUAL_LEN);
}
if (spider_dbton[dbton_id].db_util->
append_column_value(spider, str_part, field, ptr,
share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_LTEQUAL_LEN)) if (str->reserve(SPIDER_SQL_LTEQUAL_LEN))
...@@ -2475,7 +2363,6 @@ int spider_db_append_key_where_internal( ...@@ -2475,7 +2363,6 @@ int spider_db_append_key_where_internal(
share->access_charset)) share->access_charset))
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
} }
#endif
} }
} }
break; break;
...@@ -2493,14 +2380,6 @@ int spider_db_append_key_where_internal( ...@@ -2493,14 +2380,6 @@ int spider_db_append_key_where_internal(
str_part2->q_append(SPIDER_SQL_AND_STR, str_part2->q_append(SPIDER_SQL_AND_STR,
SPIDER_SQL_AND_LEN); SPIDER_SQL_AND_LEN);
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (use_key == end_key)
{
if (str_part->reserve(SPIDER_SQL_COMMA_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str_part->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
}
#endif
} }
} }
if (use_both && (!start_key_part_map || !end_key_part_map)) if (use_both && (!start_key_part_map || !end_key_part_map))
......
storage/spider/spd_db_mysql.cc
View file @ 61df84de
...@@ -10947,18 +10947,6 @@ int spider_mbase_handler::append_is_null( ...@@ -10947,18 +10947,6 @@ int spider_mbase_handler::append_is_null(
key->flag == HA_READ_KEY_EXACT || key->flag == HA_READ_KEY_EXACT ||
key->flag == HA_READ_KEY_OR_NEXT key->flag == HA_READ_KEY_OR_NEXT
) { ) {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (tgt_final)
{
if (str->reserve(SPIDER_SQL_EQUAL_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
}
str = str_part;
if (str->reserve(SPIDER_SQL_NULL_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_NULL_STR, SPIDER_SQL_NULL_LEN);
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
if (str->reserve(SPIDER_SQL_EQUAL_LEN)) if (str->reserve(SPIDER_SQL_EQUAL_LEN))
...@@ -10969,29 +10957,7 @@ int spider_mbase_handler::append_is_null( ...@@ -10969,29 +10957,7 @@ int spider_mbase_handler::append_is_null(
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_NULL_STR, SPIDER_SQL_NULL_LEN); str->q_append(SPIDER_SQL_NULL_STR, SPIDER_SQL_NULL_LEN);
} }
#endif
} else { } else {
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{
str = str_part;
str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);
ha_next_pos = str->length();
if (str->reserve(SPIDER_SQL_FIRST_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_FIRST_STR, SPIDER_SQL_FIRST_LEN);
spider->result_list.ha_read_kind = 1;
} else if (tgt_final)
{
if (str->reserve(SPIDER_SQL_GT_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_GT_STR, SPIDER_SQL_GT_LEN);
str = str_part;
if (str->reserve(SPIDER_SQL_NULL_LEN))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
str->q_append(SPIDER_SQL_NULL_STR, SPIDER_SQL_NULL_LEN);
}
#else
if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN) if (str_part->length() == SPIDER_SQL_OPEN_PAREN_LEN)
{ {
str = str_part; str = str_part;
...@@ -11003,7 +10969,6 @@ int spider_mbase_handler::append_is_null( ...@@ -11003,7 +10969,6 @@ int spider_mbase_handler::append_is_null(
str->q_append(SPIDER_SQL_FIRST_STR, SPIDER_SQL_FIRST_LEN); str->q_append(SPIDER_SQL_FIRST_STR, SPIDER_SQL_FIRST_LEN);
spider->result_list.ha_read_kind = 1; spider->result_list.ha_read_kind = 1;
} }
#endif
} }
str = str_part2; str = str_part2;
} }
...@@ -11085,9 +11050,6 @@ int spider_mbase_handler::append_where_terminator( ...@@ -11085,9 +11050,6 @@ int spider_mbase_handler::append_where_terminator(
} else { } else {
str_part2->length(str_part2->length() - SPIDER_SQL_AND_LEN); str_part2->length(str_part2->length() - SPIDER_SQL_AND_LEN);
#ifdef SPIDER_HANDLER_SUPPORT_MULTIPLE_KEY_PARTS
str_part->length(str_part->length() - SPIDER_SQL_COMMA_LEN);
#endif
if (!result_list->ha_read_kind) if (!result_list->ha_read_kind)
str_part->q_append(SPIDER_SQL_CLOSE_PAREN_STR, str_part->q_append(SPIDER_SQL_CLOSE_PAREN_STR,
SPIDER_SQL_CLOSE_PAREN_LEN); SPIDER_SQL_CLOSE_PAREN_LEN);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7