Groonga - fulltext search engine.

[Groonga-mysql-commit] mroonga/mroonga [master] [test] remove needless COLLATION paramterers.

null+****@clear***** null+****@clear*****
2012年 2月 14日 (火) 19:08:30 JST

• 前の記事 [Groonga-mysql-commit] mroonga/mroonga [master] fix a bug that date/time related types can't be used as primary key.
• 次の記事 [Groonga-mysql-commit] mroonga/mroonga [master] [test] split test patterns to each test file.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Kouhei Sutou	2012-02-14 19:08:30 +0900 (Tue, 14 Feb 2012)

  New Revision: 1a5d80d0350abfb61d772bb49baf3f068a89861e

  Log:
    [test] remove needless COLLATION paramterers.

  Modified files:
    test/sql/suite/mroonga_storage/r/optimization_order_limit_disabled.result
    test/sql/suite/mroonga_storage/r/optimization_order_limit_equal_int.result
    test/sql/suite/mroonga_storage/r/optimization_order_limit_have_primary_key.result
    test/sql/suite/mroonga_storage/r/optimization_order_limit_no_primary_key.result
    test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result
    test/sql/suite/mroonga_storage/r/optimization_skip_count_disabled.result
    test/sql/suite/mroonga_storage/t/optimization_order_limit_disabled.test
    test/sql/suite/mroonga_storage/t/optimization_order_limit_equal_int.test
    test/sql/suite/mroonga_storage/t/optimization_order_limit_have_primary_key.test
    test/sql/suite/mroonga_storage/t/optimization_order_limit_no_primary_key.test
    test/sql/suite/mroonga_storage/t/optimization_order_limit_todo_split_me.test
    test/sql/suite/mroonga_storage/t/optimization_skip_count_disabled.test

  Modified: test/sql/suite/mroonga_storage/r/optimization_order_limit_disabled.result (+4 -4)
===================================================================
--- test/sql/suite/mroonga_storage/r/optimization_order_limit_disabled.result    2012-02-14 19:08:04 +0900 (1178bab)
+++ test/sql/suite/mroonga_storage/r/optimization_order_limit_disabled.result    2012-02-14 19:08:30 +0900 (39aab6e)
@@ -10,7 +10,7 @@ content TEXT,
 FULLTEXT INDEX(content),
 KEY(month),
 KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
@@ -18,12 +18,12 @@ diaries	CREATE TABLE `diaries` (
   `year` int(10) unsigned DEFAULT NULL,
   `month` int(10) unsigned DEFAULT NULL,
   `day` int(10) unsigned DEFAULT NULL,
-  `title` varchar(255) COLLATE utf8_bin DEFAULT NULL,
-  `content` text COLLATE utf8_bin,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
   KEY `month` (`month`),
   KEY `day` (`day`),
   FULLTEXT KEY `content` (`content`)
-) ENGINE=mroonga DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+) ENGINE=mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");
 INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日の富士山の天気について");
 INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気がよくてきれいに見える。");

  Modified: test/sql/suite/mroonga_storage/r/optimization_order_limit_equal_int.result (+4 -4)
===================================================================
--- test/sql/suite/mroonga_storage/r/optimization_order_limit_equal_int.result    2012-02-14 19:08:04 +0900 (6449606)
+++ test/sql/suite/mroonga_storage/r/optimization_order_limit_equal_int.result    2012-02-14 19:08:30 +0900 (ce6383d)
@@ -10,7 +10,7 @@ content TEXT,
 FULLTEXT INDEX(content),
 KEY(month),
 KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
@@ -18,12 +18,12 @@ diaries	CREATE TABLE `diaries` (
   `year` int(10) unsigned DEFAULT NULL,
   `month` int(10) unsigned DEFAULT NULL,
   `day` int(10) unsigned DEFAULT NULL,
-  `title` varchar(255) COLLATE utf8_bin DEFAULT NULL,
-  `content` text COLLATE utf8_bin,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
   KEY `month` (`month`),
   KEY `day` (`day`),
   FULLTEXT KEY `content` (`content`)
-) ENGINE=mroonga DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+) ENGINE=mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");
 INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日の富士山の天気について");
 INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気がよくてきれいに見える。");

  Modified: test/sql/suite/mroonga_storage/r/optimization_order_limit_have_primary_key.result (+4 -4)
