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
3315fab9
Commit
3315fab9
authored
Mar 23, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents
ce488b51
1c0c25e7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
26 deletions
+41
-26
ndb/src/ndbapi/DictCache.cpp
ndb/src/ndbapi/DictCache.cpp
+3
-4
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+36
-21
sql/ha_ndbcluster.h
sql/ha_ndbcluster.h
+2
-1
No files found.
ndb/src/ndbapi/DictCache.cpp
View file @
3315fab9
...
...
@@ -24,12 +24,11 @@
Ndb_local_table_info
*
Ndb_local_table_info
::
create
(
NdbTableImpl
*
table_impl
,
Uint32
sz
)
{
if
(
sz
%
8
!=
0
)
// round to Uint64
sz
+=
8
-
sz
%
8
;
void
*
data
=
malloc
(
sizeof
(
NdbTableImpl
)
+
sz
-
8
);
Uint32
tot_size
=
sizeof
(
NdbTableImpl
*
)
+
((
sz
+
7
)
>>
3
)
<<
3
;
// round to Uint64
void
*
data
=
malloc
(
tot_size
);
if
(
data
==
0
)
return
0
;
memset
(
data
,
0
,
sizeof
(
NdbTableImpl
)
+
sz
-
8
);
memset
(
data
,
0
,
tot_size
);
new
(
data
)
Ndb_local_table_info
(
table_impl
);
return
(
Ndb_local_table_info
*
)
data
;
}
...
...
sql/ha_ndbcluster.cc
View file @
3315fab9
...
...
@@ -225,7 +225,7 @@ Ndb *ha_ndbcluster::get_ndb()
* manage uncommitted insert/deletes during transactio to get records correct
*/
struct
Ndb_
table_local_info
{
struct
Ndb_
local_table_statistics
{
int
no_uncommitted_rows_count
;
ulong
last_count
;
ha_rows
records
;
...
...
@@ -246,7 +246,8 @@ void ha_ndbcluster::records_update()
if
(
m_ha_not_exact_count
)
return
;
DBUG_ENTER
(
"ha_ndbcluster::records_update"
);
struct
Ndb_table_local_info
*
info
=
(
struct
Ndb_table_local_info
*
)
m_table_info
;
struct
Ndb_local_table_statistics
*
info
=
(
struct
Ndb_local_table_statistics
*
)
m_table_info
;
DBUG_PRINT
(
"info"
,
(
"id=%d, no_uncommitted_rows_count=%d"
,
((
const
NDBTAB
*
)
m_table
)
->
getTableId
(),
info
->
no_uncommitted_rows_count
));
...
...
@@ -282,7 +283,8 @@ void ha_ndbcluster::no_uncommitted_rows_init(THD *thd)
if
(
m_ha_not_exact_count
)
return
;
DBUG_ENTER
(
"ha_ndbcluster::no_uncommitted_rows_init"
);
struct
Ndb_table_local_info
*
info
=
(
struct
Ndb_table_local_info
*
)
m_table_info
;
struct
Ndb_local_table_statistics
*
info
=
(
struct
Ndb_local_table_statistics
*
)
m_table_info
;
Thd_ndb
*
thd_ndb
=
(
Thd_ndb
*
)
thd
->
transaction
.
thd_ndb
;
if
(
info
->
last_count
!=
thd_ndb
->
count
)
{
...
...
@@ -301,8 +303,8 @@ void ha_ndbcluster::no_uncommitted_rows_update(int c)
if
(
m_ha_not_exact_count
)
return
;
DBUG_ENTER
(
"ha_ndbcluster::no_uncommitted_rows_update"
);
struct
Ndb_
table_local_info
*
info
=
(
struct
Ndb_
table_local_info
*
)
m_table_info
;
struct
Ndb_
local_table_statistics
*
info
=
(
struct
Ndb_
local_table_statistics
*
)
m_table_info
;
info
->
no_uncommitted_rows_count
+=
c
;
DBUG_PRINT
(
"info"
,
(
"id=%d, no_uncommitted_rows_count=%d"
,
((
const
NDBTAB
*
)
m_table
)
->
getTableId
(),
...
...
@@ -716,10 +718,8 @@ bool ha_ndbcluster::uses_blob_value(bool all_fields)
Get metadata for this table from NDB
IMPLEMENTATION
- save the NdbDictionary::Table for easy access
- check that frm-file on disk is equal to frm-file
of table accessed in NDB
- build a list of the indexes for the table
*/
int
ha_ndbcluster
::
get_metadata
(
const
char
*
path
)
...
...
@@ -784,10 +784,11 @@ int ha_ndbcluster::get_metadata(const char *path)
if
(
error
)
DBUG_RETURN
(
error
);
m_table
=
NULL
;
m_table_info
=
NULL
;
m_tableVersion
=
tab
->
getObjectVersion
();
m_table
=
(
void
*
)
tab
;
m_table_info
=
NULL
;
// Set in external lock
DBUG_RETURN
(
build_index_list
(
table
,
ILBP_OPEN
));
DBUG_RETURN
(
build_index_list
(
ndb
,
table
,
ILBP_OPEN
));
}
static
int
fix_unique_index_attr_order
(
NDB_INDEX_DATA
&
data
,
...
...
@@ -815,7 +816,7 @@ static int fix_unique_index_attr_order(NDB_INDEX_DATA &data,
#endif
for
(
unsigned
j
=
0
;
j
<
sz
;
j
++
)
{
const
N
dbDictionary
::
Column
*
c
=
index
->
getColumn
(
j
);
const
N
DBCOL
*
c
=
index
->
getColumn
(
j
);
if
(
strncmp
(
field_name
,
c
->
getName
(),
name_sz
)
==
0
)
{
data
.
unique_index_attrid_map
[
i
]
=
j
;
...
...
@@ -827,7 +828,7 @@ static int fix_unique_index_attr_order(NDB_INDEX_DATA &data,
DBUG_RETURN
(
0
);
}
int
ha_ndbcluster
::
build_index_list
(
TABLE
*
tab
,
enum
ILBP
phase
)
int
ha_ndbcluster
::
build_index_list
(
Ndb
*
ndb
,
TABLE
*
tab
,
enum
ILBP
phase
)
{
uint
i
;
int
error
=
0
;
...
...
@@ -836,8 +837,7 @@ int ha_ndbcluster::build_index_list(TABLE *tab, enum ILBP phase)
static
const
char
*
unique_suffix
=
"$unique"
;
KEY
*
key_info
=
tab
->
key_info
;
const
char
**
key_name
=
tab
->
keynames
.
type_names
;
Ndb
*
ndb
=
get_ndb
();
NdbDictionary
::
Dictionary
*
dict
=
ndb
->
getDictionary
();
NDBDICT
*
dict
=
ndb
->
getDictionary
();
DBUG_ENTER
(
"build_index_list"
);
// Save information about all known indexes
...
...
@@ -3060,6 +3060,10 @@ THR_LOCK_DATA **ha_ndbcluster::store_lock(THD *thd,
When a table lock is held one transaction will be started which holds
the table lock and for each statement a hupp transaction will be started
If we are locking the table then:
- save the NdbDictionary::Table for easy access
- save reference to table statistics
- refresh list of the indexes for the table if needed (if altered)
*/
int
ha_ndbcluster
::
external_lock
(
THD
*
thd
,
int
lock_type
)
...
...
@@ -3166,7 +3170,15 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
if
(
!
(
tab
=
dict
->
getTable
(
m_tabname
,
&
tab_info
)))
ERR_RETURN
(
dict
->
getNdbError
());
DBUG_PRINT
(
"info"
,
(
"Table schema version: %d"
,
tab
->
getObjectVersion
()));
if
(
m_table
!=
(
void
*
)
tab
||
m_tableVersion
!=
tab
->
getObjectVersion
())
{
/*
The table has been altered, refresh the index list
*/
build_index_list
(
ndb
,
table
,
ILBP_OPEN
);
m_table
=
(
void
*
)
tab
;
m_tableVersion
=
tab
->
getObjectVersion
();
}
m_table_info
=
tab_info
;
}
no_uncommitted_rows_init
(
thd
);
...
...
@@ -3716,7 +3728,7 @@ int ha_ndbcluster::create(const char *name,
m_dbname
,
m_tabname
));
// Create secondary indexes
my_errno
=
build_index_list
(
form
,
ILBP_CREATE
);
my_errno
=
build_index_list
(
ndb
,
form
,
ILBP_CREATE
);
if
(
!
my_errno
)
my_errno
=
write_ndb_file
();
...
...
@@ -3936,6 +3948,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
m_active_trans
(
NULL
),
m_active_cursor
(
NULL
),
m_table
(
NULL
),
m_tableVersion
(
-
1
),
m_table_info
(
NULL
),
m_table_flags
(
HA_REC_NOT_IN_SEQ
|
HA_NULL_IN_KEY
|
...
...
@@ -4075,7 +4088,9 @@ Thd_ndb* ha_ndbcluster::seize_thd_ndb()
DBUG_ENTER
(
"seize_thd_ndb"
);
thd_ndb
=
new
Thd_ndb
();
thd_ndb
->
ndb
->
getDictionary
()
->
set_local_table_data_size
(
sizeof
(
Ndb_table_local_info
));
thd_ndb
->
ndb
->
getDictionary
()
->
set_local_table_data_size
(
sizeof
(
Ndb_local_table_statistics
)
);
if
(
thd_ndb
->
ndb
->
init
(
max_transactions
)
!=
0
)
{
ERR_PRINT
(
thd_ndb
->
ndb
->
getNdbError
());
...
...
@@ -4168,7 +4183,7 @@ int ndbcluster_discover(THD* thd, const char *db, const char *name,
ndb
->
setDatabaseName
(
db
);
NDBDICT
*
dict
=
ndb
->
getDictionary
();
dict
->
set_local_table_data_size
(
sizeof
(
Ndb_
table_local_info
));
dict
->
set_local_table_data_size
(
sizeof
(
Ndb_
local_table_statistics
));
dict
->
invalidateTable
(
name
);
if
(
!
(
tab
=
dict
->
getTable
(
name
)))
{
...
...
@@ -4216,7 +4231,7 @@ int ndbcluster_table_exists(THD* thd, const char *db, const char *name)
ndb
->
setDatabaseName
(
db
);
NDBDICT
*
dict
=
ndb
->
getDictionary
();
dict
->
set_local_table_data_size
(
sizeof
(
Ndb_
table_local_info
));
dict
->
set_local_table_data_size
(
sizeof
(
Ndb_
local_table_statistics
));
dict
->
invalidateTable
(
name
);
if
(
!
(
tab
=
dict
->
getTable
(
name
)))
{
...
...
@@ -4420,7 +4435,7 @@ bool ndbcluster_init()
// Create a Ndb object to open the connection to NDB
g_ndb
=
new
Ndb
(
g_ndb_cluster_connection
,
"sys"
);
g_ndb
->
getDictionary
()
->
set_local_table_data_size
(
sizeof
(
Ndb_
table_local_info
));
g_ndb
->
getDictionary
()
->
set_local_table_data_size
(
sizeof
(
Ndb_
local_table_statistics
));
if
(
g_ndb
->
init
()
!=
0
)
{
ERR_PRINT
(
g_ndb
->
getNdbError
());
...
...
sql/ha_ndbcluster.h
View file @
3315fab9
...
...
@@ -156,7 +156,7 @@ class ha_ndbcluster: public handler
int
create_unique_index
(
const
char
*
name
,
KEY
*
key_info
);
int
initialize_autoincrement
(
const
void
*
table
);
enum
ILBP
{
ILBP_CREATE
=
0
,
ILBP_OPEN
=
1
};
// Index List Build Phase
int
build_index_list
(
TABLE
*
tab
,
enum
ILBP
phase
);
int
build_index_list
(
Ndb
*
ndb
,
TABLE
*
tab
,
enum
ILBP
phase
);
int
get_metadata
(
const
char
*
path
);
void
release_metadata
();
NDB_INDEX_TYPE
get_index_type
(
uint
idx_no
)
const
;
...
...
@@ -213,6 +213,7 @@ class ha_ndbcluster: public handler
NdbConnection
*
m_active_trans
;
NdbResultSet
*
m_active_cursor
;
void
*
m_table
;
int
m_tableVersion
;
void
*
m_table_info
;
char
m_dbname
[
FN_HEADLEN
];
//char m_schemaname[FN_HEADLEN];
...
...
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