Groonga - fulltext search engine.

[Groonga-commit] groonga/gcs at d7f2f7f [master] Follow Groonga's --normalizer change

Kouhei Sutou null+****@clear*****
Sun Mar 2 14:11:36 JST 2014

• Previous message: [Groonga-commit] [Errored] groonga/gcs#763 (master - e7b7647)
• Next message: [Groonga-commit] [Errored] groonga/gcs#764 (master - d7f2f7f)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2014-03-02 14:11:36 +0900 (Sun, 02 Mar 2014)

  New Revision: d7f2f7f4c5cfb5dff0185fd7dea9bc7e2a8f5e60
  https://github.com/groonga/gcs/commit/d7f2f7f4c5cfb5dff0185fd7dea9bc7e2a8f5e60

  Message:
    Follow Groonga's --normalizer change

  Modified files:
    test/database-domain.test.js
    test/database-index-field.test.js
    test/fixture/companies/ddl-custom-id.grn
    test/fixture/companies/ddl.grn
    test/fixture/companies/synonyms.grn

  Modified: test/database-domain.test.js (+19 -12)
===================================================================
--- test/database-domain.test.js    2014-03-02 14:01:25 +0900 (df66273)
+++ test/database-domain.test.js    2014-03-02 14:11:36 +0900 (fa2eba0)
@@ -488,8 +488,9 @@ suite('database', function() {
                            'column_create ' + domain.configurationsTableName +  ' ' +
                              'value COLUMN_SCALAR ShortText\n' +
                            'table_create ' + domain.termsTableName +  ' ' +
-                             'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-                             '--default_tokenizer TokenBigram';
+                             'TABLE_PAT_KEY ShortText ' +
+                             '--default_tokenizer TokenBigram ' +
+		             '--normalizer NormalizerAuto';
         assert.equal(dump, expectedDump);
       });
 
