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
d028fb9f
Commit
d028fb9f
authored
Dec 28, 2020
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: reduce indentation of end_send
Reorder end_send to exit via return instead of large if-else block.
parent
d624464b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
86 additions
and
89 deletions
+86
-89
sql/sql_select.cc
sql/sql_select.cc
+86
-89
No files found.
sql/sql_select.cc
View file @
d028fb9f
...
...
@@ -21943,8 +21943,7 @@ join_read_next_same_or_null(READ_RECORD *info)
/* ARGSUSED */
static
enum_nested_loop_state
end_send
(
JOIN
*
join
,
JOIN_TAB
*
join_tab
__attribute__
((
unused
)),
bool
end_of_records
)
end_send
(
JOIN
*
join
,
JOIN_TAB
*
join_tab
,
bool
end_of_records
)
{
DBUG_ENTER
(
"end_send"
);
/*
...
...
@@ -21956,8 +21955,13 @@ end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
//TODO pass fields via argument
List
<
Item
>
*
fields
=
join_tab
?
(
join_tab
-
1
)
->
fields
:
join
->
fields
;
if
(
!
end_of_records
)
if
(
end_of_records
)
{
if
(
join
->
procedure
&&
join
->
procedure
->
end_of_records
())
DBUG_RETURN
(
NESTED_LOOP_ERROR
);
DBUG_RETURN
(
NESTED_LOOP_OK
);
}
if
(
join
->
table_count
&&
join
->
join_tab
->
is_using_loose_index_scan
())
{
...
...
@@ -22049,12 +22053,6 @@ end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
*/
DBUG_RETURN
(
NESTED_LOOP_CURSOR_LIMIT
);
}
}
else
{
if
(
join
->
procedure
&&
join
->
procedure
->
end_of_records
())
DBUG_RETURN
(
NESTED_LOOP_ERROR
);
}
DBUG_RETURN
(
NESTED_LOOP_OK
);
}
...
...
@@ -22069,8 +22067,7 @@ end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
*/
enum_nested_loop_state
end_send_group
(
JOIN
*
join
,
JOIN_TAB
*
join_tab
__attribute__
((
unused
)),
bool
end_of_records
)
end_send_group
(
JOIN
*
join
,
JOIN_TAB
*
join_tab
,
bool
end_of_records
)
{
int
idx
=
-
1
;
enum_nested_loop_state
ok_code
=
NESTED_LOOP_OK
;
...
...
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