null+****@clear*****
null+****@clear*****
2012年 4月 24日 (火) 23:04:28 JST
Kouhei Sutou 2012-04-24 23:04:28 +0900 (Tue, 24 Apr 2012)
New Revision: d1e060e1471a04bcfb6f82800768253d7b961971
Log:
Use similar search for MATCH AGAINST IN NATURAL LANGUAGE MODE
This change is incompatible and experimental change.
Before this change, phrase search is used with text in AGAINST().
Modified files:
ha_mroonga.cpp
test/sql/suite/mroonga_storage/r/fulltext_insert_select.result
test/sql/suite/mroonga_storage/r/fulltext_multiple_index.result
test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result
test/sql/suite/mroonga_storage/r/replace_select_varchar.result
test/sql/suite/mroonga_wrapper/r/fulltext_insert_select.result
test/sql/suite/mroonga_wrapper/r/fulltext_many_records.result
test/sql/suite/mroonga_wrapper/r/fulltext_multiple_index.result
test/sql/suite/mroonga_wrapper/r/fulltext_myisam.result
test/sql/suite/mroonga_wrapper/r/fulltext_not_match_against.result
test/sql/suite/mroonga_wrapper/r/optimization_order_limit_todo_split_me.result
Modified: ha_mroonga.cpp (+1 -1)
===================================================================
--- ha_mroonga.cpp 2012-04-24 18:11:26 +0900 (4c8e2b9)
+++ ha_mroonga.cpp 2012-04-24 23:04:28 +0900 (676fc06)
@@ -6690,7 +6690,7 @@ FT_INFO *ha_mroonga::generic_ft_init_ext(uint flags, uint key_nr, String *key)
GRN_TEXT_SET(info->ctx, &query, key->ptr(), key->length());
grn_expr_append_obj(info->ctx, expression, match_columns, GRN_OP_PUSH, 1);
grn_expr_append_const(info->ctx, expression, &query, GRN_OP_PUSH, 1);
- grn_expr_append_op(info->ctx, expression, GRN_OP_MATCH, 2);
+ grn_expr_append_op(info->ctx, expression, GRN_OP_SIMILAR, 2);
grn_obj_unlink(info->ctx, &query);
}
Modified: test/sql/suite/mroonga_storage/r/fulltext_insert_select.result (+6 -6)
===================================================================
--- test/sql/suite/mroonga_storage/r/fulltext_insert_select.result 2012-04-24 18:11:26 +0900 (885ef58)
+++ test/sql/suite/mroonga_storage/r/fulltext_insert_select.result 2012-04-24 23:04:28 +0900 (6c268ff)
@@ -55,12 +55,12 @@ c1 c2
3 aa ii ii ii oo
select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
c1 c2 match(c2) against("ii")
-1 aa ii uu ee oo 1
-3 aa ii ii ii oo 3
-5 ta ti ii ii to 2
+1 aa ii uu ee oo 174763
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
select c1,c2,match(c2) against("ii") from t2 where match(c2) against("ii");
c1 c2 match(c2) against("ii")
-1 aa ii uu ee oo 1
-3 aa ii ii ii oo 3
-5 ta ti ii ii to 2
+1 aa ii uu ee oo 174763
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
drop table t1,t2;
Modified: test/sql/suite/mroonga_storage/r/fulltext_multiple_index.result (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/r/fulltext_multiple_index.result 2012-04-24 18:11:26 +0900 (30a09b5)
+++ test/sql/suite/mroonga_storage/r/fulltext_multiple_index.result 2012-04-24 23:04:28 +0900 (22c8cef)
@@ -29,5 +29,5 @@ from diaries
where match(title) against("survey") and
match(body) against("groonga");
id title body match(title) against("survey") match(body) against("groonga")
-1 survey will start groonga! 1 1
+1 survey will start groonga! 1048577 149797
drop table diaries;
Modified: test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result (+25 -25)
===================================================================
--- test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result 2012-04-24 18:11:26 +0900 (8faaa9b)
+++ test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result 2012-04-24 23:04:28 +0900 (3aa241b)
@@ -11,85 +11,85 @@ Variable_name Value
mroonga_fast_order_limit 0
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 desc;
c1 c2 c3 _id match(c3) against("ii")
-5 50 aa ii uu ii oo 5 2
-3 30 ii si ii se ii 3 3
-1 10 aa ii uu ee oo 1 1
+5 50 aa ii uu ii oo 5 349526
+3 30 ii si ii se ii 3 524289
+1 10 aa ii uu ee oo 1 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 0
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 desc limit 1;
c1 c2 c3 _id match(c3) against("ii")
-5 50 aa ii uu ii oo 5 2
+5 50 aa ii uu ii oo 5 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 1
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1;
c1 c2 c3 _id match(c3) against("ii")
-1 10 aa ii uu ee oo 1 1
-3 30 ii si ii se ii 3 3
-5 50 aa ii uu ii oo 5 2
+1 10 aa ii uu ee oo 1 174763
+3 30 ii si ii se ii 3 524289
+5 50 aa ii uu ii oo 5 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 1
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 limit 1;
c1 c2 c3 _id match(c3) against("ii")
-1 10 aa ii uu ee oo 1 1
+1 10 aa ii uu ee oo 1 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 2
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2 desc;
c1 c2 c3 _id match(c3) against("ii")
-5 50 aa ii uu ii oo 5 2
-3 30 ii si ii se ii 3 3
-1 10 aa ii uu ee oo 1 1
+5 50 aa ii uu ii oo 5 349526
+3 30 ii si ii se ii 3 524289
+1 10 aa ii uu ee oo 1 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 2
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2 desc limit 1;
c1 c2 c3 _id match(c3) against("ii")
-5 50 aa ii uu ii oo 5 2
+5 50 aa ii uu ii oo 5 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 3
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2;
c1 c2 c3 _id match(c3) against("ii")
-1 10 aa ii uu ee oo 1 1
-3 30 ii si ii se ii 3 3
-5 50 aa ii uu ii oo 5 2
+1 10 aa ii uu ee oo 1 174763
+3 30 ii si ii se ii 3 524289
+5 50 aa ii uu ii oo 5 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 3
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2 limit 1;
c1 c2 c3 _id match(c3) against("ii")
-1 10 aa ii uu ee oo 1 1
+1 10 aa ii uu ee oo 1 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 4
select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii") desc;
c3 match(c3) against("ii")
-ii si ii se ii 3
-aa ii uu ii oo 2
-aa ii uu ee oo 1
+ii si ii se ii 524289
+aa ii uu ii oo 349526
+aa ii uu ee oo 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 4
select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii") desc limit 1, 1;
c3 match(c3) against("ii")
-aa ii uu ii oo 2
+aa ii uu ii oo 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 5
select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii");
c3 match(c3) against("ii")
-aa ii uu ee oo 1
-aa ii uu ii oo 2
-ii si ii se ii 3
+aa ii uu ee oo 174763
+aa ii uu ii oo 349526
+ii si ii se ii 524289
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 5
select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii") limit 1;
c3 match(c3) against("ii")
-aa ii uu ee oo 1
+aa ii uu ee oo 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 6
@@ -129,7 +129,7 @@ Variable_name Value
mroonga_fast_order_limit 8
select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 desc limit 1;
c1 c2 c3 _id match(c3) against("ii")
-5 50 aa ii uu ii oo 5 2
+5 50 aa ii uu ii oo 5 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 9
Modified: test/sql/suite/mroonga_storage/r/replace_select_varchar.result (+4 -4)
===================================================================
--- test/sql/suite/mroonga_storage/r/replace_select_varchar.result 2012-04-24 18:11:26 +0900 (2761c80)
+++ test/sql/suite/mroonga_storage/r/replace_select_varchar.result 2012-04-24 23:04:28 +0900 (9cbe11c)
@@ -24,7 +24,7 @@ WHERE v.video_id = (video_id);
SELECT *, MATCH(description) AGAINST("cat") FROM videos_groonga
WHERE MATCH(description) AGAINST("cat");
id video_id description tags_unpack MATCH(description) AGAINST("cat")
-2 video-2 My Cat 1
+2 video-2 My Cat 1048577
INSERT INTO videos_master VALUES (3, "video-3", "My Dog", "family dog");
REPLACE INTO videos_groonga
SELECT v.id, v.video_id, v.description, NULL
@@ -33,7 +33,7 @@ WHERE v.video_id = (video_id);
SELECT *, MATCH(description) AGAINST("my") FROM videos_groonga
WHERE MATCH(description) AGAINST("my");
id video_id description tags_unpack MATCH(description) AGAINST("my")
-1 video-1 My Familly 1
-2 video-2 My Cat 1
-3 video-3 My Dog 1
+1 video-1 My Familly 209716
+2 video-2 My Cat 209716
+3 video-3 My Dog 209716
DROP TABLE videos_master, videos_groonga;
Modified: test/sql/suite/mroonga_wrapper/r/fulltext_insert_select.result (+12 -12)
===================================================================
--- test/sql/suite/mroonga_wrapper/r/fulltext_insert_select.result 2012-04-24 18:11:26 +0900 (8e01f78)
+++ test/sql/suite/mroonga_wrapper/r/fulltext_insert_select.result 2012-04-24 23:04:28 +0900 (03300e3)
@@ -45,22 +45,22 @@ c1 c2
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
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
+1 aa ii uu ee oo 174763
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
+1 aa ii uu ee oo 174763
+5 ta ti ii ii to 349526
+3 aa ii ii ii oo 524289
select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
c1 c2 match(c2) against("ii")
-1 aa ii uu ee oo 1
-3 aa ii ii ii oo 3
-5 ta ti ii ii to 2
+1 aa ii uu ee oo 174763
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
c1 c2 match(c2) against("ii")
-1 aa ii uu ee oo 1
-3 aa ii ii ii oo 3
-5 ta ti ii ii to 2
+1 aa ii uu ee oo 174763
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
drop table t1,t2;
Modified: test/sql/suite/mroonga_wrapper/r/fulltext_many_records.result (+263 -0)
===================================================================
--- test/sql/suite/mroonga_wrapper/r/fulltext_many_records.result 2012-04-24 18:11:26 +0900 (8807c75)
+++ test/sql/suite/mroonga_wrapper/r/fulltext_many_records.result 2012-04-24 23:04:28 +0900 (1f788db)
@@ -4114,6 +4114,249 @@ commit;
set autocommit=1;
select * from diaries where match(title) against("2022-09-0");
id title
+3824 2022-01-01
+3825 2022-01-02
+3826 2022-01-03
+3827 2022-01-04
+3828 2022-01-05
+3829 2022-01-06
+3830 2022-01-07
+3831 2022-01-08
+3832 2022-01-09
+3833 2022-01-10
+3834 2022-01-11
+3835 2022-01-12
+3836 2022-01-13
+3837 2022-01-14
+3838 2022-01-15
+3839 2022-01-16
+3840 2022-01-17
+3841 2022-01-18
+3842 2022-01-19
+3843 2022-01-20
+3844 2022-01-21
+3845 2022-01-22
+3846 2022-01-23
+3847 2022-01-24
+3848 2022-01-25
+3849 2022-01-26
+3850 2022-01-27
+3851 2022-01-28
+3852 2022-01-29
+3853 2022-01-30
+3854 2022-01-31
+3855 2022-02-01
+3856 2022-02-02
+3857 2022-02-03
+3858 2022-02-04
+3859 2022-02-05
+3860 2022-02-06
+3861 2022-02-07
+3862 2022-02-08
+3863 2022-02-09
+3864 2022-02-10
+3865 2022-02-11
+3866 2022-02-12
+3867 2022-02-13
+3868 2022-02-14
+3869 2022-02-15
+3870 2022-02-16
+3871 2022-02-17
+3872 2022-02-18
+3873 2022-02-19
+3874 2022-02-20
+3875 2022-02-21
+3876 2022-02-22
+3877 2022-02-23
+3878 2022-02-24
+3879 2022-02-25
+3880 2022-02-26
+3881 2022-02-27
+3882 2022-02-28
+3883 2022-03-01
+3884 2022-03-02
+3885 2022-03-03
+3886 2022-03-04
+3887 2022-03-05
+3888 2022-03-06
+3889 2022-03-07
+3890 2022-03-08
+3891 2022-03-09
+3892 2022-03-10
+3893 2022-03-11
+3894 2022-03-12
+3895 2022-03-13
+3896 2022-03-14
+3897 2022-03-15
+3898 2022-03-16
+3899 2022-03-17
+3900 2022-03-18
+3901 2022-03-19
+3902 2022-03-20
+3903 2022-03-21
+3904 2022-03-22
+3905 2022-03-23
+3906 2022-03-24
+3907 2022-03-25
+3908 2022-03-26
+3909 2022-03-27
+3910 2022-03-28
+3911 2022-03-29
+3912 2022-03-30
+3913 2022-03-31
+3914 2022-04-01
+3915 2022-04-02
+3916 2022-04-03
+3917 2022-04-04
+3918 2022-04-05
+3919 2022-04-06
+3920 2022-04-07
+3921 2022-04-08
+3922 2022-04-09
+3923 2022-04-10
+3924 2022-04-11
+3925 2022-04-12
+3926 2022-04-13
+3927 2022-04-14
+3928 2022-04-15
+3929 2022-04-16
+3930 2022-04-17
+3931 2022-04-18
+3932 2022-04-19
+3933 2022-04-20
+3934 2022-04-21
+3935 2022-04-22
+3936 2022-04-23
+3937 2022-04-24
+3938 2022-04-25
+3939 2022-04-26
+3940 2022-04-27
+3941 2022-04-28
+3942 2022-04-29
+3943 2022-04-30
+3944 2022-05-01
+3945 2022-05-02
+3946 2022-05-03
+3947 2022-05-04
+3948 2022-05-05
+3949 2022-05-06
+3950 2022-05-07
+3951 2022-05-08
+3952 2022-05-09
+3953 2022-05-10
+3954 2022-05-11
+3955 2022-05-12
+3956 2022-05-13
+3957 2022-05-14
+3958 2022-05-15
+3959 2022-05-16
+3960 2022-05-17
+3961 2022-05-18
+3962 2022-05-19
+3963 2022-05-20
+3964 2022-05-21
+3965 2022-05-22
+3966 2022-05-23
+3967 2022-05-24
+3968 2022-05-25
+3969 2022-05-26
+3970 2022-05-27
+3971 2022-05-28
+3972 2022-05-29
+3973 2022-05-30
+3974 2022-05-31
+3975 2022-06-01
+3976 2022-06-02
+3977 2022-06-03
+3978 2022-06-04
+3979 2022-06-05
+3980 2022-06-06
+3981 2022-06-07
+3982 2022-06-08
+3983 2022-06-09
+3984 2022-06-10
+3985 2022-06-11
+3986 2022-06-12
+3987 2022-06-13
+3988 2022-06-14
+3989 2022-06-15
+3990 2022-06-16
+3991 2022-06-17
+3992 2022-06-18
+3993 2022-06-19
+3994 2022-06-20
+3995 2022-06-21
+3996 2022-06-22
+3997 2022-06-23
+3998 2022-06-24
+3999 2022-06-25
+4000 2022-06-26
+4001 2022-06-27
+4002 2022-06-28
+4003 2022-06-29
+4004 2022-06-30
+4005 2022-07-01
+4006 2022-07-02
+4007 2022-07-03
+4008 2022-07-04
+4009 2022-07-05
+4010 2022-07-06
+4011 2022-07-07
+4012 2022-07-08
+4013 2022-07-09
+4014 2022-07-10
+4015 2022-07-11
+4016 2022-07-12
+4017 2022-07-13
+4018 2022-07-14
+4019 2022-07-15
+4020 2022-07-16
+4021 2022-07-17
+4022 2022-07-18
+4023 2022-07-19
+4024 2022-07-20
+4025 2022-07-21
+4026 2022-07-22
+4027 2022-07-23
+4028 2022-07-24
+4029 2022-07-25
+4030 2022-07-26
+4031 2022-07-27
+4032 2022-07-28
+4033 2022-07-29
+4034 2022-07-30
+4035 2022-07-31
+4036 2022-08-01
+4037 2022-08-02
+4038 2022-08-03
+4039 2022-08-04
+4040 2022-08-05
+4041 2022-08-06
+4042 2022-08-07
+4043 2022-08-08
+4044 2022-08-09
+4045 2022-08-10
+4046 2022-08-11
+4047 2022-08-12
+4048 2022-08-13
+4049 2022-08-14
+4050 2022-08-15
+4051 2022-08-16
+4052 2022-08-17
+4053 2022-08-18
+4054 2022-08-19
+4055 2022-08-20
+4056 2022-08-21
+4057 2022-08-22
+4058 2022-08-23
+4059 2022-08-24
+4060 2022-08-25
+4061 2022-08-26
+4062 2022-08-27
+4063 2022-08-28
+4064 2022-08-29
+4065 2022-08-30
+4066 2022-08-31
4067 2022-09-01
4068 2022-09-02
4069 2022-09-03
@@ -4123,4 +4366,24 @@ id title
4073 2022-09-07
4074 2022-09-08
4075 2022-09-09
+4076 2022-09-10
+4077 2022-09-11
+4078 2022-09-12
+4079 2022-09-13
+4080 2022-09-14
+4081 2022-09-15
+4082 2022-09-16
+4083 2022-09-17
+4084 2022-09-18
+4085 2022-09-19
+4086 2022-09-20
+4087 2022-09-21
+4088 2022-09-22
+4089 2022-09-23
+4090 2022-09-24
+4091 2022-09-25
+4092 2022-09-26
+4093 2022-09-27
+4094 2022-09-28
+4095 2022-09-29
drop table diaries;
Modified: test/sql/suite/mroonga_wrapper/r/fulltext_multiple_index.result (+1 -1)
===================================================================
--- test/sql/suite/mroonga_wrapper/r/fulltext_multiple_index.result 2012-04-24 18:11:26 +0900 (8d4ee1a)
+++ test/sql/suite/mroonga_wrapper/r/fulltext_multiple_index.result 2012-04-24 23:04:28 +0900 (2d9944d)
@@ -29,5 +29,5 @@ from diaries
where match(title) against("survey") and
match(body) against("groonga");
id title body match(title) against("survey") match(body) against("groonga")
-1 survey will start groonga! 1 1
+1 survey will start groonga! 1048577 149797
drop table diaries;
Modified: test/sql/suite/mroonga_wrapper/r/fulltext_myisam.result (+16 -16)
===================================================================
--- test/sql/suite/mroonga_wrapper/r/fulltext_myisam.result 2012-04-24 18:11:26 +0900 (fc961e7)
+++ test/sql/suite/mroonga_wrapper/r/fulltext_myisam.result 2012-04-24 23:04:28 +0900 (b3fe964)
@@ -114,24 +114,24 @@ c1 c2
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
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
+1 aa ii uu ee oo 174763
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
+1 aa ii uu ee oo 174763
+5 ta ti ii ii to 349526
+3 aa ii ii ii oo 524289
select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
c1 c2 match(c2) against("ii")
-1 aa ii uu ee oo 1
-3 aa ii ii ii oo 3
-5 ta ti ii ii to 2
+1 aa ii uu ee oo 174763
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
c1 c2 match(c2) against("ii")
-1 aa ii uu ee oo 1
-3 aa ii ii ii oo 3
-5 ta ti ii ii to 2
+1 aa ii uu ee oo 174763
+3 aa ii ii ii oo 524289
+5 ta ti ii ii to 349526
drop table t1,t2;
create table t1 (c1 int primary key, c2 int, c3 text, fulltext index ft(c3)) COMMENT = 'engine "myisam"';
insert into t1 values(1,10,"aa ii uu ee oo");
@@ -154,10 +154,10 @@ c1 c2 c3
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
+1 10 aa ii uu ee oo 131073
+3 10 aa ii uu ee oo 131073
+5 20 aa ii uu ee oo 131073
+7 20 aa ii uu ee oo 131073
select * from t1 where not match(c3) against("uu");
c1 c2 c3
2 10 ka ki ku ke ko
Modified: test/sql/suite/mroonga_wrapper/r/fulltext_not_match_against.result (+4 -4)
===================================================================
--- test/sql/suite/mroonga_wrapper/r/fulltext_not_match_against.result 2012-04-24 18:11:26 +0900 (4b7ee5a)
+++ test/sql/suite/mroonga_wrapper/r/fulltext_not_match_against.result 2012-04-24 23:04:28 +0900 (bbe23df)
@@ -20,10 +20,10 @@ c1 c2 c3
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
+1 10 aa ii uu ee oo 131073
+3 10 aa ii uu ee oo 131073
+5 20 aa ii uu ee oo 131073
+7 20 aa ii uu ee oo 131073
select * from t1 where not match(c3) against("uu");
c1 c2 c3
2 10 ka ki ku ke ko
Modified: test/sql/suite/mroonga_wrapper/r/optimization_order_limit_todo_split_me.result (+10 -10)
===================================================================
--- test/sql/suite/mroonga_wrapper/r/optimization_order_limit_todo_split_me.result 2012-04-24 18:11:26 +0900 (1468297)
+++ test/sql/suite/mroonga_wrapper/r/optimization_order_limit_todo_split_me.result 2012-04-24 23:04:28 +0900 (d7c11b1)
@@ -15,46 +15,46 @@ insert into t1 values(5,50,"aa ii uu ii oo");
select *, match(c3) against("ii") from t1
where match(c3) against("ii") order by c1 desc limit 1;
c1 c2 c3 match(c3) against("ii")
-5 50 aa ii uu ii oo 2
+5 50 aa ii uu ii oo 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 0
select *, match(c3) against("ii") from t1
where match(c3) against("ii") order by c1 limit 1;
c1 c2 c3 match(c3) against("ii")
-1 10 aa ii uu ee oo 1
+1 10 aa ii uu ee oo 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 0
select c3, match(c3) against("ii") from t1
where match(c3) against("ii") order by match(c3) against("ii") desc;
c3 match(c3) against("ii")
-ii si ii se ii 3
-aa ii uu ii oo 2
-aa ii uu ee oo 1
+ii si ii se ii 524289
+aa ii uu ii oo 349526
+aa ii uu ee oo 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 0
select c3, match(c3) against("ii") from t1
where match(c3) against("ii") order by match(c3) against("ii") desc limit 1, 1;
c3 match(c3) against("ii")
-aa ii uu ii oo 2
+aa ii uu ii oo 349526
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 1
select c3, match(c3) against("ii") from t1
where match(c3) against("ii") order by match(c3) against("ii");
c3 match(c3) against("ii")
-aa ii uu ee oo 1
-aa ii uu ii oo 2
-ii si ii se ii 3
+aa ii uu ee oo 174763
+aa ii uu ii oo 349526
+ii si ii se ii 524289
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 1
select c3, match(c3) against("ii") from t1
where match(c3) against("ii") order by match(c3) against("ii") limit 1;
c3 match(c3) against("ii")
-aa ii uu ee oo 1
+aa ii uu ee oo 174763
show status like 'mroonga_fast_order_limit';
Variable_name Value
mroonga_fast_order_limit 2