===================================================================
--- test/sql/suite/mroonga_storage/r/optimization_order_limit_have_primary_key.result    2012-02-14 19:08:04 +0900 (97183ca)
+++ test/sql/suite/mroonga_storage/r/optimization_order_limit_have_primary_key.result    2012-02-14 19:08:30 +0900 (34186d2)
@@ -9,7 +9,7 @@ title VARCHAR(255),
 content TEXT,
 FULLTEXT INDEX(content),
 KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
@@ -17,12 +17,12 @@ diaries	CREATE TABLE `diaries` (
   `year` int(10) unsigned DEFAULT NULL,
   `month` int(10) unsigned DEFAULT NULL,
   `day` int(10) unsigned DEFAULT NULL,
-  `title` varchar(255) COLLATE utf8_bin DEFAULT NULL,
-  `content` text COLLATE utf8_bin,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
   PRIMARY KEY (`id`),
   KEY `day` (`day`),
   FULLTEXT KEY `content` (`content`)
-) ENGINE=mroonga DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+) ENGINE=mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");
 INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日の富士山の天気について");
 INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気がよくてきれいに見える。");

  Modified: test/sql/suite/mroonga_storage/r/optimization_order_limit_no_primary_key.result (+4 -4)
===================================================================
--- test/sql/suite/mroonga_storage/r/optimization_order_limit_no_primary_key.result    2012-02-14 19:08:04 +0900 (86a354a)
+++ test/sql/suite/mroonga_storage/r/optimization_order_limit_no_primary_key.result    2012-02-14 19:08:30 +0900 (f807bdf)
@@ -9,7 +9,7 @@ title VARCHAR(255),
 content TEXT,
 FULLTEXT INDEX(content),
 KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
@@ -17,11 +17,11 @@ diaries	CREATE TABLE `diaries` (
   `year` int(10) unsigned DEFAULT NULL,
   `month` int(10) unsigned DEFAULT NULL,
   `day` int(10) unsigned DEFAULT NULL,
-  `title` varchar(255) COLLATE utf8_bin DEFAULT NULL,
-  `content` text COLLATE utf8_bin,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
   KEY `day` (`day`),
   FULLTEXT KEY `content` (`content`)
-) ENGINE=mroonga DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+) ENGINE=mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");
 INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日の富士山の天気について");
 INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気がよくてきれいに見える。");

  Modified: test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result    2012-02-14 19:08:04 +0900 (842599f)
+++ test/sql/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result    2012-02-14 19:08:30 +0900 (8faaa9b)
@@ -1,6 +1,6 @@
 drop table if exists t1;
 flush status;
-create table t1 (c1 int primary key, c2 int, c3 text, _id int, key idx1(c2), fulltext index ft(c3)) default charset utf8 collate utf8_bin;
+create table t1 (c1 int primary key, c2 int, c3 text, _id int, key idx1(c2), fulltext index ft(c3)) default charset utf8;
 insert into t1 values(1,10,"aa ii uu ee oo",null);
 insert into t1 values(2,20,"ka ki ku ke ko",null);
 insert into t1 values(3,30,"ii si ii se ii",null);

  Modified: test/sql/suite/mroonga_storage/r/optimization_skip_count_disabled.result (+4 -4)
===================================================================
--- test/sql/suite/mroonga_storage/r/optimization_skip_count_disabled.result    2012-02-14 19:08:04 +0900 (a341db5)
+++ test/sql/suite/mroonga_storage/r/optimization_skip_count_disabled.result    2012-02-14 19:08:30 +0900 (78bb4bb)
@@ -5,15 +5,15 @@ id INT UNSIGNED NOT NULL,
 title VARCHAR(255),
 content TEXT,
 FULLTEXT INDEX(content)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(10) unsigned NOT NULL,
-  `title` varchar(255) COLLATE utf8_bin DEFAULT NULL,
-  `content` text COLLATE utf8_bin,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
   FULLTEXT KEY `content` (`content`)
