Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinsumner merged 1 commit into from
Dec 18, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/leveled_codec.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()).
Expand Down
4 changes: 2 additions & 2 deletions src/leveled_evalparser.yrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 6 additions & 0 deletions test/end_to_end/iterator_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
Expand Down
23 changes: 23 additions & 0 deletions test/end_to_end/riak_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down