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
8da80dd3
Commit
8da80dd3
authored
Oct 24, 2006
by
mskold/marty@mysql.com/linux.site
Browse files
Options
Browse Files
Download
Plain Diff
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
parents
6961bd63
826628c9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
12 deletions
+46
-12
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+38
-10
sql/ha_ndbcluster.h
sql/ha_ndbcluster.h
+8
-2
No files found.
sql/ha_ndbcluster.cc
View file @
8da80dd3
...
@@ -114,7 +114,7 @@ static int packfrm(const void *data, uint len, const void **pack_data, uint *pac
...
@@ -114,7 +114,7 @@ static int packfrm(const void *data, uint len, const void **pack_data, uint *pac
static
int
unpackfrm
(
const
void
**
data
,
uint
*
len
,
static
int
unpackfrm
(
const
void
**
data
,
uint
*
len
,
const
void
*
pack_data
);
const
void
*
pack_data
);
static
int
ndb_get_table_statistics
(
Ndb
*
,
const
char
*
,
static
int
ndb_get_table_statistics
(
ha_ndbcluster
*
,
bool
,
Ndb
*
,
const
char
*
,
struct
Ndb_statistics
*
);
struct
Ndb_statistics
*
);
// Util thread variables
// Util thread variables
...
@@ -372,7 +372,9 @@ int ha_ndbcluster::records_update()
...
@@ -372,7 +372,9 @@ int ha_ndbcluster::records_update()
Ndb
*
ndb
=
get_ndb
();
Ndb
*
ndb
=
get_ndb
();
struct
Ndb_statistics
stat
;
struct
Ndb_statistics
stat
;
ndb
->
setDatabaseName
(
m_dbname
);
ndb
->
setDatabaseName
(
m_dbname
);
if
((
result
=
ndb_get_table_statistics
(
ndb
,
m_tabname
,
&
stat
))
==
0
){
result
=
ndb_get_table_statistics
(
this
,
true
,
ndb
,
m_tabname
,
&
stat
);
if
(
result
==
0
)
{
mean_rec_length
=
stat
.
row_size
;
mean_rec_length
=
stat
.
row_size
;
data_file_length
=
stat
.
fragment_memory
;
data_file_length
=
stat
.
fragment_memory
;
info
->
records
=
stat
.
row_count
;
info
->
records
=
stat
.
row_count
;
...
@@ -383,6 +385,7 @@ int ha_ndbcluster::records_update()
...
@@ -383,6 +385,7 @@ int ha_ndbcluster::records_update()
if
(
get_thd_ndb
(
thd
)
->
error
)
if
(
get_thd_ndb
(
thd
)
->
error
)
info
->
no_uncommitted_rows_count
=
0
;
info
->
no_uncommitted_rows_count
=
0
;
}
}
if
(
result
==
0
)
records
=
info
->
records
+
info
->
no_uncommitted_rows_count
;
records
=
info
->
records
+
info
->
no_uncommitted_rows_count
;
DBUG_RETURN
(
result
);
DBUG_RETURN
(
result
);
}
}
...
@@ -3125,7 +3128,8 @@ int ha_ndbcluster::info(uint flag)
...
@@ -3125,7 +3128,8 @@ int ha_ndbcluster::info(uint flag)
struct
Ndb_statistics
stat
;
struct
Ndb_statistics
stat
;
ndb
->
setDatabaseName
(
m_dbname
);
ndb
->
setDatabaseName
(
m_dbname
);
if
(
current_thd
->
variables
.
ndb_use_exact_count
&&
if
(
current_thd
->
variables
.
ndb_use_exact_count
&&
(
result
=
ndb_get_table_statistics
(
ndb
,
m_tabname
,
&
stat
))
==
0
)
(
result
=
ndb_get_table_statistics
(
this
,
true
,
ndb
,
m_tabname
,
&
stat
))
==
0
)
{
{
mean_rec_length
=
stat
.
row_size
;
mean_rec_length
=
stat
.
row_size
;
data_file_length
=
stat
.
fragment_memory
;
data_file_length
=
stat
.
fragment_memory
;
...
@@ -4763,7 +4767,15 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked)
...
@@ -4763,7 +4767,15 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked)
res
=
get_metadata
(
name
);
res
=
get_metadata
(
name
);
if
(
!
res
)
if
(
!
res
)
info
(
HA_STATUS_VARIABLE
|
HA_STATUS_CONST
);
{
Ndb
*
ndb
=
get_ndb
();
ndb
->
setDatabaseName
(
m_dbname
);
struct
Ndb_statistics
stat
;
res
=
ndb_get_table_statistics
(
NULL
,
false
,
ndb
,
m_tabname
,
&
stat
);
records
=
stat
.
row_count
;
if
(
!
res
)
res
=
info
(
HA_STATUS_CONST
);
}
DBUG_RETURN
(
res
);
DBUG_RETURN
(
res
);
}
}
...
@@ -5591,7 +5603,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname,
...
@@ -5591,7 +5603,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname,
pthread_mutex_unlock
(
&
share
->
mutex
);
pthread_mutex_unlock
(
&
share
->
mutex
);
struct
Ndb_statistics
stat
;
struct
Ndb_statistics
stat
;
if
(
ndb_get_table_statistics
(
ndb
,
tabname
,
&
stat
))
if
(
ndb_get_table_statistics
(
NULL
,
true
,
ndb
,
tabname
,
&
stat
))
{
{
free_share
(
share
);
free_share
(
share
);
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
...
@@ -5921,12 +5933,14 @@ static int unpackfrm(const void **unpack_data, uint *unpack_len,
...
@@ -5921,12 +5933,14 @@ static int unpackfrm(const void **unpack_data, uint *unpack_len,
static
static
int
int
ndb_get_table_statistics
(
Ndb
*
ndb
,
const
char
*
table
,
ndb_get_table_statistics
(
ha_ndbcluster
*
file
,
bool
report_error
,
Ndb
*
ndb
,
const
char
*
table
,
struct
Ndb_statistics
*
ndbstat
)
struct
Ndb_statistics
*
ndbstat
)
{
{
NdbTransaction
*
pTrans
;
NdbTransaction
*
pTrans
;
NdbError
error
;
NdbError
error
;
int
retries
=
10
;
int
retries
=
10
;
int
reterr
=
0
;
int
retry_sleep
=
30
*
1000
;
/* 30 milliseconds */
int
retry_sleep
=
30
*
1000
;
/* 30 milliseconds */
char
buff
[
22
],
buff2
[
22
],
buff3
[
22
],
buff4
[
22
];
char
buff
[
22
],
buff2
[
22
],
buff3
[
22
],
buff4
[
22
];
DBUG_ENTER
(
"ndb_get_table_statistics"
);
DBUG_ENTER
(
"ndb_get_table_statistics"
);
...
@@ -6017,6 +6031,19 @@ ndb_get_table_statistics(Ndb* ndb, const char * table,
...
@@ -6017,6 +6031,19 @@ ndb_get_table_statistics(Ndb* ndb, const char * table,
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
retry:
retry:
if
(
report_error
)
{
if
(
file
)
{
reterr
=
file
->
ndb_err
(
pTrans
);
}
else
{
const
NdbError
&
tmp
=
error
;
ERR_PRINT
(
tmp
);
reterr
=
ndb_to_mysql_error
(
&
tmp
);
}
}
if
(
pTrans
)
if
(
pTrans
)
{
{
ndb
->
closeTransaction
(
pTrans
);
ndb
->
closeTransaction
(
pTrans
);
...
@@ -6029,8 +6056,9 @@ ndb_get_table_statistics(Ndb* ndb, const char * table,
...
@@ -6029,8 +6056,9 @@ ndb_get_table_statistics(Ndb* ndb, const char * table,
}
}
break
;
break
;
}
while
(
1
);
}
while
(
1
);
DBUG_PRINT
(
"exit"
,
(
"failed, error %u(%s)"
,
error
.
code
,
error
.
message
));
DBUG_PRINT
(
"exit"
,
(
"failed, reterr: %u, NdbError %u(%s)"
,
reterr
,
ERR_RETURN
(
error
);
error
.
code
,
error
.
message
));
DBUG_RETURN
(
reterr
);
}
}
/*
/*
...
@@ -6571,7 +6599,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
...
@@ -6571,7 +6599,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
lock
=
share
->
commit_count_lock
;
lock
=
share
->
commit_count_lock
;
pthread_mutex_unlock
(
&
share
->
mutex
);
pthread_mutex_unlock
(
&
share
->
mutex
);
if
(
ndb_get_table_statistics
(
ndb
,
tabname
,
&
stat
)
==
0
)
if
(
ndb_get_table_statistics
(
NULL
,
false
,
ndb
,
tabname
,
&
stat
)
==
0
)
{
{
char
buff
[
22
],
buff2
[
22
];
char
buff
[
22
],
buff2
[
22
];
DBUG_PRINT
(
"ndb_util_thread"
,
DBUG_PRINT
(
"ndb_util_thread"
,
...
...
sql/ha_ndbcluster.h
View file @
8da80dd3
...
@@ -626,6 +626,12 @@ static void set_tabname(const char *pathname, char *tabname);
...
@@ -626,6 +626,12 @@ static void set_tabname(const char *pathname, char *tabname);
void
cond_pop
();
void
cond_pop
();
uint8
table_cache_type
();
uint8
table_cache_type
();
/*
* Internal to ha_ndbcluster, used by C functions
*/
int
ndb_err
(
NdbTransaction
*
);
my_bool
register_query_cache_table
(
THD
*
thd
,
char
*
table_key
,
my_bool
register_query_cache_table
(
THD
*
thd
,
char
*
table_key
,
uint
key_length
,
uint
key_length
,
qc_engine_callback
*
engine_callback
,
qc_engine_callback
*
engine_callback
,
...
@@ -690,8 +696,8 @@ static void set_tabname(const char *pathname, char *tabname);
...
@@ -690,8 +696,8 @@ static void set_tabname(const char *pathname, char *tabname);
ulonglong
get_auto_increment
();
ulonglong
get_auto_increment
();
void
invalidate_dictionary_cache
(
bool
global
);
void
invalidate_dictionary_cache
(
bool
global
);
int
ndb_err
(
NdbTransaction
*
);
bool
uses_blob_value
(
bool
all_fields
);
bool
uses_blob_value
(
bool
all_fields
);
char
*
update_table_comment
(
const
char
*
comment
);
char
*
update_table_comment
(
const
char
*
comment
);
...
...
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