From a34e91067607f02e0c5f434fe795c0d7a196299f Mon Sep 17 00:00:00 2001 From: Brett Hazen Date: Fri, 12 Aug 2016 10:05:46 -0600 Subject: [PATCH] Change format of Coverage node to / --- priv/riak_shell/riak_shell_regression1.log | 16 ++++++++-------- tests/ts_simple_explain_query.erl | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/priv/riak_shell/riak_shell_regression1.log b/priv/riak_shell/riak_shell_regression1.log index 72c489f1..8a5fffe0 100644 --- a/priv/riak_shell/riak_shell_regression1.log +++ b/priv/riak_shell/riak_shell_regression1.log @@ -27,14 +27,14 @@ {{command, "EXPLAIN SELECT * FROM GeoCheckin WHERE myfamily = 'family1' AND myseries = 'series1' AND time >= 2 AND time <= 7000000 AND weather='fair';"}, {result, "+--------+-------------------------------------------------------+----------------------------------------------------------+-------------------+----------------------------------------------------------+-----------------+------------------+ |Subquery| Coverage Plan | Range Scan Start Key |Is Start Inclusive?| Range Scan End Key |Is End Inclusive?| Filter | +--------+-------------------------------------------------------+----------------------------------------------------------+-------------------+----------------------------------------------------------+-----------------+------------------+ -| 1 |dev1@127.0.0.1:10, dev1@127.0.0.1:11, dev1@127.0.0.1:12| myfamily = 'family1', myseries = 'series1', time = 2 | false |myfamily = 'family1', myseries = 'series1', time = 900000 | false |(weather = 'fair')| -| 2 |dev1@127.0.0.1:38, dev1@127.0.0.1:39, dev1@127.0.0.1:40|myfamily = 'family1', myseries = 'series1', time = 900000 | false |myfamily = 'family1', myseries = 'series1', time = 1800000| false |(weather = 'fair')| -| 3 |dev1@127.0.0.1:36, dev1@127.0.0.1:37, dev1@127.0.0.1:38|myfamily = 'family1', myseries = 'series1', time = 1800000| false |myfamily = 'family1', myseries = 'series1', time = 2700000| false |(weather = 'fair')| -| 4 |dev1@127.0.0.1:22, dev1@127.0.0.1:23, dev1@127.0.0.1:24|myfamily = 'family1', myseries = 'series1', time = 2700000| false |myfamily = 'family1', myseries = 'series1', time = 3600000| false |(weather = 'fair')| -| 5 |dev1@127.0.0.1:17, dev1@127.0.0.1:18, dev1@127.0.0.1:19|myfamily = 'family1', myseries = 'series1', time = 3600000| false |myfamily = 'family1', myseries = 'series1', time = 4500000| false |(weather = 'fair')| -| 6 |dev1@127.0.0.1:59, dev1@127.0.0.1:60, dev1@127.0.0.1:61|myfamily = 'family1', myseries = 'series1', time = 4500000| false |myfamily = 'family1', myseries = 'series1', time = 5400000| false |(weather = 'fair')| -| 7 |dev1@127.0.0.1:11, dev1@127.0.0.1:12, dev1@127.0.0.1:13|myfamily = 'family1', myseries = 'series1', time = 5400000| false |myfamily = 'family1', myseries = 'series1', time = 6300000| false |(weather = 'fair')| -| 8 |dev1@127.0.0.1:53, dev1@127.0.0.1:54, dev1@127.0.0.1:55|myfamily = 'family1', myseries = 'series1', time = 6300000| false |myfamily = 'family1', myseries = 'series1', time = 7000000| false |(weather = 'fair')| +| 1 |dev1@127.0.0.1/10, dev1@127.0.0.1/11, dev1@127.0.0.1/12| myfamily = 'family1', myseries = 'series1', time = 2 | false |myfamily = 'family1', myseries = 'series1', time = 900000 | false |(weather = 'fair')| +| 2 |dev1@127.0.0.1/38, dev1@127.0.0.1/39, dev1@127.0.0.1/40|myfamily = 'family1', myseries = 'series1', time = 900000 | false |myfamily = 'family1', myseries = 'series1', time = 1800000| false |(weather = 'fair')| +| 3 |dev1@127.0.0.1/36, dev1@127.0.0.1/37, dev1@127.0.0.1/38|myfamily = 'family1', myseries = 'series1', time = 1800000| false |myfamily = 'family1', myseries = 'series1', time = 2700000| false |(weather = 'fair')| +| 4 |dev1@127.0.0.1/22, dev1@127.0.0.1/23, dev1@127.0.0.1/24|myfamily = 'family1', myseries = 'series1', time = 2700000| false |myfamily = 'family1', myseries = 'series1', time = 3600000| false |(weather = 'fair')| +| 5 |dev1@127.0.0.1/17, dev1@127.0.0.1/18, dev1@127.0.0.1/19|myfamily = 'family1', myseries = 'series1', time = 3600000| false |myfamily = 'family1', myseries = 'series1', time = 4500000| false |(weather = 'fair')| +| 6 |dev1@127.0.0.1/59, dev1@127.0.0.1/60, dev1@127.0.0.1/61|myfamily = 'family1', myseries = 'series1', time = 4500000| false |myfamily = 'family1', myseries = 'series1', time = 5400000| false |(weather = 'fair')| +| 7 |dev1@127.0.0.1/11, dev1@127.0.0.1/12, dev1@127.0.0.1/13|myfamily = 'family1', myseries = 'series1', time = 5400000| false |myfamily = 'family1', myseries = 'series1', time = 6300000| false |(weather = 'fair')| +| 8 |dev1@127.0.0.1/53, dev1@127.0.0.1/54, dev1@127.0.0.1/55|myfamily = 'family1', myseries = 'series1', time = 6300000| false |myfamily = 'family1', myseries = 'series1', time = 7000000| false |(weather = 'fair')| +--------+-------------------------------------------------------+----------------------------------------------------------+-------------------+----------------------------------------------------------+-----------------+------------------+ "}}. {{command, "EXPLAIN SELECT * FROM GeoCheckin;\n"}, {result, "Error (1001): The query must have a where clause."}}. diff --git a/tests/ts_simple_explain_query.erl b/tests/ts_simple_explain_query.erl index d85bae0e..d47c6658 100644 --- a/tests/ts_simple_explain_query.erl +++ b/tests/ts_simple_explain_query.erl @@ -45,21 +45,21 @@ confirm() -> <<"Range Scan End Key">>, <<"Is End Inclusive?">>,<<"Filter">>], [{1, - "dev1@127.0.0.1:49", + "dev1@127.0.0.1/49", "myfamily = 'wingo', myseries = 'dingo', time = 1", false, "myfamily = 'wingo', myseries = 'dingo', time = 900000", false, "((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))"}, {2, - "dev1@127.0.0.1:11", + "dev1@127.0.0.1/11", "myfamily = 'wingo', myseries = 'dingo', time = 900000", false, "myfamily = 'wingo', myseries = 'dingo', time = 1800000", false, "((myoptional = 7) OR ((mybool = true) AND (myvarchar = 'banana')))"}, {3, - "dev1@127.0.0.1:59", + "dev1@127.0.0.1/59", "myfamily = 'wingo', myseries = 'dingo', time = 1800000", false, "myfamily = 'wingo', myseries = 'dingo', time = 2000000",