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
e12f77a7
Commit
e12f77a7
authored
Dec 12, 2017
by
Sergei Petrunia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-14389: MyRocks and NOPAD collations
Disallow use of NOPAD collations in indexed columns.
parent
13b9ec65
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
3 deletions
+50
-3
sql/share/errmsg-utf8.txt
sql/share/errmsg-utf8.txt
+4
-0
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/ha_rocksdb.cc
+24
-3
storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result
...ge/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result
+9
-0
storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test
storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test
+13
-0
No files found.
sql/share/errmsg-utf8.txt
View file @
e12f77a7
...
...
@@ -7749,3 +7749,7 @@ ER_NET_OK_PACKET_TOO_LARGE
ER_GEOJSON_EMPTY_COORDINATES
eng "Incorrect GeoJSON format - empty 'coordinates' array."
ER_MYROCKS_CANT_NOPAD_COLLATION
eng "MyRocks doesn't currently support collations with \"No pad\" attribute."
storage/rocksdb/ha_rocksdb.cc
View file @
e12f77a7
...
...
@@ -5964,6 +5964,19 @@ rdb_is_index_collation_supported(const my_core::Field *const field) {
return
true
;
}
static
bool
rdb_field_uses_nopad_collation
(
const
my_core
::
Field
*
const
field
)
{
const
my_core
::
enum_field_types
type
=
field
->
real_type
();
/* Handle [VAR](CHAR|BINARY) or TEXT|BLOB */
if
(
type
==
MYSQL_TYPE_VARCHAR
||
type
==
MYSQL_TYPE_STRING
||
type
==
MYSQL_TYPE_BLOB
)
{
return
(
field
->
charset
()
->
state
&
MY_CS_NOPAD
);
}
return
false
;
}
/*
Create structures needed for storing data in rocksdb. This is called when the
table is created. The structures will be shared by all TABLE* objects.
...
...
@@ -6072,8 +6085,7 @@ int ha_rocksdb::create_cfs(
for
(
uint
i
=
0
;
i
<
tbl_def_arg
->
m_key_count
;
i
++
)
{
rocksdb
::
ColumnFamilyHandle
*
cf_handle
;
if
(
rocksdb_strict_collation_check
&&
!
is_hidden_pk
(
i
,
table_arg
,
tbl_def_arg
)
&&
if
(
!
is_hidden_pk
(
i
,
table_arg
,
tbl_def_arg
)
&&
tbl_def_arg
->
base_tablename
().
find
(
tmp_file_prefix
)
!=
0
)
{
if
(
!
tsys_set
)
{
...
...
@@ -6085,7 +6097,16 @@ int ha_rocksdb::create_cfs(
for
(
uint
part
=
0
;
part
<
table_arg
->
key_info
[
i
].
ext_key_parts
;
part
++
)
{
if
(
!
rdb_is_index_collation_supported
(
/* MariaDB: disallow NOPAD collations */
if
(
rdb_field_uses_nopad_collation
(
table_arg
->
key_info
[
i
].
key_part
[
part
].
field
))
{
my_error
(
ER_MYROCKS_CANT_NOPAD_COLLATION
,
MYF
(
0
));
DBUG_RETURN
(
HA_EXIT_FAILURE
);
}
if
(
rocksdb_strict_collation_check
&&
!
rdb_is_index_collation_supported
(
table_arg
->
key_info
[
i
].
key_part
[
part
].
field
)
&&
!
rdb_collation_exceptions
->
matches
(
tablename_sys
))
{
std
::
string
collation_err
;
...
...
storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result
View file @
e12f77a7
...
...
@@ -55,3 +55,12 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range a a 32 NULL # Using where
drop table t1,t2;
set global rocksdb_strict_collation_check=@tmp_rscc;
#
# MDEV-14389: MyRocks and NOPAD collations
#
create table t1 (pk varchar(10) collate latin1_nopad_bin, primary key(pk)) engine=rocksdb;
ERROR HY000: MyRocks doesn't currently support collations with "No pad" attribute.
set global rocksdb_strict_collation_check=off;
create table t1 (pk varchar(10) collate latin1_nopad_bin, primary key(pk)) engine=rocksdb;
ERROR HY000: MyRocks doesn't currently support collations with "No pad" attribute.
set global rocksdb_strict_collation_check=@tmp_rscc;
storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test
View file @
e12f77a7
...
...
@@ -54,3 +54,16 @@ explain select a from t2 where a <'zzz';
drop
table
t1
,
t2
;
set
global
rocksdb_strict_collation_check
=@
tmp_rscc
;
--
echo
#
--
echo
# MDEV-14389: MyRocks and NOPAD collations
--
echo
#
--
error
ER_MYROCKS_CANT_NOPAD_COLLATION
create
table
t1
(
pk
varchar
(
10
)
collate
latin1_nopad_bin
,
primary
key
(
pk
))
engine
=
rocksdb
;
set
global
rocksdb_strict_collation_check
=
off
;
--
error
ER_MYROCKS_CANT_NOPAD_COLLATION
create
table
t1
(
pk
varchar
(
10
)
collate
latin1_nopad_bin
,
primary
key
(
pk
))
engine
=
rocksdb
;
set
global
rocksdb_strict_collation_check
=@
tmp_rscc
;
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