Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
970aa411
Commit
970aa411
authored
Jun 15, 2022
by
Yusuke Abe
Committed by
GitHub
Jun 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-28362 Spider: remove #ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
Reviewed by: Nayuta Yanagisawa
parent
51a4fcd5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
13 deletions
+0
-13
storage/spider/spd_db_conn.cc
storage/spider/spd_db_conn.cc
+0
-12
storage/spider/spd_db_include.h
storage/spider/spd_db_include.h
+0
-1
No files found.
storage/spider/spd_db_conn.cc
View file @
970aa411
...
...
@@ -2190,12 +2190,8 @@ int spider_db_fetch_for_item_sum_func(
}
Item
*
free_list
=
thd
->
free_list
;
spider
->
direct_aggregate_item_current
->
item
=
#ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
new
(
&
spider
->
direct_aggregate_item_current
->
mem_root
)
Item_string
(
thd
,
""
,
0
,
share
->
access_charset
);
#else
new
Item_string
(
share
->
access_charset
);
#endif
if
(
!
spider
->
direct_aggregate_item_current
->
item
)
DBUG_RETURN
(
HA_ERR_OUT_OF_MEM
);
thd
->
free_list
=
free_list
;
...
...
@@ -2206,12 +2202,8 @@ int spider_db_fetch_for_item_sum_func(
(
Item_string
*
)
spider
->
direct_aggregate_item_current
->
item
;
if
(
row
->
is_null
())
{
#ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
item
->
val_str
(
NULL
)
->
length
(
0
);
item
->
append
(
NULL
,
0
);
#else
item
->
set_str_with_copy
(
NULL
,
0
);
#endif
item
->
null_value
=
TRUE
;
}
else
{
char
buf
[
MAX_FIELD_WIDTH
];
...
...
@@ -2220,12 +2212,8 @@ int spider_db_fetch_for_item_sum_func(
tmp_str
.
length
(
0
);
if
((
error_num
=
row
->
append_to_str
(
&
tmp_str
)))
DBUG_RETURN
(
error_num
);
#ifdef SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY
item
->
val_str
(
NULL
)
->
length
(
0
);
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_sum_min_max
->
direct_add
(
item
);
...
...
storage/spider/spd_db_include.h
View file @
970aa411
...
...
@@ -35,7 +35,6 @@
#define SPIDER_HAS_JT_HASH_INDEX_MERGE
#define SPIDER_HAS_TIME_STATUS
#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_ITEM_GEOFUNC_NAME_HAS_MBR
#define SPIDER_HANDLER_AUTO_REPAIR_HAS_ERROR
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment