ii regexp: enable ".*" search with index by default

You can disable it by defining GRN_II_REGEXP_DOT_ASTERISK_ENABLE=no environment variable.
groonga · Apr 13, 2017 · 0180cc1 · 0180cc1
1 parent 9d06ca0
commit 0180cc1
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 24 deletions.
diff --git a/lib/ii.c b/lib/ii.c
@@ -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;
     }
   }
 }

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin_end.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_begin_end.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_end.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/multiple_end.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Properties TABLE_NO_KEY
 column_create Properties content COLUMN_SCALAR ShortText
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/n_matches.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/n_matches.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/not_match.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/not_match.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/one.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/one.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin_end.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/one_begin_end.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text
 

diff --git a/test/command/suite/select/filter/index/regexp/dot_asterisk/one_end.test b/test/command/suite/select/filter/index/regexp/dot_asterisk/one_end.test
@@ -1,5 +1,3 @@
-#$GRN_II_REGEXP_DOT_ASTERISK_ENABLE=yes
-
 table_create Memos TABLE_NO_KEY
 column_create Memos content COLUMN_SCALAR Text