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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9569f4b1
Commit
9569f4b1
authored
Jun 06, 2012
by
Zardosht Kasheff
Committed by
Yoni Fogel
Apr 17, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[t:5029], make fix
git-svn-id:
file:///svn/toku/tokudb@44327
c7de825b-a66e-492c-adef-691d508d4ae1
parent
6f75f75d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
8 deletions
+34
-8
src/loader.c
src/loader.c
+34
-8
No files found.
src/loader.c
View file @
9569f4b1
...
...
@@ -197,8 +197,15 @@ int toku_loader_create_loader(DB_ENV *env,
XCALLOC
(
loader
);
// init to all zeroes (thus initializing the error_callback and poll_func)
XCALLOC
(
loader
->
i
);
// init to all zeroes (thus initializing all pointers to NULL)
DB_TXN
*
child_txn
=
NULL
;
int
using_txns
=
env
->
i
->
open_flags
&
DB_INIT_TXN
;
if
(
using_txns
)
{
int
r
=
env
->
txn_begin
(
env
,
txn
,
&
child_txn
,
0
);
assert_zero
(
r
);
}
loader
->
i
->
env
=
env
;
loader
->
i
->
txn
=
txn
;
loader
->
i
->
txn
=
child_
txn
;
loader
->
i
->
N
=
N
;
loader
->
i
->
dbs
=
dbs
;
loader
->
i
->
src_db
=
src_db
;
...
...
@@ -228,7 +235,7 @@ int toku_loader_create_loader(DB_ENV *env,
// lock tables and check empty
for
(
int
i
=
0
;
i
<
N
;
i
++
)
{
if
(
!
(
loader_flags
&
DB_PRELOCKED_WRITE
))
{
r
=
toku_db_pre_acquire_table_lock
(
dbs
[
i
],
txn
);
r
=
toku_db_pre_acquire_table_lock
(
dbs
[
i
],
child_
txn
);
if
(
r
!=
0
)
break
;
}
r
=
!
toku_ft_is_empty_fast
(
dbs
[
i
]
->
i
->
ft_handle
);
...
...
@@ -254,14 +261,14 @@ int toku_loader_create_loader(DB_ENV *env,
loader
->
i
->
ekeys
=
NULL
;
loader
->
i
->
evals
=
NULL
;
LSN
load_lsn
;
r
=
locked_load_inames
(
env
,
txn
,
N
,
dbs
,
new_inames_in_env
,
&
load_lsn
,
use_ft_loader
);
r
=
locked_load_inames
(
env
,
child_
txn
,
N
,
dbs
,
new_inames_in_env
,
&
load_lsn
,
use_ft_loader
);
if
(
r
!=
0
)
{
toku_free
(
new_inames_in_env
);
toku_free
(
brts
);
rval
=
r
;
goto
create_exit
;
}
TOKUTXN
ttxn
=
txn
?
db_txn_struct_i
(
txn
)
->
tokutxn
:
NULL
;
TOKUTXN
ttxn
=
child_txn
?
db_txn_struct_i
(
child_
txn
)
->
tokutxn
:
NULL
;
r
=
toku_ft_loader_open
(
&
loader
->
i
->
ft_loader
,
loader
->
i
->
env
->
i
->
cachetable
,
loader
->
i
->
env
->
i
->
generate_row_for_put
,
...
...
@@ -292,7 +299,7 @@ int toku_loader_create_loader(DB_ENV *env,
for
(
int
i
=
0
;
i
<
N
;
i
++
)
{
loader
->
i
->
ekeys
[
i
].
flags
=
DB_DBT_REALLOC
;
loader
->
i
->
evals
[
i
].
flags
=
DB_DBT_REALLOC
;
toku_ft_suppress_recovery_logs
(
dbs
[
i
]
->
i
->
ft_handle
,
db_txn_struct_i
(
txn
)
->
tokutxn
);
toku_ft_suppress_recovery_logs
(
dbs
[
i
]
->
i
->
ft_handle
,
db_txn_struct_i
(
child_
txn
)
->
tokutxn
);
}
loader
->
i
->
ft_loader
=
NULL
;
// close the ft_loader and skip to the redirection
...
...
@@ -311,6 +318,9 @@ int toku_loader_create_loader(DB_ENV *env,
}
else
{
(
void
)
__sync_fetch_and_add
(
&
STATUS_VALUE
(
LOADER_CREATE_FAIL
),
1
);
if
(
child_txn
)
{
child_txn
->
abort
(
child_txn
);
}
free_loader
(
loader
);
}
return
rval
;
...
...
@@ -397,6 +407,7 @@ int toku_loader_close(DB_LOADER *loader)
{
(
void
)
__sync_fetch_and_sub
(
&
STATUS_VALUE
(
LOADER_CURRENT
),
1
);
int
r
=
0
;
DB_TXN
*
txn
=
loader
->
i
->
txn
;
if
(
loader
->
i
->
err_errno
!=
0
)
{
if
(
loader
->
i
->
error_callback
!=
NULL
)
{
loader
->
i
->
error_callback
(
loader
->
i
->
dbs
[
loader
->
i
->
err_i
],
loader
->
i
->
err_i
,
loader
->
i
->
err_errno
,
&
loader
->
i
->
err_key
,
&
loader
->
i
->
err_val
,
loader
->
i
->
error_extra
);
...
...
@@ -413,11 +424,21 @@ int toku_loader_close(DB_LOADER *loader)
r
=
ft_loader_close_and_redirect
(
loader
);
}
}
free_loader
(
loader
);
if
(
r
==
0
)
if
(
r
==
0
)
{
if
(
txn
)
{
int
rr
=
txn
->
commit
(
txn
,
0
);
assert_zero
(
rr
);
}
(
void
)
__sync_fetch_and_add
(
&
STATUS_VALUE
(
LOADER_CLOSE
),
1
);
else
}
else
{
if
(
txn
)
{
int
rr
=
txn
->
abort
(
txn
);
assert_zero
(
rr
);
}
(
void
)
__sync_fetch_and_add
(
&
STATUS_VALUE
(
LOADER_CLOSE_FAIL
),
1
);
}
free_loader
(
loader
);
return
r
;
}
...
...
@@ -426,6 +447,7 @@ int toku_loader_abort(DB_LOADER *loader)
(
void
)
__sync_fetch_and_sub
(
&
STATUS_VALUE
(
LOADER_CURRENT
),
1
);
(
void
)
__sync_fetch_and_add
(
&
STATUS_VALUE
(
LOADER_ABORT
),
1
);
int
r
=
0
;
DB_TXN
*
txn
=
loader
->
i
->
txn
;
if
(
loader
->
i
->
err_errno
!=
0
)
{
if
(
loader
->
i
->
error_callback
!=
NULL
)
{
loader
->
i
->
error_callback
(
loader
->
i
->
dbs
[
loader
->
i
->
err_i
],
loader
->
i
->
err_i
,
loader
->
i
->
err_errno
,
&
loader
->
i
->
err_key
,
&
loader
->
i
->
err_val
,
loader
->
i
->
error_extra
);
...
...
@@ -435,6 +457,10 @@ int toku_loader_abort(DB_LOADER *loader)
if
(
!
(
loader
->
i
->
loader_flags
&
LOADER_USE_PUTS
)
)
{
r
=
toku_ft_loader_abort
(
loader
->
i
->
ft_loader
,
TRUE
);
}
if
(
txn
)
{
int
rr
=
txn
->
abort
(
txn
);
assert_zero
(
rr
);
}
free_loader
(
loader
);
return
r
;
}
...
...
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