Commit 970aa411 authored by Yusuke Abe's avatar Yusuke Abe Committed by GitHub

MDEV-28362 Spider: remove #ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY

Reviewed by: Nayuta Yanagisawa
parent 51a4fcd5
...@@ -2190,12 +2190,8 @@ int spider_db_fetch_for_item_sum_func( ...@@ -2190,12 +2190,8 @@ int spider_db_fetch_for_item_sum_func(
} }
Item *free_list = thd->free_list; Item *free_list = thd->free_list;
spider->direct_aggregate_item_current->item = spider->direct_aggregate_item_current->item =
#ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
new (&spider->direct_aggregate_item_current->mem_root) new (&spider->direct_aggregate_item_current->mem_root)
Item_string(thd, "", 0, share->access_charset); Item_string(thd, "", 0, share->access_charset);
#else
new Item_string(share->access_charset);
#endif
if (!spider->direct_aggregate_item_current->item) if (!spider->direct_aggregate_item_current->item)
DBUG_RETURN(HA_ERR_OUT_OF_MEM); DBUG_RETURN(HA_ERR_OUT_OF_MEM);
thd->free_list = free_list; thd->free_list = free_list;
...@@ -2206,12 +2202,8 @@ int spider_db_fetch_for_item_sum_func( ...@@ -2206,12 +2202,8 @@ int spider_db_fetch_for_item_sum_func(
(Item_string *) spider->direct_aggregate_item_current->item; (Item_string *) spider->direct_aggregate_item_current->item;
if (row->is_null()) if (row->is_null())
{ {
#ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
item->val_str(NULL)->length(0); item->val_str(NULL)->length(0);
item->append(NULL, 0); item->append(NULL, 0);
#else
item->set_str_with_copy(NULL, 0);
#endif
item->null_value = TRUE; item->null_value = TRUE;
} else { } else {
char buf[MAX_FIELD_WIDTH]; char buf[MAX_FIELD_WIDTH];
...@@ -2220,12 +2212,8 @@ int spider_db_fetch_for_item_sum_func( ...@@ -2220,12 +2212,8 @@ int spider_db_fetch_for_item_sum_func(
tmp_str.length(0); tmp_str.length(0);
if ((error_num = row->append_to_str(&tmp_str))) if ((error_num = row->append_to_str(&tmp_str)))
DBUG_RETURN(error_num); DBUG_RETURN(error_num);
#ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
item->val_str(NULL)->length(0); item->val_str(NULL)->length(0);
item->append((char *) tmp_str.ptr(), tmp_str.length()); item->append((char *) tmp_str.ptr(), tmp_str.length());
#else
item->set_str_with_copy(tmp_str.ptr(), tmp_str.length());
#endif
item->null_value = FALSE; item->null_value = FALSE;
} }
item_sum_min_max->direct_add(item); item_sum_min_max->direct_add(item);
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#define SPIDER_HAS_JT_HASH_INDEX_MERGE #define SPIDER_HAS_JT_HASH_INDEX_MERGE
#define SPIDER_HAS_TIME_STATUS #define SPIDER_HAS_TIME_STATUS
#define SPIDER_HAS_DECIMAL_OPERATION_RESULTS_VALUE_TYPE #define SPIDER_HAS_DECIMAL_OPERATION_RESULTS_VALUE_TYPE
#define SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
#define SPIDER_ORDER_HAS_ENUM_ORDER #define SPIDER_ORDER_HAS_ENUM_ORDER
#define SPIDER_ITEM_GEOFUNC_NAME_HAS_MBR #define SPIDER_ITEM_GEOFUNC_NAME_HAS_MBR
#define SPIDER_HANDLER_AUTO_REPAIR_HAS_ERROR #define SPIDER_HANDLER_AUTO_REPAIR_HAS_ERROR
......
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