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
e9399dc2
Commit
e9399dc2
authored
May 05, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/space/pekka/ndb/version/my50
into mysql.com:/space/pekka/ndb/version/my50-work
parents
8297ddbc
303cdacd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
117 additions
and
17 deletions
+117
-17
mysql-test/r/ndb_condition_pushdown.result
mysql-test/r/ndb_condition_pushdown.result
+60
-0
mysql-test/t/ndb_condition_pushdown.test
mysql-test/t/ndb_condition_pushdown.test
+37
-0
ndb/include/ndbapi/NdbOperation.hpp
ndb/include/ndbapi/NdbOperation.hpp
+4
-0
ndb/include/util/NdbSqlUtil.hpp
ndb/include/util/NdbSqlUtil.hpp
+3
-6
ndb/src/common/util/NdbSqlUtil.cpp
ndb/src/common/util/NdbSqlUtil.cpp
+13
-11
No files found.
mysql-test/r/ndb_condition_pushdown.result
View file @
e9399dc2
...
@@ -1782,5 +1782,65 @@ select * from t5 where b like '%jo%' order by a;
...
@@ -1782,5 +1782,65 @@ select * from t5 where b like '%jo%' order by a;
a b
a b
1 jonas
1 jonas
3 johan
3 johan
drop table t1;
create table t1 (a int, b varchar(3), primary key using hash(a))
engine=ndb;
insert into t1 values (1,'a'), (2,'ab'), (3,'abc');
set engine_condition_pushdown = off;
select * from t1 where b like 'ab';
a b
2 ab
select * from t1 where b like 'ab' or b like 'ab';
a b
2 ab
select * from t1 where b like 'abc';
a b
3 abc
select * from t1 where b like 'abc' or b like 'abc';
a b
3 abc
set engine_condition_pushdown = on;
select * from t1 where b like 'ab';
a b
2 ab
select * from t1 where b like 'ab' or b like 'ab';
a b
2 ab
select * from t1 where b like 'abc';
a b
3 abc
select * from t1 where b like 'abc' or b like 'abc';
a b
3 abc
drop table t1;
create table t1 (a int, b char(3), primary key using hash(a))
engine=ndb;
insert into t1 values (1,'a'), (2,'ab'), (3,'abc');
set engine_condition_pushdown = off;
select * from t1 where b like 'ab';
a b
2 ab
select * from t1 where b like 'ab' or b like 'ab';
a b
2 ab
select * from t1 where b like 'abc';
a b
3 abc
select * from t1 where b like 'abc' or b like 'abc';
a b
3 abc
set engine_condition_pushdown = on;
select * from t1 where b like 'ab';
a b
2 ab
select * from t1 where b like 'ab' or b like 'ab';
a b
2 ab
select * from t1 where b like 'abc';
a b
3 abc
select * from t1 where b like 'abc' or b like 'abc';
a b
3 abc
set engine_condition_pushdown = @old_ecpd;
set engine_condition_pushdown = @old_ecpd;
DROP TABLE t1,t2,t3,t4,t5;
DROP TABLE t1,t2,t3,t4,t5;
mysql-test/t/ndb_condition_pushdown.test
View file @
e9399dc2
...
@@ -1649,5 +1649,42 @@ set engine_condition_pushdown = on;
...
@@ -1649,5 +1649,42 @@ set engine_condition_pushdown = on;
explain
select
*
from
t5
where
b
like
'%jo%'
;
explain
select
*
from
t5
where
b
like
'%jo%'
;
select
*
from
t5
where
b
like
'%jo%'
order
by
a
;
select
*
from
t5
where
b
like
'%jo%'
order
by
a
;
# bug#17421 -1
drop
table
t1
;
create
table
t1
(
a
int
,
b
varchar
(
3
),
primary
key
using
hash
(
a
))
engine
=
ndb
;
insert
into
t1
values
(
1
,
'a'
),
(
2
,
'ab'
),
(
3
,
'abc'
);
# in TUP the constants 'ab' 'abc' were expected in varchar format
# "like" returned error which became "false"
# scan filter negates "or" which exposes the bug
set
engine_condition_pushdown
=
off
;
select
*
from
t1
where
b
like
'ab'
;
select
*
from
t1
where
b
like
'ab'
or
b
like
'ab'
;
select
*
from
t1
where
b
like
'abc'
;
select
*
from
t1
where
b
like
'abc'
or
b
like
'abc'
;
set
engine_condition_pushdown
=
on
;
select
*
from
t1
where
b
like
'ab'
;
select
*
from
t1
where
b
like
'ab'
or
b
like
'ab'
;
select
*
from
t1
where
b
like
'abc'
;
select
*
from
t1
where
b
like
'abc'
or
b
like
'abc'
;
# bug#17421 -2
drop
table
t1
;
create
table
t1
(
a
int
,
b
char
(
3
),
primary
key
using
hash
(
a
))
engine
=
ndb
;
insert
into
t1
values
(
1
,
'a'
),
(
2
,
'ab'
),
(
3
,
'abc'
);
# test that incorrect MySQL behaviour is preserved
# 'ab ' LIKE 'ab' is true in MySQL
set
engine_condition_pushdown
=
off
;
select
*
from
t1
where
b
like
'ab'
;
select
*
from
t1
where
b
like
'ab'
or
b
like
'ab'
;
select
*
from
t1
where
b
like
'abc'
;
select
*
from
t1
where
b
like
'abc'
or
b
like
'abc'
;
set
engine_condition_pushdown
=
on
;
select
*
from
t1
where
b
like
'ab'
;
select
*
from
t1
where
b
like
'ab'
or
b
like
'ab'
;
select
*
from
t1
where
b
like
'abc'
;
select
*
from
t1
where
b
like
'abc'
or
b
like
'abc'
;
set
engine_condition_pushdown
=
@
old_ecpd
;
set
engine_condition_pushdown
=
@
old_ecpd
;
DROP
TABLE
t1
,
t2
,
t3
,
t4
,
t5
;
DROP
TABLE
t1
,
t2
,
t3
,
t4
,
t5
;
ndb/include/ndbapi/NdbOperation.hpp
View file @
e9399dc2
...
@@ -631,6 +631,10 @@ public:
...
@@ -631,6 +631,10 @@ public:
bool
nopad
,
Uint32
Label
);
bool
nopad
,
Uint32
Label
);
int
branch_col_ge
(
Uint32
ColId
,
const
void
*
val
,
Uint32
len
,
int
branch_col_ge
(
Uint32
ColId
,
const
void
*
val
,
Uint32
len
,
bool
nopad
,
Uint32
Label
);
bool
nopad
,
Uint32
Label
);
/**
* The argument is always plain char, even if the field is varchar
* (changed in 5.0.22).
*/
int
branch_col_like
(
Uint32
ColId
,
const
void
*
,
Uint32
len
,
int
branch_col_like
(
Uint32
ColId
,
const
void
*
,
Uint32
len
,
bool
nopad
,
Uint32
Label
);
bool
nopad
,
Uint32
Label
);
int
branch_col_notlike
(
Uint32
ColId
,
const
void
*
,
Uint32
len
,
int
branch_col_notlike
(
Uint32
ColId
,
const
void
*
,
Uint32
len
,
...
...
ndb/include/util/NdbSqlUtil.hpp
View file @
e9399dc2
...
@@ -45,14 +45,11 @@ public:
...
@@ -45,14 +45,11 @@ public:
typedef
int
Cmp
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
,
bool
full
);
typedef
int
Cmp
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
,
bool
full
);
/**
/**
* Prototype for "like" comparison. Defined for string types.
Second
* Prototype for "like" comparison. Defined for string types.
First
* argument
must have same type-specific format. Returns 0 on match,
* argument
can be fixed or var* type, second argument is fixed.
* +1 on no match, and -1 on bad data.
*
Returns 0 on match,
+1 on no match, and -1 on bad data.
*
*
* Uses default special chars ( \ % _ ).
* Uses default special chars ( \ % _ ).
*
* TODO convert special chars to the cs so that ucs2 etc works
* TODO allow user-defined escape ( \ )
*/
*/
typedef
int
Like
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
);
typedef
int
Like
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
);
...
...
ndb/src/common/util/NdbSqlUtil.cpp
View file @
e9399dc2
...
@@ -805,7 +805,9 @@ NdbSqlUtil::likeChar(const void* info, const void* p1, unsigned n1, const void*
...
@@ -805,7 +805,9 @@ NdbSqlUtil::likeChar(const void* info, const void* p1, unsigned n1, const void*
const
char
*
v1
=
(
const
char
*
)
p1
;
const
char
*
v1
=
(
const
char
*
)
p1
;
const
char
*
v2
=
(
const
char
*
)
p2
;
const
char
*
v2
=
(
const
char
*
)
p2
;
CHARSET_INFO
*
cs
=
(
CHARSET_INFO
*
)(
info
);
CHARSET_INFO
*
cs
=
(
CHARSET_INFO
*
)(
info
);
int
k
=
(
cs
->
coll
->
wildcmp
)(
cs
,
v1
,
v1
+
n1
,
v2
,
v2
+
n2
,
ndb_wild_prefix
,
ndb_wild_one
,
ndb_wild_many
);
// strip end spaces to match (incorrect) MySQL behaviour
n1
=
(
*
cs
->
cset
->
lengthsp
)(
cs
,
v1
,
n1
);
int
k
=
(
*
cs
->
coll
->
wildcmp
)(
cs
,
v1
,
v1
+
n1
,
v2
,
v2
+
n2
,
ndb_wild_prefix
,
ndb_wild_one
,
ndb_wild_many
);
return
k
==
0
?
0
:
+
1
;
return
k
==
0
?
0
:
+
1
;
}
}
...
@@ -820,16 +822,16 @@ int
...
@@ -820,16 +822,16 @@ int
NdbSqlUtil
::
likeVarchar
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
)
NdbSqlUtil
::
likeVarchar
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
)
{
{
const
unsigned
lb
=
1
;
const
unsigned
lb
=
1
;
if
(
n1
>=
lb
&&
n2
>=
lb
)
{
if
(
n1
>=
lb
)
{
const
uchar
*
v1
=
(
const
uchar
*
)
p1
;
const
uchar
*
v1
=
(
const
uchar
*
)
p1
;
const
uchar
*
v2
=
(
const
uchar
*
)
p2
;
const
uchar
*
v2
=
(
const
uchar
*
)
p2
;
unsigned
m1
=
*
v1
;
unsigned
m1
=
*
v1
;
unsigned
m2
=
*
v
2
;
unsigned
m2
=
n
2
;
if
(
lb
+
m1
<=
n1
&&
lb
+
m2
<=
n2
)
{
if
(
lb
+
m1
<=
n1
)
{
const
char
*
w1
=
(
const
char
*
)
v1
+
lb
;
const
char
*
w1
=
(
const
char
*
)
v1
+
lb
;
const
char
*
w2
=
(
const
char
*
)
v2
+
lb
;
const
char
*
w2
=
(
const
char
*
)
v2
;
CHARSET_INFO
*
cs
=
(
CHARSET_INFO
*
)(
info
);
CHARSET_INFO
*
cs
=
(
CHARSET_INFO
*
)(
info
);
int
k
=
(
cs
->
coll
->
wildcmp
)(
cs
,
w1
,
w1
+
m1
,
w2
,
w2
+
m2
,
ndb_wild_prefix
,
ndb_wild_one
,
ndb_wild_many
);
int
k
=
(
*
cs
->
coll
->
wildcmp
)(
cs
,
w1
,
w1
+
m1
,
w2
,
w2
+
m2
,
ndb_wild_prefix
,
ndb_wild_one
,
ndb_wild_many
);
return
k
==
0
?
0
:
+
1
;
return
k
==
0
?
0
:
+
1
;
}
}
}
}
...
@@ -847,16 +849,16 @@ int
...
@@ -847,16 +849,16 @@ int
NdbSqlUtil
::
likeLongvarchar
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
)
NdbSqlUtil
::
likeLongvarchar
(
const
void
*
info
,
const
void
*
p1
,
unsigned
n1
,
const
void
*
p2
,
unsigned
n2
)
{
{
const
unsigned
lb
=
2
;
const
unsigned
lb
=
2
;
if
(
n1
>=
lb
&&
n2
>=
lb
)
{
if
(
n1
>=
lb
)
{
const
uchar
*
v1
=
(
const
uchar
*
)
p1
;
const
uchar
*
v1
=
(
const
uchar
*
)
p1
;
const
uchar
*
v2
=
(
const
uchar
*
)
p2
;
const
uchar
*
v2
=
(
const
uchar
*
)
p2
;
unsigned
m1
=
uint2korr
(
v1
);
unsigned
m1
=
uint2korr
(
v1
);
unsigned
m2
=
uint2korr
(
v2
)
;
unsigned
m2
=
n2
;
if
(
lb
+
m1
<=
n1
&&
lb
+
m2
<=
n2
)
{
if
(
lb
+
m1
<=
n1
)
{
const
char
*
w1
=
(
const
char
*
)
v1
+
lb
;
const
char
*
w1
=
(
const
char
*
)
v1
+
lb
;
const
char
*
w2
=
(
const
char
*
)
v2
+
lb
;
const
char
*
w2
=
(
const
char
*
)
v2
;
CHARSET_INFO
*
cs
=
(
CHARSET_INFO
*
)(
info
);
CHARSET_INFO
*
cs
=
(
CHARSET_INFO
*
)(
info
);
int
k
=
(
cs
->
coll
->
wildcmp
)(
cs
,
w1
,
w1
+
m1
,
w2
,
w2
+
m2
,
ndb_wild_prefix
,
ndb_wild_one
,
ndb_wild_many
);
int
k
=
(
*
cs
->
coll
->
wildcmp
)(
cs
,
w1
,
w1
+
m1
,
w2
,
w2
+
m2
,
ndb_wild_prefix
,
ndb_wild_one
,
ndb_wild_many
);
return
k
==
0
?
0
:
+
1
;
return
k
==
0
?
0
:
+
1
;
}
}
}
}
...
...
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