-) ENGINE=mroonga DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+) ENGINE=mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries VALUES(1, "Hello", "今日からはじめました。");
 INSERT INTO diaries VALUES(2, "天気", "明日の富士山の天気について");
 INSERT INTO diaries VALUES(3, "富士山", "今日も天気がよくてきれいに見える。");

  Modified: test/sql/suite/mroonga_storage/t/optimization_order_limit_disabled.test (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/t/optimization_order_limit_disabled.test    2012-02-14 19:08:04 +0900 (82daf91)
+++ test/sql/suite/mroonga_storage/t/optimization_order_limit_disabled.test    2012-02-14 19:08:30 +0900 (dfcec2b)
@@ -31,7 +31,7 @@ CREATE TABLE diaries (
   FULLTEXT INDEX(content),
   KEY(month),
   KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");

  Modified: test/sql/suite/mroonga_storage/t/optimization_order_limit_equal_int.test (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/t/optimization_order_limit_equal_int.test    2012-02-14 19:08:04 +0900 (63823f2)
+++ test/sql/suite/mroonga_storage/t/optimization_order_limit_equal_int.test    2012-02-14 19:08:30 +0900 (fa32bc7)
@@ -31,7 +31,7 @@ CREATE TABLE diaries (
   FULLTEXT INDEX(content),
   KEY(month),
   KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");

  Modified: test/sql/suite/mroonga_storage/t/optimization_order_limit_have_primary_key.test (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/t/optimization_order_limit_have_primary_key.test    2012-02-14 19:08:04 +0900 (d979bdf)
+++ test/sql/suite/mroonga_storage/t/optimization_order_limit_have_primary_key.test    2012-02-14 19:08:30 +0900 (457eb4b)
@@ -30,7 +30,7 @@ CREATE TABLE diaries (
   content TEXT,
   FULLTEXT INDEX(content),
   KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");

  Modified: test/sql/suite/mroonga_storage/t/optimization_order_limit_no_primary_key.test (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/t/optimization_order_limit_no_primary_key.test    2012-02-14 19:08:04 +0900 (0bf2755)
+++ test/sql/suite/mroonga_storage/t/optimization_order_limit_no_primary_key.test    2012-02-14 19:08:30 +0900 (e8d6281)
@@ -30,7 +30,7 @@ CREATE TABLE diaries (
   content TEXT,
   FULLTEXT INDEX(content),
   KEY(day)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 
 INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日からはじめました。");

  Modified: test/sql/suite/mroonga_storage/t/optimization_order_limit_todo_split_me.test (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/t/optimization_order_limit_todo_split_me.test    2012-02-14 19:08:04 +0900 (bf6f7ff)
+++ test/sql/suite/mroonga_storage/t/optimization_order_limit_todo_split_me.test    2012-02-14 19:08:30 +0900 (1d4467b)
@@ -21,7 +21,7 @@ drop table if exists t1;
 --enable_warnings
 
 flush status;
-create table t1 (c1 int primary key, c2 int, c3 text, _id int, key idx1(c2), fulltext index ft(c3)) default charset utf8 collate utf8_bin;
+create table t1 (c1 int primary key, c2 int, c3 text, _id int, key idx1(c2), fulltext index ft(c3)) default charset utf8;
 insert into t1 values(1,10,"aa ii uu ee oo",null);
 insert into t1 values(2,20,"ka ki ku ke ko",null);
 insert into t1 values(3,30,"ii si ii se ii",null);

  Modified: test/sql/suite/mroonga_storage/t/optimization_skip_count_disabled.test (+1 -1)
===================================================================
--- test/sql/suite/mroonga_storage/t/optimization_skip_count_disabled.test    2012-02-14 19:08:04 +0900 (3843728)
+++ test/sql/suite/mroonga_storage/t/optimization_skip_count_disabled.test    2012-02-14 19:08:30 +0900 (8515011)
@@ -26,7 +26,7 @@ CREATE TABLE diaries (
   title VARCHAR(255),
   content TEXT,
   FULLTEXT INDEX(content)
-) DEFAULT CHARSET UTF8 COLLATE UTF8_BIN;
+) DEFAULT CHARSET UTF8;
 SHOW CREATE TABLE diaries;
 
 INSERT INTO diaries VALUES(1, "Hello", "今日からはじめました。");

• 前の記事 [Groonga-mysql-commit] mroonga/mroonga [master] fix a bug that date/time related types can't be used as primary key.
• 次の記事 [Groonga-mysql-commit] mroonga/mroonga [master] [test] split test patterns to each test file.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]