null+****@clear*****
null+****@clear*****
2011年 6月 18日 (土) 18:20:26 JST
Kouhei Sutou 2011-06-18 09:20:26 +0000 (Sat, 18 Jun 2011)
New Revision: fd3e9eb5c728fd0524b1f43c23cd36b4daf59c2d
Log:
[wrapper][fulltext][test] follow recent changes.
Modified files:
test/sql/r/fulltext_wrapper.result
test/sql/t/fulltext_wrapper.test
Modified: test/sql/r/fulltext_wrapper.result (+94 -94)
===================================================================
--- test/sql/r/fulltext_wrapper.result 2011-06-18 09:00:05 +0000 (607d966)
+++ test/sql/r/fulltext_wrapper.result 2011-06-18 09:20:26 +0000 (38f45e3)
@@ -7,7 +7,7 @@ t1 CREATE TABLE `t1` (
`c2` text,
PRIMARY KEY (`c1`),
FULLTEXT KEY `ft` (`c2`)
-) ENGINE=groonga DEFAULT CHARSET=latin1
+) ENGINE=groonga DEFAULT CHARSET=latin1 COMMENT='engine "innodb"'
insert into t1 values (1, "hoge hoge");
insert into t1 values (2, "fuga fuga");
insert into t1 values (3, "moge moge");
@@ -52,7 +52,7 @@ c1 c2 c3
5 50 aa ii uu ee oo
drop table t1;
set names utf8;
-create table t1 (c1 int primary key, c2 varchar(255), c3 text, fulltext index(c2), fulltext index(c3)) default charset utf8;
+create table t1 (c1 int primary key, c2 varchar(255), c3 text, fulltext index(c2), fulltext index(c3)) default charset utf8 COMMENT = 'engine "innodb"';
insert into t1 values(1, "明日の富士山の天気について","あああああああ");
insert into t1 values(2, "いいいいい","明日の富士山の天気は分かりません");
insert into t1 values(3, "dummy", "dummy");
@@ -68,57 +68,57 @@ select * from t1 where match(c3) against("富士山");
c1 c2 c3
2 いいいいい 明日の富士山の天気は分かりません
drop table t1;
-create table t1 (c1 int primary key, c2 varchar(100), _score float, fulltext index(c2)) default charset utf8;
-create table t2 (c1 int primary key, c2 text, _score float, fulltext index(c2)) default charset utf8;
-insert into t1 values (1, "aa ii uu ee oo", null);
-insert into t1 values (2, "ka ki ku ke ko", null);
-insert into t1 values (3, "aa ii ii ii oo", null);
-insert into t1 values (4, "sa si su se so", null);
-insert into t1 values (5, "ta ti ii ii to", null);
+create table t1 (c1 int primary key, c2 varchar(100), fulltext index(c2)) default charset utf8 COMMENT = 'engine "innodb"';
+create table t2 (c1 int primary key, c2 text, fulltext index(c2)) default charset utf8 COMMENT = 'engine "innodb"';
+insert into t1 values (1, "aa ii uu ee oo");
+insert into t1 values (2, "ka ki ku ke ko");
+insert into t1 values (3, "aa ii ii ii oo");
+insert into t1 values (4, "sa si su se so");
+insert into t1 values (5, "ta ti ii ii to");
insert into t2 (c1,c2) select c1,c2 from t1;
select * from t1;
-c1 c2 _score
-1 aa ii uu ee oo 0
-2 ka ki ku ke ko 0
-3 aa ii ii ii oo 0
-4 sa si su se so 0
-5 ta ti ii ii to 0
+c1 c2
+1 aa ii uu ee oo
+2 ka ki ku ke ko
+3 aa ii ii ii oo
+4 sa si su se so
+5 ta ti ii ii to
select * from t2;
-c1 c2 _score
-1 aa ii uu ee oo 0
-2 ka ki ku ke ko 0
-3 aa ii ii ii oo 0
-4 sa si su se so 0
-5 ta ti ii ii to 0
+c1 c2
+1 aa ii uu ee oo
+2 ka ki ku ke ko
+3 aa ii ii ii oo
+4 sa si su se so
+5 ta ti ii ii to
select * from t1 where c1=3;
-c1 c2 _score
-3 aa ii ii ii oo 0
+c1 c2
+3 aa ii ii ii oo
select * from t2 where c1=3;
-c1 c2 _score
-3 aa ii ii ii oo 0
+c1 c2
+3 aa ii ii ii oo
select * from t1 where c1>3 order by c1 desc;
-c1 c2 _score
-5 ta ti ii ii to 0
-4 sa si su se so 0
+c1 c2
+5 ta ti ii ii to
+4 sa si su se so
select * from t2 where c1>3 order by c1 asc;
-c1 c2 _score
-4 sa si su se so 0
-5 ta ti ii ii to 0
+c1 c2
+4 sa si su se so
+5 ta ti ii ii to
select * from t1 where c2>"s" order by c2 desc;
-c1 c2 _score
-5 ta ti ii ii to 0
-4 sa si su se so 0
+c1 c2
+5 ta ti ii ii to
+4 sa si su se so
select * from t2 where c2>"s" order by c1 asc;
-c1 c2 _score
-4 sa si su se so 0
-5 ta ti ii ii to 0
-select * from t1 where match(c2) against("ii") order by _score desc;
-c1 c2 _score
+c1 c2
+4 sa si su se so
+5 ta ti ii ii to
+select *,match(c2) against("ii") from t1 where match(c2) against("ii") order by match(c2) against("ii") desc;
+c1 c2 match(c2) against("ii")
3 aa ii ii ii oo 3
5 ta ti ii ii to 2
1 aa ii uu ee oo 1
-select * from t2 where match(c2) against("ii") order by _score asc;
-c1 c2 _score
+select *,match(c2) against("ii") from t2 where match(c2) against("ii") order by match(c2) against("ii") asc;
+c1 c2 match(c2) against("ii")
1 aa ii uu ee oo 1
5 ta ti ii ii to 2
3 aa ii ii ii oo 3
@@ -133,70 +133,70 @@ c1 c2 match(c2) against("ii")
3 aa ii ii ii oo -1
5 ta ti ii ii to -1
drop table t1,t2;
-create table t1 (c1 int primary key, c2 int, c3 text, _score float, fulltext index ft(c3)) COMMENT = 'engine "innodb"';
-insert into t1 values(1,10,"aa ii uu ee oo",null);
-insert into t1 values(2,10,"ka ki ku ke ko",null);
-insert into t1 values(3,10,"aa ii uu ee oo",null);
-insert into t1 values(4,10,"ka ki ku ke ko",null);
-insert into t1 values(5,20,"aa ii uu ee oo",null);
-insert into t1 values(6,20,"ka ki ku ke ko",null);
-insert into t1 values(7,20,"aa ii uu ee oo",null);
-insert into t1 values(8,20,"ka ki ku ke ko",null);
+create table t1 (c1 int primary key, c2 int, c3 text, fulltext index ft(c3)) COMMENT = 'engine "innodb"';
+insert into t1 values(1,10,"aa ii uu ee oo");
+insert into t1 values(2,10,"ka ki ku ke ko");
+insert into t1 values(3,10,"aa ii uu ee oo");
+insert into t1 values(4,10,"ka ki ku ke ko");
+insert into t1 values(5,20,"aa ii uu ee oo");
+insert into t1 values(6,20,"ka ki ku ke ko");
+insert into t1 values(7,20,"aa ii uu ee oo");
+insert into t1 values(8,20,"ka ki ku ke ko");
select * from t1;
-c1 c2 c3 _score
-1 10 aa ii uu ee oo 0
-2 10 ka ki ku ke ko 0
-3 10 aa ii uu ee oo 0
-4 10 ka ki ku ke ko 0
-5 20 aa ii uu ee oo 0
-6 20 ka ki ku ke ko 0
-7 20 aa ii uu ee oo 0
-8 20 ka ki ku ke ko 0
-select * from t1 where match(c3) against("uu");
-c1 c2 c3 _score
+c1 c2 c3
+1 10 aa ii uu ee oo
+2 10 ka ki ku ke ko
+3 10 aa ii uu ee oo
+4 10 ka ki ku ke ko
+5 20 aa ii uu ee oo
+6 20 ka ki ku ke ko
+7 20 aa ii uu ee oo
+8 20 ka ki ku ke ko
+select *,match(c3) against("uu") from t1 where match(c3) against("uu");
+c1 c2 c3 match(c3) against("uu")
1 10 aa ii uu ee oo 1
3 10 aa ii uu ee oo 1
5 20 aa ii uu ee oo 1
7 20 aa ii uu ee oo 1
select * from t1 where not match(c3) against("uu");
-c1 c2 c3 _score
-2 10 ka ki ku ke ko 0
-4 10 ka ki ku ke ko 0
-6 20 ka ki ku ke ko 0
-8 20 ka ki ku ke ko 0
-select * from t1 where match(c3) against("dummy");
-c1 c2 c3 _score
+c1 c2 c3
+2 10 ka ki ku ke ko
+4 10 ka ki ku ke ko
+6 20 ka ki ku ke ko
+8 20 ka ki ku ke ko
+select *,match(c3) against("dummy") from t1 where match(c3) against("dummy");
+c1 c2 c3 match(c3) against("dummy")
select * from t1 where not match(c3) against("dummy");
-c1 c2 c3 _score
-1 10 aa ii uu ee oo 0
-2 10 ka ki ku ke ko 0
-3 10 aa ii uu ee oo 0
-4 10 ka ki ku ke ko 0
-5 20 aa ii uu ee oo 0
-6 20 ka ki ku ke ko 0
-7 20 aa ii uu ee oo 0
-8 20 ka ki ku ke ko 0
+c1 c2 c3
+1 10 aa ii uu ee oo
+2 10 ka ki ku ke ko
+3 10 aa ii uu ee oo
+4 10 ka ki ku ke ko
+5 20 aa ii uu ee oo
+6 20 ka ki ku ke ko
+7 20 aa ii uu ee oo
+8 20 ka ki ku ke ko
select * from t1 where c1 = 4 and not match(c3) against("uu");
-c1 c2 c3 _score
-4 10 ka ki ku ke ko 0
+c1 c2 c3
+4 10 ka ki ku ke ko
select * from t1 where c1 <= 4 and not match(c3) against("uu");
-c1 c2 c3 _score
-2 10 ka ki ku ke ko 0
-4 10 ka ki ku ke ko 0
+c1 c2 c3
+2 10 ka ki ku ke ko
+4 10 ka ki ku ke ko
select * from t1 where c1 > 4 and not match(c3) against("uu");
-c1 c2 c3 _score
-6 20 ka ki ku ke ko 0
-8 20 ka ki ku ke ko 0
+c1 c2 c3
+6 20 ka ki ku ke ko
+8 20 ka ki ku ke ko
select * from t1 where c2 = 10 and not match(c3) against("uu");
-c1 c2 c3 _score
-2 10 ka ki ku ke ko 0
-4 10 ka ki ku ke ko 0
+c1 c2 c3
+2 10 ka ki ku ke ko
+4 10 ka ki ku ke ko
select * from t1 where c2 >= 15 and not match(c3) against("uu");
-c1 c2 c3 _score
-6 20 ka ki ku ke ko 0
-8 20 ka ki ku ke ko 0
+c1 c2 c3
+6 20 ka ki ku ke ko
+8 20 ka ki ku ke ko
select * from t1 where c2 < 15 and not match(c3) against("uu");
-c1 c2 c3 _score
-2 10 ka ki ku ke ko 0
-4 10 ka ki ku ke ko 0
+c1 c2 c3
+2 10 ka ki ku ke ko
+4 10 ka ki ku ke ko
drop table t1;
Modified: test/sql/t/fulltext_wrapper.test (+20 -20)
===================================================================
--- test/sql/t/fulltext_wrapper.test 2011-06-18 09:00:05 +0000 (01bd7fc)
+++ test/sql/t/fulltext_wrapper.test 2011-06-18 09:20:26 +0000 (b7de87d)
@@ -54,13 +54,13 @@ select * from t1 where match(c2) against("富士山");
select * from t1 where match(c3) against("富士山");
drop table t1;
-create table t1 (c1 int primary key, c2 varchar(100), _score float, fulltext index(c2)) default charset utf8 COMMENT = 'engine "innodb"';
-create table t2 (c1 int primary key, c2 text, _score float, fulltext index(c2)) default charset utf8 COMMENT = 'engine "innodb"';
-insert into t1 values (1, "aa ii uu ee oo", null);
-insert into t1 values (2, "ka ki ku ke ko", null);
-insert into t1 values (3, "aa ii ii ii oo", null);
-insert into t1 values (4, "sa si su se so", null);
-insert into t1 values (5, "ta ti ii ii to", null);
+create table t1 (c1 int primary key, c2 varchar(100), fulltext index(c2)) default charset utf8 COMMENT = 'engine "innodb"';
+create table t2 (c1 int primary key, c2 text, fulltext index(c2)) default charset utf8 COMMENT = 'engine "innodb"';
+insert into t1 values (1, "aa ii uu ee oo");
+insert into t1 values (2, "ka ki ku ke ko");
+insert into t1 values (3, "aa ii ii ii oo");
+insert into t1 values (4, "sa si su se so");
+insert into t1 values (5, "ta ti ii ii to");
insert into t2 (c1,c2) select c1,c2 from t1;
select * from t1;
select * from t2;
@@ -70,26 +70,26 @@ select * from t1 where c1>3 order by c1 desc;
select * from t2 where c1>3 order by c1 asc;
select * from t1 where c2>"s" order by c2 desc;
select * from t2 where c2>"s" order by c1 asc;
-select * from t1 where match(c2) against("ii") order by _score desc;
-select * from t2 where match(c2) against("ii") order by _score asc;
+select *,match(c2) against("ii") from t1 where match(c2) against("ii") order by match(c2) against("ii") desc;
+select *,match(c2) against("ii") from t2 where match(c2) against("ii") order by match(c2) against("ii") asc;
select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
drop table t1,t2;
# for "not match against"
-create table t1 (c1 int primary key, c2 int, c3 text, _score float, fulltext index ft(c3)) COMMENT = 'engine "innodb"';
-insert into t1 values(1,10,"aa ii uu ee oo",null);
-insert into t1 values(2,10,"ka ki ku ke ko",null);
-insert into t1 values(3,10,"aa ii uu ee oo",null);
-insert into t1 values(4,10,"ka ki ku ke ko",null);
-insert into t1 values(5,20,"aa ii uu ee oo",null);
-insert into t1 values(6,20,"ka ki ku ke ko",null);
-insert into t1 values(7,20,"aa ii uu ee oo",null);
-insert into t1 values(8,20,"ka ki ku ke ko",null);
+create table t1 (c1 int primary key, c2 int, c3 text, fulltext index ft(c3)) COMMENT = 'engine "innodb"';
+insert into t1 values(1,10,"aa ii uu ee oo");
+insert into t1 values(2,10,"ka ki ku ke ko");
+insert into t1 values(3,10,"aa ii uu ee oo");
+insert into t1 values(4,10,"ka ki ku ke ko");
+insert into t1 values(5,20,"aa ii uu ee oo");
+insert into t1 values(6,20,"ka ki ku ke ko");
+insert into t1 values(7,20,"aa ii uu ee oo");
+insert into t1 values(8,20,"ka ki ku ke ko");
select * from t1;
-select * from t1 where match(c3) against("uu");
+select *,match(c3) against("uu") from t1 where match(c3) against("uu");
select * from t1 where not match(c3) against("uu");
-select * from t1 where match(c3) against("dummy");
+select *,match(c3) against("dummy") from t1 where match(c3) against("dummy");
select * from t1 where not match(c3) against("dummy");
select * from t1 where c1 = 4 and not match(c3) against("uu");
select * from t1 where c1 <= 4 and not match(c3) against("uu");