Skip to content

M
MariaDB
Commit 799a3066 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

cleanup: reduce code duplication

parent 775e7ce6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 14 deletions
storage/maria/ma_search.c
View file @ 799a3066
...@@ -600,8 +600,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, ...@@ -600,8 +600,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
break; break;
} }
if ((reverse ? -my_flag : my_flag) > 0) /* mismatch */
break;
if (my_flag==0) /* match */ if (my_flag==0) /* match */
{ {
/* /*
...@@ -629,8 +627,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, ...@@ -629,8 +627,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
goto cmp_rest; /* should never happen */ goto cmp_rest; /* should never happen */
my_flag= (uchar)' ' - *k; my_flag= (uchar)' ' - *k;
} }
if ((reverse ? -my_flag : my_flag) > 0)
break;
} }
else if (len > cmplen) else if (len > cmplen)
{ {
...@@ -643,10 +639,7 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, ...@@ -643,10 +639,7 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
vseg < vseg_end && *vseg == (uchar) ' '; vseg < vseg_end && *vseg == (uchar) ' ';
vseg++, matched++) ; vseg++, matched++) ;
DBUG_ASSERT(vseg < vseg_end); DBUG_ASSERT(vseg < vseg_end);
my_flag= *vseg - (uchar)' '; my_flag= *vseg - (uchar)' ';
if ((reverse ? -my_flag : my_flag) > 0)
break;
} }
else else
{ {
...@@ -674,6 +667,8 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, ...@@ -674,6 +667,8 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
} }
} }
} }
if ((reverse ? -my_flag : my_flag) > 0) /* mismatch */
break;
matched-=left; matched-=left;
} }
/* else (matched < prefix_len) ---> do nothing. */ /* else (matched < prefix_len) ---> do nothing. */
......
storage/myisam/mi_search.c
View file @ 799a3066
...@@ -453,8 +453,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, ...@@ -453,8 +453,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
break; break;
} }
if ((reverse ? -my_flag : my_flag) > 0) /* mismatch */
break;
if (my_flag==0) /* match */ if (my_flag==0) /* match */
{ {
/* /*
...@@ -481,8 +479,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, ...@@ -481,8 +479,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
goto cmp_rest; /* should never happen */ goto cmp_rest; /* should never happen */
my_flag= (uchar)' ' - *k; my_flag= (uchar)' ' - *k;
} }
if ((reverse ? -my_flag : my_flag) > 0)
break;
} }
else if (len > cmplen) else if (len > cmplen)
{ {
...@@ -497,9 +493,7 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, ...@@ -497,9 +493,7 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
DBUG_ASSERT(vseg < vseg_end); DBUG_ASSERT(vseg < vseg_end);
my_flag= *vseg - (uchar)' '; my_flag= *vseg - (uchar)' ';
if ((reverse ? -my_flag : my_flag) > 0) }
break;
}
else else
{ {
cmp_rest: cmp_rest:
...@@ -525,6 +519,8 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, ...@@ -525,6 +519,8 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
} }
} }
} }
if ((reverse ? -my_flag : my_flag) > 0) /* mismatch */
break;
matched-=left; matched-=left;
} }
/* else (matched < prefix_len) ---> do nothing. */ /* else (matched < prefix_len) ---> do nothing. */
......
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