[Groonga-commit] groonga/groonga at 0180cc1 [master] ii regexp: enable ".*" search with index by default

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Apr 13 11:52:43 JST 2017


Kouhei Sutou	2017-04-13 11:52:43 +0900 (Thu, 13 Apr 2017)

  New Revision: 0180cc19091155d98130727e6571461328a88459
  https://github.com/groonga/groonga/commit/0180cc19091155d98130727e6571461328a88459

  Message:
    ii regexp: enable ".*" search with index by default
    
    You can disable it by defining GRN_II_REGEXP_DOT_ASTERISK_ENABLE=no
    environment variable.

  Modified files:
    lib/ii.c
    test/command/suite/select/filter/index/regexp/dot_asterisk/multiple.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin_end.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_end.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/n_matches.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/not_match.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/one.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin_end.test
    test/command/suite/select/filter/index/regexp/dot_asterisk/one_end.test

  Modified: lib/ii.c (+4 -4)
===================================================================
--- lib/ii.c    2017-04-13 11:50:06 +0900 (284f472)
+++ lib/ii.c    2017-04-13 11:52:43 +0900 (7a5a933)
@@ -101,7 +101,7 @@ static grn_bool grn_ii_overlap_token_skip_enable = GRN_FALSE;
 static uint32_t grn_ii_builder_block_threshold_force = 0;
 static uint32_t grn_ii_max_n_segments_small = MAX_PSEG_SMALL;
 static uint32_t grn_ii_max_n_chunks_small = GRN_II_MAX_CHUNK_SMALL;
-static grn_bool grn_ii_regexp_dot_asterisk_enable = GRN_FALSE;
+static grn_bool grn_ii_regexp_dot_asterisk_enable = GRN_TRUE;
 
 void
 grn_ii_init_from_env(void)
@@ -207,10 +207,10 @@ grn_ii_init_from_env(void)
     grn_getenv("GRN_II_REGEXP_DOT_ASTERISK_ENABLE",
                grn_ii_regexp_dot_asterisk_enable_env,
                GRN_ENV_BUFFER_SIZE);
-    if (strcmp(grn_ii_regexp_dot_asterisk_enable_env, "yes") == 0) {
-      grn_ii_regexp_dot_asterisk_enable = GRN_TRUE;
-    } else {
+    if (strcmp(grn_ii_regexp_dot_asterisk_enable_env, "no") == 0) {
       grn_ii_regexp_dot_asterisk_enable = GRN_FALSE;
+    } else {
+      grn_ii_regexp_dot_asterisk_enable = GRN_TRUE;
     }
   }
 }

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/multiple.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/multiple.test    2017-04-13 11:50:06 +0900 (63cc4ac)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/multiple.test    2017-04-13 11:52:43 +0900 (061da06)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin.test    2017-04-13 11:50:06 +0900 (c3d5139)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin.test    2017-04-13 11:52:43 +0900 (2bceecd)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin_end.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin_end.test    2017-04-13 11:50:06 +0900 (e5c77f2)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin_end.test    2017-04-13 11:52:43 +0900 (175e228)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_end.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_end.test    2017-04-13 11:50:06 +0900 (c7e6f69)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_end.test    2017-04-13 11:52:43 +0900 (bd0d4fb)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/n_matches.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/n_matches.test    2017-04-13 11:50:06 +0900 (589db0a)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/n_matches.test    2017-04-13 11:52:43 +0900 (de56e15)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/not_match.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/not_match.test    2017-04-13 11:50:06 +0900 (11260ef)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/not_match.test    2017-04-13 11:52:43 +0900 (4fbad98)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/one.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/one.test    2017-04-13 11:50:06 +0900 (f47e126)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/one.test    2017-04-13 11:52:43 +0900 (38a3bd3)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin.test    2017-04-13 11:50:06 +0900 (95a751e)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin.test    2017-04-13 11:52:43 +0900 (a6654e3)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin_end.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin_end.test    2017-04-13 11:50:06 +0900 (5feeee8)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin_end.test    2017-04-13 11:52:43 +0900 (e9d8e74)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

  Modified: test/command/suite/select/filter/index/regexp/dot_asterisk/one_end.test (+0 -2)
===================================================================
--- test/command/suite/select/filter/index/regexp/dot_asterisk/one_end.test    2017-04-13 11:50:06 +0900 (96c1f32)
+++ test/command/suite/select/filter/index/regexp/dot_asterisk/one_end.test    2017-04-13 11:52:43 +0900 (17b7aad)
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 
-------------- next part --------------
HTML����������������������������...
Télécharger 



More information about the Groonga-commit mailing list
Back to archive index