Merge pull request #19 from OpenRiak/nhse-o34-d34update

Don't require regex to be compiled (martinsumner#484)

Author: martinsumner

src/leveled_codec.erl

@@ -138,7 +138,7 @@
 -type maybe_lookup() ::
     lookup | no_lookup.
 -type actual_regex() ::
-    {re_pattern, term(), term(), term(), term()}.
+    {re_pattern, term(), term(), term(), term()} | iodata().
 -type capture_value() :: binary() | integer().
 -type query_filter_fun() ::
     fun((#{binary() => capture_value()}) -> boolean()).

src/leveled_evalparser.yrl

@@ -80,5 +80,5 @@ re_compile(RegexStr) ->
     re_compile(RegexStr, {pcre, element(2, RegexStr)}).
 
 re_compile({string, _LN, Regex}, Method) ->
-    {ok, CRE} = leveled_util:regex_compile(Regex, element(1, Method)),
-    CRE.
+    {ok, _CRE} = leveled_util:regex_compile(Regex, element(1, Method)),
+    Regex.

test/end_to_end/iterator_SUITE.erl

@@ -764,7 +764,13 @@ query_count(_Config) ->
         {index_query, BucketBin, {fun testutil:foldkeysfun/3, []},
             {<<"idx2_bin">>, <<"2000">>, <<"2000|">>}, {false, RegMia}},
     {async, Mia2KFolder1} = leveled_bookie:book_returnfolder(Book2, Query1),
+    Query1A =
+        {index_query, BucketBin, {fun testutil:foldkeysfun/3, []},
+            {<<"idx2_bin">>, <<"2000">>, <<"2000|">>},
+            {false, <<"[0-9]+Mia">>}},
+    {async, Mia2KFolder1A} = leveled_bookie:book_returnfolder(Book2, Query1A),
     Mia2000Count1 = length(Mia2KFolder1()),
+    Mia2000Count1 = length(Mia2KFolder1A()),
     Query2 =
         {index_query, BucketBin, {fun testutil:foldkeysfun/3, []},
             {<<"idx2_bin">>, <<"2000">>, <<"2001">>}, {true, undefined}},

test/end_to_end/riak_SUITE.erl

@@ -2032,6 +2032,29 @@ dollar_key_index(_Config) ->
     true = 657 == length(FolderREMatch()),
     true = 0 == length(FolderREMiss()),
 
+    % Repeat without pre-compiling the regex
+    {async, FolderREMatchIORE} =
+        leveled_bookie:book_keylist(
+            Bookie1,
+            ?RIAK_TAG,
+            <<"Bucket1">>,
+            {StartKey, EndKey},
+            {FoldKeysFun, []},
+            <<"K.y">>
+        ),
+    {async, FolderREMissIORE} =
+        leveled_bookie:book_keylist(
+            Bookie1,
+            ?RIAK_TAG,
+            <<"Bucket1">>,
+            {StartKey, EndKey},
+            {FoldKeysFun, []},
+            <<"key">>
+        ),
+
+    true = 657 == length(FolderREMatchIORE()),
+    true = 0 == length(FolderREMissIORE()),
+
     % Delete an object - and check that it does not show in
     % $key index query
     DeleteFun =