From 74be90ec5f4e5a0b9482cb60091db43aad4e6442 Mon Sep 17 00:00:00 2001 From: Brett Hazen Date: Tue, 13 Sep 2016 13:09:21 -0600 Subject: [PATCH] Test EXPLAIN with PBC, not TTB, which expects binaries --- tests/ts_simple_explain_query.erl | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/ts_simple_explain_query.erl b/tests/ts_simple_explain_query.erl index d47c6658..a0664fd2 100644 --- a/tests/ts_simple_explain_query.erl +++ b/tests/ts_simple_explain_query.erl @@ -45,25 +45,29 @@ confirm() -> <<"Range Scan End Key">>, <<"Is End Inclusive?">>,<<"Filter">>], [{1, - "dev1@127.0.0.1/49", - "myfamily = 'wingo', myseries = 'dingo', time = 1", + <<"dev1@127.0.0.1/49">>, + <<"myfamily = 'wingo', myseries = 'dingo', time = 1">>, false, - "myfamily = 'wingo', myseries = 'dingo', time = 900000", + <<"myfamily = 'wingo', myseries = 'dingo', time = 900000">>, false, - "((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))"}, + <<"((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))">>}, {2, - "dev1@127.0.0.1/11", - "myfamily = 'wingo', myseries = 'dingo', time = 900000", + <<"dev1@127.0.0.1/11">>, + <<"myfamily = 'wingo', myseries = 'dingo', time = 900000">>, false, - "myfamily = 'wingo', myseries = 'dingo', time = 1800000", + <<"myfamily = 'wingo', myseries = 'dingo', time = 1800000">>, false, - "((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))"}, + <<"((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))">>}, {3, - "dev1@127.0.0.1/59", - "myfamily = 'wingo', myseries = 'dingo', time = 1800000", + <<"dev1@127.0.0.1/59">>, + <<"myfamily = 'wingo', myseries = 'dingo', time = 1800000">>, false, - "myfamily = 'wingo', myseries = 'dingo', time = 2000000", + <<"myfamily = 'wingo', myseries = 'dingo', time = 2000000">>, false, - "((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))"}]}}, + <<"((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))">>}]}}, ?assertEqual(Expected, Got), + + %% Now try NOT using TTB + Got2 = riakc_ts:query(Conn, Qry, [], undefined, [{use_ttb, false}]), + ?assertEqual(Expected, Got2), pass.