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
bbb1140d
Commit
bbb1140d
authored
Apr 11, 2020
by
Kentoku SHIBA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add pointer of ha_spider to Spider's use_result function
parent
f16633c1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
12 deletions
+26
-12
storage/spider/spd_db_conn.cc
storage/spider/spd_db_conn.cc
+19
-12
storage/spider/spd_db_handlersocket.cc
storage/spider/spd_db_handlersocket.cc
+1
-0
storage/spider/spd_db_handlersocket.h
storage/spider/spd_db_handlersocket.h
+1
-0
storage/spider/spd_db_include.h
storage/spider/spd_db_include.h
+1
-0
storage/spider/spd_db_mysql.cc
storage/spider/spd_db_mysql.cc
+1
-0
storage/spider/spd_db_mysql.h
storage/spider/spd_db_mysql.h
+1
-0
storage/spider/spd_db_oracle.cc
storage/spider/spd_db_oracle.cc
+1
-0
storage/spider/spd_db_oracle.h
storage/spider/spd_db_oracle.h
+1
-0
No files found.
storage/spider/spd_db_conn.cc
View file @
bbb1140d
...
@@ -4197,7 +4197,7 @@ int spider_db_store_result(
...
@@ -4197,7 +4197,7 @@ int spider_db_store_result(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
(
!
(
current
->
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
if
(
!
(
current
->
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
&
error_num
)))
{
{
if
(
!
error_num
)
if
(
!
error_num
)
...
@@ -4930,7 +4930,7 @@ void spider_db_discard_result(
...
@@ -4930,7 +4930,7 @@ void spider_db_discard_result(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
result
->
free_result
();
result
->
free_result
();
delete
result
;
delete
result
;
...
@@ -4960,7 +4960,7 @@ void spider_db_discard_multiple_result(
...
@@ -4960,7 +4960,7 @@ void spider_db_discard_multiple_result(
{
{
if
(
!
conn
->
db_conn
->
cmp_request_key_to_snd
(
&
request_key
))
if
(
!
conn
->
db_conn
->
cmp_request_key_to_snd
(
&
request_key
))
break
;
break
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
result
->
free_result
();
result
->
free_result
();
delete
result
;
delete
result
;
...
@@ -6845,7 +6845,8 @@ int spider_db_bulk_insert(
...
@@ -6845,7 +6845,8 @@ int spider_db_bulk_insert(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count2
];
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count2
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
result
->
free_result
();
result
->
free_result
();
delete
result
;
delete
result
;
...
@@ -7015,7 +7016,8 @@ int spider_db_bulk_bulk_insert(
...
@@ -7015,7 +7016,8 @@ int spider_db_bulk_bulk_insert(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count2
];
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count2
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
result
->
free_result
();
result
->
free_result
();
delete
result
;
delete
result
;
...
@@ -7873,7 +7875,8 @@ int spider_db_direct_update(
...
@@ -7873,7 +7875,8 @@ int spider_db_direct_update(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count
];
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
if
(
!
counted
)
if
(
!
counted
)
{
{
...
@@ -8199,7 +8202,8 @@ int spider_db_bulk_direct_update(
...
@@ -8199,7 +8202,8 @@ int spider_db_bulk_direct_update(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count
];
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
if
(
!
counted
)
if
(
!
counted
)
{
{
...
@@ -8526,7 +8530,8 @@ int spider_db_direct_delete(
...
@@ -8526,7 +8530,8 @@ int spider_db_direct_delete(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count
];
request_key
.
request_id
=
spider
->
db_request_id
[
roop_count
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
if
(
!
counted
)
if
(
!
counted
)
{
{
...
@@ -10868,7 +10873,7 @@ int spider_db_udf_direct_sql(
...
@@ -10868,7 +10873,7 @@ int spider_db_udf_direct_sql(
request_key
.
handler
=
direct_sql
;
request_key
.
handler
=
direct_sql
;
request_key
.
request_id
=
1
;
request_key
.
request_id
=
1
;
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
conn
->
db_conn
->
use_result
(
NULL
,
&
request_key
,
&
error_num
)))
{
{
end_of_file
=
FALSE
;
end_of_file
=
FALSE
;
if
(
roop_count
>=
0
)
if
(
roop_count
>=
0
)
...
@@ -11813,7 +11818,7 @@ int spider_db_udf_copy_tables(
...
@@ -11813,7 +11818,7 @@ int spider_db_udf_copy_tables(
request_key
.
handler
=
copy_tables
;
request_key
.
handler
=
copy_tables
;
request_key
.
request_id
=
1
;
request_key
.
request_id
=
1
;
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
((
result
=
tmp_conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
((
result
=
tmp_conn
->
db_conn
->
use_result
(
NULL
,
&
request_key
,
&
error_num
)))
{
{
SPIDER_DB_ROW
*
row
;
SPIDER_DB_ROW
*
row
;
roop_count
=
0
;
roop_count
=
0
;
...
@@ -12290,7 +12295,8 @@ int spider_db_open_handler(
...
@@ -12290,7 +12295,8 @@ int spider_db_open_handler(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
(
!
(
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
(
!
(
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
if
(
!
error_num
)
if
(
!
error_num
)
{
{
...
@@ -12429,7 +12435,8 @@ int spider_db_bulk_open_handler(
...
@@ -12429,7 +12435,8 @@ int spider_db_bulk_open_handler(
request_key
.
handler
=
spider
;
request_key
.
handler
=
spider
;
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
request_id
=
spider
->
db_request_id
[
link_idx
];
request_key
.
next
=
NULL
;
request_key
.
next
=
NULL
;
if
(
!
(
result
=
conn
->
db_conn
->
use_result
(
&
request_key
,
&
error_num
)))
if
(
!
(
result
=
conn
->
db_conn
->
use_result
(
spider
,
&
request_key
,
&
error_num
)))
{
{
if
(
!
error_num
)
if
(
!
error_num
)
{
{
...
...
storage/spider/spd_db_handlersocket.cc
View file @
bbb1140d
...
@@ -1438,6 +1438,7 @@ spider_db_result *spider_db_handlersocket::store_result(
...
@@ -1438,6 +1438,7 @@ spider_db_result *spider_db_handlersocket::store_result(
}
}
spider_db_result
*
spider_db_handlersocket
::
use_result
(
spider_db_result
*
spider_db_handlersocket
::
use_result
(
ha_spider
*
spider
,
st_spider_db_request_key
*
request_key
,
st_spider_db_request_key
*
request_key
,
int
*
error_num
int
*
error_num
)
{
)
{
...
...
storage/spider/spd_db_handlersocket.h
View file @
bbb1140d
...
@@ -330,6 +330,7 @@ class spider_db_handlersocket: public spider_db_conn
...
@@ -330,6 +330,7 @@ class spider_db_handlersocket: public spider_db_conn
int
*
error_num
int
*
error_num
);
);
spider_db_result
*
use_result
(
spider_db_result
*
use_result
(
ha_spider
*
spider
,
st_spider_db_request_key
*
request_key
,
st_spider_db_request_key
*
request_key
,
int
*
error_num
int
*
error_num
);
);
...
...
storage/spider/spd_db_include.h
View file @
bbb1140d
...
@@ -1123,6 +1123,7 @@ class spider_db_conn
...
@@ -1123,6 +1123,7 @@ class spider_db_conn
int
*
error_num
int
*
error_num
)
=
0
;
)
=
0
;
virtual
spider_db_result
*
use_result
(
virtual
spider_db_result
*
use_result
(
ha_spider
*
spider
,
st_spider_db_request_key
*
request_key
,
st_spider_db_request_key
*
request_key
,
int
*
error_num
int
*
error_num
)
=
0
;
)
=
0
;
...
...
storage/spider/spd_db_mysql.cc
View file @
bbb1140d
...
@@ -2407,6 +2407,7 @@ spider_db_result *spider_db_mbase::store_result(
...
@@ -2407,6 +2407,7 @@ spider_db_result *spider_db_mbase::store_result(
}
}
spider_db_result
*
spider_db_mbase
::
use_result
(
spider_db_result
*
spider_db_mbase
::
use_result
(
ha_spider
*
spider
,
st_spider_db_request_key
*
request_key
,
st_spider_db_request_key
*
request_key
,
int
*
error_num
int
*
error_num
)
{
)
{
...
...
storage/spider/spd_db_mysql.h
View file @
bbb1140d
...
@@ -453,6 +453,7 @@ class spider_db_mbase: public spider_db_conn
...
@@ -453,6 +453,7 @@ class spider_db_mbase: public spider_db_conn
int
*
error_num
int
*
error_num
);
);
spider_db_result
*
use_result
(
spider_db_result
*
use_result
(
ha_spider
*
spider
,
st_spider_db_request_key
*
request_key
,
st_spider_db_request_key
*
request_key
,
int
*
error_num
int
*
error_num
);
);
...
...
storage/spider/spd_db_oracle.cc
View file @
bbb1140d
...
@@ -1700,6 +1700,7 @@ spider_db_result *spider_db_oracle::store_result(
...
@@ -1700,6 +1700,7 @@ spider_db_result *spider_db_oracle::store_result(
}
}
spider_db_result
*
spider_db_oracle
::
use_result
(
spider_db_result
*
spider_db_oracle
::
use_result
(
ha_spider
*
spider
,
st_spider_db_request_key
*
request_key
,
st_spider_db_request_key
*
request_key
,
int
*
error_num
int
*
error_num
)
{
)
{
...
...
storage/spider/spd_db_oracle.h
View file @
bbb1140d
...
@@ -380,6 +380,7 @@ class spider_db_oracle: public spider_db_conn
...
@@ -380,6 +380,7 @@ class spider_db_oracle: public spider_db_conn
int
*
error_num
int
*
error_num
);
);
spider_db_result
*
use_result
(
spider_db_result
*
use_result
(
ha_spider
*
spider
,
st_spider_db_request_key
*
request_key
,
st_spider_db_request_key
*
request_key
,
int
*
error_num
int
*
error_num
);
);
...
...
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