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
5650e65d
Commit
5650e65d
authored
Feb 13, 2006
by
anozdrin@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree
parents
09fd20b2
30fdcc6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
13 deletions
+64
-13
sql/ha_archive.cc
sql/ha_archive.cc
+63
-12
sql/ha_archive.h
sql/ha_archive.h
+1
-1
No files found.
sql/ha_archive.cc
View file @
5650e65d
...
@@ -405,12 +405,14 @@ int ha_archive::write_meta_file(File meta_file, ha_rows rows,
...
@@ -405,12 +405,14 @@ int ha_archive::write_meta_file(File meta_file, ha_rows rows,
See ha_example.cc for a longer description.
See ha_example.cc for a longer description.
*/
*/
ARCHIVE_SHARE
*
ha_archive
::
get_share
(
const
char
*
table_name
,
TABLE
*
table
)
ARCHIVE_SHARE
*
ha_archive
::
get_share
(
const
char
*
table_name
,
TABLE
*
table
,
int
*
rc
)
{
{
ARCHIVE_SHARE
*
share
;
ARCHIVE_SHARE
*
share
;
char
meta_file_name
[
FN_REFLEN
];
char
meta_file_name
[
FN_REFLEN
];
uint
length
;
uint
length
;
char
*
tmp_name
;
char
*
tmp_name
;
DBUG_ENTER
(
"ha_archive::get_share"
);
pthread_mutex_lock
(
&
archive_mutex
);
pthread_mutex_lock
(
&
archive_mutex
);
length
=
(
uint
)
strlen
(
table_name
);
length
=
(
uint
)
strlen
(
table_name
);
...
@@ -425,7 +427,8 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
...
@@ -425,7 +427,8 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
NullS
))
NullS
))
{
{
pthread_mutex_unlock
(
&
archive_mutex
);
pthread_mutex_unlock
(
&
archive_mutex
);
return
NULL
;
*
rc
=
HA_ERR_OUT_OF_MEM
;
DBUG_RETURN
(
NULL
);
}
}
share
->
use_count
=
0
;
share
->
use_count
=
0
;
...
@@ -468,9 +471,14 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
...
@@ -468,9 +471,14 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
thr_lock_init
(
&
share
->
lock
);
thr_lock_init
(
&
share
->
lock
);
}
}
share
->
use_count
++
;
share
->
use_count
++
;
DBUG_PRINT
(
"info"
,
(
"archive table %.*s has %d open handles now"
,
share
->
table_name_length
,
share
->
table_name
,
share
->
use_count
));
if
(
share
->
crashed
)
*
rc
=
HA_ERR_CRASHED_ON_USAGE
;
pthread_mutex_unlock
(
&
archive_mutex
);
pthread_mutex_unlock
(
&
archive_mutex
);
return
share
;
DBUG_RETURN
(
share
)
;
}
}
...
@@ -481,14 +489,23 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
...
@@ -481,14 +489,23 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, TABLE *table)
int
ha_archive
::
free_share
(
ARCHIVE_SHARE
*
share
)
int
ha_archive
::
free_share
(
ARCHIVE_SHARE
*
share
)
{
{
int
rc
=
0
;
int
rc
=
0
;
DBUG_ENTER
(
"ha_archive::free_share"
);
DBUG_PRINT
(
"info"
,
(
"archive table %.*s has %d open handles on entrance"
,
share
->
table_name_length
,
share
->
table_name
,
share
->
use_count
));
pthread_mutex_lock
(
&
archive_mutex
);
pthread_mutex_lock
(
&
archive_mutex
);
if
(
!--
share
->
use_count
)
if
(
!--
share
->
use_count
)
{
{
hash_delete
(
&
archive_open_tables
,
(
byte
*
)
share
);
hash_delete
(
&
archive_open_tables
,
(
byte
*
)
share
);
thr_lock_delete
(
&
share
->
lock
);
thr_lock_delete
(
&
share
->
lock
);
VOID
(
pthread_mutex_destroy
(
&
share
->
mutex
));
VOID
(
pthread_mutex_destroy
(
&
share
->
mutex
));
(
void
)
write_meta_file
(
share
->
meta_file
,
share
->
rows_recorded
,
if
(
share
->
crashed
)
share
->
auto_increment_value
,
FALSE
);
(
void
)
write_meta_file
(
share
->
meta_file
,
share
->
rows_recorded
,
share
->
auto_increment_value
,
TRUE
);
else
(
void
)
write_meta_file
(
share
->
meta_file
,
share
->
rows_recorded
,
share
->
auto_increment_value
,
FALSE
);
if
(
azclose
(
&
(
share
->
archive_write
)))
if
(
azclose
(
&
(
share
->
archive_write
)))
rc
=
1
;
rc
=
1
;
if
(
my_close
(
share
->
meta_file
,
MYF
(
0
)))
if
(
my_close
(
share
->
meta_file
,
MYF
(
0
)))
...
@@ -497,7 +514,7 @@ int ha_archive::free_share(ARCHIVE_SHARE *share)
...
@@ -497,7 +514,7 @@ int ha_archive::free_share(ARCHIVE_SHARE *share)
}
}
pthread_mutex_unlock
(
&
archive_mutex
);
pthread_mutex_unlock
(
&
archive_mutex
);
return
rc
;
DBUG_RETURN
(
rc
)
;
}
}
...
@@ -524,10 +541,23 @@ const char **ha_archive::bas_ext() const
...
@@ -524,10 +541,23 @@ const char **ha_archive::bas_ext() const
*/
*/
int
ha_archive
::
open
(
const
char
*
name
,
int
mode
,
uint
open_options
)
int
ha_archive
::
open
(
const
char
*
name
,
int
mode
,
uint
open_options
)
{
{
int
rc
=
0
;
DBUG_ENTER
(
"ha_archive::open"
);
DBUG_ENTER
(
"ha_archive::open"
);
if
(
!
(
share
=
get_share
(
name
,
table
)))
DBUG_PRINT
(
"info"
,
(
"archive table was opened for crash %s"
,
DBUG_RETURN
(
HA_ERR_OUT_OF_MEM
);
// Not handled well by calling code!
(
open_options
&
HA_OPEN_FOR_REPAIR
)
?
"yes"
:
"no"
));
share
=
get_share
(
name
,
table
,
&
rc
);
if
(
rc
==
HA_ERR_CRASHED_ON_USAGE
&&
!
(
open_options
&
HA_OPEN_FOR_REPAIR
))
{
free_share
(
share
);
DBUG_RETURN
(
rc
);
}
else
if
(
rc
==
HA_ERR_OUT_OF_MEM
)
{
DBUG_RETURN
(
rc
);
}
thr_lock_data_init
(
&
share
->
lock
,
&
lock
,
NULL
);
thr_lock_data_init
(
&
share
->
lock
,
&
lock
,
NULL
);
if
(
!
(
azopen
(
&
archive
,
share
->
data_file_name
,
O_RDONLY
|
O_BINARY
)))
if
(
!
(
azopen
(
&
archive
,
share
->
data_file_name
,
O_RDONLY
|
O_BINARY
)))
...
@@ -537,10 +567,14 @@ int ha_archive::open(const char *name, int mode, uint open_options)
...
@@ -537,10 +567,14 @@ int ha_archive::open(const char *name, int mode, uint open_options)
DBUG_RETURN
(
HA_ERR_CRASHED_ON_USAGE
);
DBUG_RETURN
(
HA_ERR_CRASHED_ON_USAGE
);
}
}
if
(
open_options
&
HA_OPEN_FOR_REPAIR
)
DBUG_PRINT
(
"info"
,
(
"archive table was crashed %s"
,
rc
==
HA_ERR_CRASHED_ON_USAGE
?
"yes"
:
"no"
));
if
(
rc
==
HA_ERR_CRASHED_ON_USAGE
&&
open_options
&
HA_OPEN_FOR_REPAIR
)
{
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
DBUG_RETURN
(
share
->
crashed
?
HA_ERR_CRASHED_ON_USAGE
:
0
);
else
DBUG_RETURN
(
rc
);
}
}
...
@@ -926,6 +960,7 @@ int ha_archive::rnd_init(bool scan)
...
@@ -926,6 +960,7 @@ int ha_archive::rnd_init(bool scan)
if
(
scan
)
if
(
scan
)
{
{
scan_rows
=
share
->
rows_recorded
;
scan_rows
=
share
->
rows_recorded
;
DBUG_PRINT
(
"info"
,
(
"archive will retrieve %llu rows"
,
scan_rows
));
records
=
0
;
records
=
0
;
/*
/*
...
@@ -937,6 +972,7 @@ int ha_archive::rnd_init(bool scan)
...
@@ -937,6 +972,7 @@ int ha_archive::rnd_init(bool scan)
pthread_mutex_lock
(
&
share
->
mutex
);
pthread_mutex_lock
(
&
share
->
mutex
);
if
(
share
->
dirty
==
TRUE
)
if
(
share
->
dirty
==
TRUE
)
{
{
DBUG_PRINT
(
"info"
,
(
"archive flushing out rows for scan"
));
azflush
(
&
(
share
->
archive_write
),
Z_SYNC_FLUSH
);
azflush
(
&
(
share
->
archive_write
),
Z_SYNC_FLUSH
);
share
->
dirty
=
FALSE
;
share
->
dirty
=
FALSE
;
}
}
...
@@ -1176,6 +1212,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
...
@@ -1176,6 +1212,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
share
->
rows_recorded
++
;
share
->
rows_recorded
++
;
}
}
}
}
DBUG_PRINT
(
"info"
,
(
"recovered %llu archive rows"
,
share
->
rows_recorded
));
my_free
((
char
*
)
buf
,
MYF
(
0
));
my_free
((
char
*
)
buf
,
MYF
(
0
));
if
(
rc
&&
rc
!=
HA_ERR_END_OF_FILE
)
if
(
rc
&&
rc
!=
HA_ERR_END_OF_FILE
)
...
@@ -1200,10 +1237,24 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
...
@@ -1200,10 +1237,24 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
azwrite
(
&
writer
,
block
,
read
);
azwrite
(
&
writer
,
block
,
read
);
}
}
azclose
(
&
writer
);
azflush
(
&
writer
,
Z_SYNC_FLUSH
);
share
->
dirty
=
FALSE
;
azclose
(
share
->
archive_write
);
share
->
archive_write
=
writer
;
my_rename
(
writer_filename
,
share
->
data_file_name
,
MYF
(
0
));
my_rename
(
writer_filename
,
share
->
data_file_name
,
MYF
(
0
));
/*
Now we need to reopen our read descriptor since it has changed.
*/
azclose
(
&
archive
);
if
(
!
(
azopen
(
&
archive
,
share
->
data_file_name
,
O_RDONLY
|
O_BINARY
)))
{
rc
=
HA_ERR_CRASHED_ON_USAGE
;
goto
error
;
}
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
error:
error:
...
...
sql/ha_archive.h
View file @
5650e65d
...
@@ -101,7 +101,7 @@ class ha_archive: public handler
...
@@ -101,7 +101,7 @@ class ha_archive: public handler
int
read_meta_file
(
File
meta_file
,
ha_rows
*
rows
,
ulonglong
*
auto_increment
);
int
read_meta_file
(
File
meta_file
,
ha_rows
*
rows
,
ulonglong
*
auto_increment
);
int
write_meta_file
(
File
meta_file
,
ha_rows
rows
,
int
write_meta_file
(
File
meta_file
,
ha_rows
rows
,
ulonglong
auto_increment
,
bool
dirty
);
ulonglong
auto_increment
,
bool
dirty
);
ARCHIVE_SHARE
*
get_share
(
const
char
*
table_name
,
TABLE
*
table
);
ARCHIVE_SHARE
*
get_share
(
const
char
*
table_name
,
TABLE
*
table
,
int
*
rc
);
int
free_share
(
ARCHIVE_SHARE
*
share
);
int
free_share
(
ARCHIVE_SHARE
*
share
);
bool
auto_repair
()
const
{
return
1
;
}
// For the moment we just do this
bool
auto_repair
()
const
{
return
1
;
}
// For the moment we just do this
int
read_data_header
(
azio_stream
*
file_to_read
);
int
read_data_header
(
azio_stream
*
file_to_read
);
...
...
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