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
d3a6ed05
Commit
d3a6ed05
authored
Mar 03, 2020
by
Kentoku SHIBA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix divided lock table issue of Spider
parent
418f1611
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
2 deletions
+53
-2
storage/spider/ha_spider.cc
storage/spider/ha_spider.cc
+52
-2
storage/spider/ha_spider.h
storage/spider/ha_spider.h
+1
-0
No files found.
storage/spider/ha_spider.cc
View file @
d3a6ed05
...
...
@@ -1166,6 +1166,26 @@ THR_LOCK_DATA **ha_spider::store_lock(
!
spider_param_local_lock_table
(
thd
)
)
{
wide_handler
->
lock_table_type
=
1
;
#ifdef WITH_PARTITION_STORAGE_ENGINE
if
(
partition_handler_share
&&
partition_handler_share
->
handlers
)
{
uint
roop_count
;
for
(
roop_count
=
0
;
roop_count
<
partition_handler_share
->
no_parts
;
++
roop_count
)
{
if
(
unlikely
((
store_error_num
=
partition_handler_share
->
handlers
[
roop_count
]
->
append_lock_tables_list
())))
{
break
;
}
}
}
else
{
#endif
store_error_num
=
append_lock_tables_list
();
#ifdef WITH_PARTITION_STORAGE_ENGINE
}
#endif
}
}
else
{
DBUG_PRINT
(
"info"
,(
"spider default lock route"
));
...
...
@@ -1181,6 +1201,27 @@ THR_LOCK_DATA **ha_spider::store_lock(
spider_param_semi_table_lock
(
thd
,
wide_handler
->
semi_table_lock
)
)
{
wide_handler
->
lock_table_type
=
2
;
#ifdef WITH_PARTITION_STORAGE_ENGINE
if
(
partition_handler_share
&&
partition_handler_share
->
handlers
)
{
uint
roop_count
;
for
(
roop_count
=
0
;
roop_count
<
partition_handler_share
->
no_parts
;
++
roop_count
)
{
if
(
unlikely
((
store_error_num
=
partition_handler_share
->
handlers
[
roop_count
]
->
append_lock_tables_list
())))
{
break
;
}
}
}
else
{
#endif
store_error_num
=
append_lock_tables_list
();
#ifdef WITH_PARTITION_STORAGE_ENGINE
}
#endif
}
}
if
(
...
...
@@ -16014,10 +16055,10 @@ int ha_spider::set_union_table_name_pos_sql()
DBUG_RETURN
(
0
);
}
int
ha_spider
::
lock_tables
()
int
ha_spider
::
append_lock_tables_list
()
{
int
error_num
,
roop_count
;
DBUG_ENTER
(
"ha_spider::
lock_tables
"
);
DBUG_ENTER
(
"ha_spider::
append_lock_tables_list
"
);
DBUG_PRINT
(
"info"
,(
"spider lock_table_type=%u"
,
wide_handler
->
lock_table_type
));
...
...
@@ -16081,6 +16122,15 @@ int ha_spider::lock_tables()
}
}
}
DBUG_RETURN
(
0
);
}
int
ha_spider
::
lock_tables
()
{
int
error_num
,
roop_count
;
DBUG_ENTER
(
"ha_spider::lock_tables"
);
DBUG_PRINT
(
"info"
,(
"spider lock_table_type=%u"
,
wide_handler
->
lock_table_type
));
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
if
((
conn_kinds
&
SPIDER_CONN_KIND_MYSQL
))
...
...
storage/spider/ha_spider.h
View file @
d3a6ed05
...
...
@@ -1237,6 +1237,7 @@ class ha_spider: public handler
#endif
int
init_union_table_name_pos_sql
();
int
set_union_table_name_pos_sql
();
int
append_lock_tables_list
();
int
lock_tables
();
int
dml_init
();
#ifdef HA_CAN_BULK_ACCESS
...
...
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