@@ -541,10 +542,12 @@ suite('database', function() {
              'column_create ' + domain.configurationsTableName + ' ' +
                'value COLUMN_SCALAR ShortText\n' +
              'table_create ' + domain.termsTableName +  ' ' +
-               'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-               '--default_tokenizer TokenBigram\n' +
+               'TABLE_PAT_KEY ShortText ' +
+               '--default_tokenizer TokenBigram ' +
+               '--normalizer NormalizerAuto\n' +
              'table_create ' + domain.synonymsTableName +  ' ' +
-               'TABLE_HASH_KEY|KEY_NORMALIZE ShortText\n' +
+               'TABLE_HASH_KEY ShortText ' +
+               '--normalizer NormalizerAuto\n' +
              'column_create ' + domain.synonymsTableName + ' ' +
                'synonyms COLUMN_VECTOR ShortText\n' +
              'load --table ' + domain.synonymsTableName + '\n' +
@@ -577,10 +580,12 @@ suite('database', function() {
              'column_create ' + domain.configurationsTableName + ' ' +
                'value COLUMN_SCALAR ShortText\n' +
              'table_create ' + domain.termsTableName +  ' ' +
-               'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-               '--default_tokenizer TokenBigram\n' +
+               'TABLE_PAT_KEY ShortText ' +
+               '--default_tokenizer TokenBigram ' +
+               '--normalizer NormalizerAuto\n' +
              'table_create ' + domain.synonymsTableName +  ' ' +
-               'TABLE_HASH_KEY|KEY_NORMALIZE ShortText\n' +
+               'TABLE_HASH_KEY ShortText ' +
+               '--normalizer NormalizerAuto\n' +
              'column_create ' + domain.synonymsTableName + ' ' +
                'synonyms COLUMN_VECTOR ShortText\n' +
              'load --table ' + domain.synonymsTableName + '\n' +
@@ -834,8 +839,9 @@ suite('database', function() {
              'column_create ' + domain.configurationsTableName + ' ' +
                'value COLUMN_SCALAR ShortText\n' +
              'table_create ' + domain.termsTableName +  ' ' +
-               'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-               '--default_tokenizer TokenBigram\n' +
+               'TABLE_PAT_KEY ShortText ' +
+               '--default_tokenizer TokenBigram ' +
+               '--normalizer NormalizerAuto\n' +
              'load --table ' + domain.configurationsTableName + '\n' +
              '[\n' +
              '["_key","value"],\n' +
@@ -885,8 +891,9 @@ suite('database', function() {
              'column_create ' + domain.configurationsTableName + ' ' +
                'value COLUMN_SCALAR ShortText\n' +
              'table_create ' + domain.termsTableName +  ' ' +
-               'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-               '--default_tokenizer TokenBigram\n' +
+               'TABLE_PAT_KEY ShortText ' +
+               '--default_tokenizer TokenBigram ' +
+               '--normalizer NormalizerAuto\n' +
              'load --table ' + domain.configurationsTableName + '\n' +
              '[\n' +
              '["_key","value"],\n' +

  Modified: test/database-index-field.test.js (+16 -11)
===================================================================
--- test/database-index-field.test.js    2014-03-02 14:01:25 +0900 (7ade06e)
+++ test/database-index-field.test.js    2014-03-02 14:11:36 +0900 (5d29fb8)
@@ -555,9 +555,10 @@ suite('database', function() {
                'column_create ' + domain.configurationsTableName +  ' ' +
                  'value COLUMN_SCALAR ShortText\n' +
                'table_create ' + domain.termsTableName + ' ' +
-                 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-                 '--default_tokenizer TokenBigram';
-      }                       
+                 'TABLE_PAT_KEY ShortText ' +
+                 '--default_tokenizer TokenBigram ' +
+                 '--normalizer NormalizerAuto';
+      }
 
       test('createSync for text field', function() {
         var field = new IndexField('name', domain);
@@ -582,8 +583,9 @@ suite('database', function() {
                        'column_create ' + domain.configurationsTableName +  ' ' +
                          'value COLUMN_SCALAR ShortText\n' +
                        'table_create ' + domain.termsTableName + ' ' +
-                         'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-                         '--default_tokenizer TokenBigram\n' +
+                         'TABLE_PAT_KEY ShortText ' +
+                         '--default_tokenizer TokenBigram ' +
+                         '--normalizer NormalizerAuto\n' +
                        'column_create ' + domain.termsTableName + ' ' +
                          field.indexColumnName + ' ' +
                          'COLUMN_INDEX|WITH_POSITION ' + domain.tableName +
@@ -629,8 +631,9 @@ suite('database', function() {
                        'column_create ' + domain.configurationsTableName +  ' ' +
                          'value COLUMN_SCALAR ShortText\n' +
                        'table_create ' + domain.termsTableName + ' ' +
-                         'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-                         '--default_tokenizer TokenBigram\n' +
+                         'TABLE_PAT_KEY ShortText ' +
+                         '--default_tokenizer TokenBigram ' +
+                         '--normalizer NormalizerAuto\n' +
                        'table_create ' + field.indexTableName + ' ' +
                          'TABLE_PAT_KEY UInt32\n' +
                        'column_create ' + field.indexTableName + ' ' +
@@ -676,8 +679,9 @@ suite('database', function() {
                        'column_create ' + domain.configurationsTableName +  ' ' +
                          'value COLUMN_SCALAR ShortText\n' +
                        'table_create ' + domain.termsTableName + ' ' +
-                         'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-                         '--default_tokenizer TokenBigram\n' +
+                         'TABLE_PAT_KEY ShortText ' +
+                         '--default_tokenizer TokenBigram ' +
+                         '--normalizer NormalizerAuto\n' +
                        'table_create ' + field.indexTableName + ' ' +
                          'TABLE_PAT_KEY ShortText\n' +
                        'column_create ' + field.indexTableName + ' ' +
@@ -742,8 +746,9 @@ suite('database', function() {
                        'column_create ' + domain.configurationsTableName +  ' ' +
                          'value COLUMN_SCALAR ShortText\n' +
                        'table_create ' + domain.termsTableName + ' ' +
-                         'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' +
-                         '--default_tokenizer TokenBigram\n' +
+                         'TABLE_PAT_KEY ShortText ' +
+                         '--default_tokenizer TokenBigram ' +
+                         '--normalizer NormalizerAuto\n' +
                        'column_create ' + domain.termsTableName + ' ' +
                          field.indexColumnName + ' ' +
                          'COLUMN_INDEX|WITH_POSITION ' + domain.tableName +

  Modified: test/fixture/companies/ddl-custom-id.grn (+1 -1)
===================================================================
--- test/fixture/companies/ddl-custom-id.grn    2014-03-02 14:01:25 +0900 (984aea5)
+++ test/fixture/companies/ddl-custom-id.grn    2014-03-02 14:11:36 +0900 (81fc14c)
@@ -1,6 +1,6 @@
 table_create companies_id0123_index_product TABLE_PAT_KEY ShortText
 table_create companies_id0123_index_age TABLE_PAT_KEY UInt32
-table_create companies_id0123_index_BigramTerms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram
+table_create companies_id0123_index_BigramTerms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
 table_create companies_id0123_configurations TABLE_HASH_KEY ShortText
 column_create companies_id0123_configurations value COLUMN_SCALAR ShortText
 table_create companies_id0123 TABLE_PAT_KEY ShortText

  Modified: test/fixture/companies/ddl.grn (+1 -1)
===================================================================
--- test/fixture/companies/ddl.grn    2014-03-02 14:01:25 +0900 (e5de93c)
+++ test/fixture/companies/ddl.grn    2014-03-02 14:11:36 +0900 (3b2dba1)
@@ -1,6 +1,6 @@
 table_create companies_00000000000000000000000000_index_product TABLE_PAT_KEY ShortText
 table_create companies_00000000000000000000000000_index_age TABLE_PAT_KEY UInt32
-table_create companies_00000000000000000000000000_index_BigramTerms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram
+table_create companies_00000000000000000000000000_index_BigramTerms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
 table_create companies_00000000000000000000000000_configurations TABLE_HASH_KEY ShortText
 column_create companies_00000000000000000000000000_configurations value COLUMN_SCALAR ShortText
 table_create companies_00000000000000000000000000 TABLE_PAT_KEY ShortText

  Modified: test/fixture/companies/synonyms.grn (+1 -1)
===================================================================
--- test/fixture/companies/synonyms.grn    2014-03-02 14:01:25 +0900 (64220d0)
+++ test/fixture/companies/synonyms.grn    2014-03-02 14:11:36 +0900 (14638e4)
@@ -1,4 +1,4 @@
-table_create companies_00000000000000000000000000_synonyms TABLE_HASH_KEY|KEY_NORMALIZE ShortText
+table_create companies_00000000000000000000000000_synonyms TABLE_HASH_KEY ShortText --normalizer NormalizerAuto
 column_create companies_00000000000000000000000000_synonyms synonyms COLUMN_VECTOR ShortText
 load --table companies_00000000000000000000000000_synonyms
 [
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] [Errored] groonga/gcs#763 (master - e7b7647)
• Next message: [Groonga-commit] [Errored] groonga/gcs#764 (master - d7f2f7f)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]