2i query test

The 2i query test added in the previous commit didn't correctly test
regex queries.  This has now been improved.
This commit is contained in:
martinsumner 2016-10-18 09:42:33 +01:00
parent 3e475f46e8
commit 905b712764

View file

@ -119,14 +119,14 @@ simple_querycount(_Config) ->
Index1Count -> Index1Count ->
ok ok
end, end,
RegMia = re:compile("[0-9]+Mia"), {ok, RegMia} = re:compile("[0-9]+Mia"),
{async, {async,
Mia2KFolder1} = leveled_bookie:book_returnfolder(Book2, Mia2KFolder1} = leveled_bookie:book_returnfolder(Book2,
{index_query, {index_query,
"Bucket", "Bucket",
{"idx2_bin", {"idx2_bin",
"2000L", "2000",
"2000N~"}, "2000~"},
{false, {false,
RegMia}}), RegMia}}),
Mia2000Count1 = length(Mia2KFolder1()), Mia2000Count1 = length(Mia2KFolder1()),
@ -135,23 +135,36 @@ simple_querycount(_Config) ->
{index_query, {index_query,
"Bucket", "Bucket",
{"idx2_bin", {"idx2_bin",
"2000Ma", "2000",
"2000Mz"}, "2001"},
{true, {true,
undefined}}), undefined}}),
Mia2000Count2 = lists:foldl(fun({Term, _Key}, Acc) -> Mia2000Count2 = lists:foldl(fun({Term, _Key}, Acc) ->
case Term of case re:run(Term, RegMia) of
"2000Mia" -> nomatch ->
Acc + 1; Acc;
_ -> _ ->
Acc Acc + 1
end end, end end,
0, 0,
Mia2KFolder2()), Mia2KFolder2()),
ok = case Mia2000Count2 of ok = case Mia2000Count2 of
Mia2000Count1 -> Mia2000Count1 when Mia2000Count1 > 0 ->
io:format("Mia2000 counts match at ~w~n",
[Mia2000Count1]),
ok ok
end, end,
{ok, RxMia2K} = re:compile("^2000[0-9]+Mia"),
{async,
Mia2KFolder3} = leveled_bookie:book_returnfolder(Book2,
{index_query,
"Bucket",
{"idx2_bin",
"1980",
"2100"},
{false,
RxMia2K}}),
Mia2000Count1 = length(Mia2KFolder3()),
ok = leveled_bookie:book_close(Book2), ok = leveled_bookie:book_close(Book2),
testutil:reset_filestructure(). testutil:reset_filestructure().