Naoya Murakami
null+****@clear*****
Sat Jun 25 22:59:47 JST 2016
Naoya Murakami 2016-06-25 22:59:47 +0900 (Sat, 25 Jun 2016) New Revision: 389de0fbe98c0b8aef1d1b0d5913c726d3000b01 https://github.com/groonga/groonga/commit/389de0fbe98c0b8aef1d1b0d5913c726d3000b01 Merged 73f5bb8: Merge pull request #563 from naoa/inspect-si-index Message: inspect: add scan_info->index Modified files: lib/expr.c test/mruby/suite/expression_rewriter/test_and_order.rb test/mruby/suite/expression_rewriter/test_between.rb test/mruby/suite/query_optimizer/test_index.rb Modified: lib/expr.c (+4 -0) =================================================================== --- lib/expr.c 2016-06-25 22:50:51 +0900 (d04f188) +++ lib/expr.c 2016-06-25 22:59:47 +0900 (158b9a5) @@ -5064,6 +5064,10 @@ grn_inspect_scan_info_list(grn_ctx *ctx, grn_obj *buffer, scan_info **sis, int n GRN_TEXT_PUTS(ctx, buffer, ">\n"); } } else { + GRN_TEXT_PUTS(ctx, buffer, " index: <"); + grn_inspect(ctx, buffer, &(si->index)); + GRN_TEXT_PUTS(ctx, buffer, ">\n"); + GRN_TEXT_PUTS(ctx, buffer, " query: <"); grn_inspect(ctx, buffer, si->query); GRN_TEXT_PUTS(ctx, buffer, ">\n"); Modified: test/mruby/suite/expression_rewriter/test_and_order.rb (+2 -0) =================================================================== --- test/mruby/suite/expression_rewriter/test_and_order.rb 2016-06-25 22:50:51 +0900 (14abd85) +++ test/mruby/suite/expression_rewriter/test_and_order.rb 2016-06-25 22:59:47 +0900 (62b280b) @@ -58,11 +58,13 @@ class TestAndOrder < ExpressionRewriterTestCase [0] op: <greater_equal> logical_op: <or> + index: <[#<column:index Timestamps.Logs_updated_at range:Logs sources:[Logs.updated_at] flags:NONE>]> query: <"2015-10-03 00:00:00"> expr: <0..2> [1] op: <less_equal> logical_op: <and> + index: <[#<column:index Timestamps.Logs_created_at range:Logs sources:[Logs.created_at] flags:NONE>]> query: <"2015-10-01 00:00:00"> expr: <3..5> DUMP Modified: test/mruby/suite/expression_rewriter/test_between.rb (+2 -0) =================================================================== --- test/mruby/suite/expression_rewriter/test_between.rb 2016-06-25 22:50:51 +0900 (3a86b27) +++ test/mruby/suite/expression_rewriter/test_between.rb 2016-06-25 22:59:47 +0900 (6cbf728) @@ -62,11 +62,13 @@ class TestBetween < ExpressionRewriterTestCase [1] op: <equal> logical_op: <and> + index: <[]> query: <1> expr: <7..9> [2] op: <push> logical_op: <and> + index: <[]> query: <(NULL)> expr: <11..11> DUMP Modified: test/mruby/suite/query_optimizer/test_index.rb (+3 -0) =================================================================== --- test/mruby/suite/query_optimizer/test_index.rb 2016-06-25 22:50:51 +0900 (d750b06) +++ test/mruby/suite/query_optimizer/test_index.rb 2016-06-25 22:59:47 +0900 (5f8f12c) @@ -26,6 +26,7 @@ class TestIndex < QueryOptimizerTestCase [0] op: <match> logical_op: <or> + index: <[#<column:index Terms.Logs_message range:Logs sources:[Logs.message] flags:POSITION>]> query: <"Groonga"> expr: <0..2> DUMP @@ -36,11 +37,13 @@ class TestIndex < QueryOptimizerTestCase [0] op: <match> logical_op: <or> + index: <[#<column:index Terms.Logs_message range:Logs sources:[Logs.message] flags:POSITION>]> query: <"Groonga"> expr: <0..2> [1] op: <equal> logical_op: <and> + index: <[]> query: <2> expr: <3..7> DUMP -------------- next part -------------- HTML����������������������������...Download