Kouhei Sutou
null+****@clear*****
Thu Jul 9 12:19:53 JST 2015
Kouhei Sutou 2015-07-09 12:19:53 +0900 (Thu, 09 Jul 2015) New Revision: 579164582775303d84d0b8763e1d748a1e2c5e65 https://github.com/groonga/groonga/commit/579164582775303d84d0b8763e1d748a1e2c5e65 Message: logical_select: use the same default output_columns as select Because not only _id but also _key may be duplicated. It's meaningless that only _id isn't included into the default output_columns. Modified files: plugins/sharding/logical_select.rb test/command/suite/sharding/logical_select/drilldown/labeled/keys/multiple.expected test/command/suite/sharding/logical_select/drilldown/labeled/keys/one.expected test/command/suite/sharding/logical_select/drilldown/labeled/limit/negative.expected test/command/suite/sharding/logical_select/drilldown/labeled/limit/positive.expected test/command/suite/sharding/logical_select/drilldown/labeled/offset/negative.expected test/command/suite/sharding/logical_select/drilldown/labeled/offset/positive.expected test/command/suite/sharding/logical_select/drilldown/labeled/output_columns/multiple/value_v1.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.expected test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.expected test/command/suite/sharding/logical_select/drilldown/plain/keys/multiple.expected test/command/suite/sharding/logical_select/drilldown/plain/keys/reference.expected test/command/suite/sharding/logical_select/drilldown/plain/keys/single.expected test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected test/command/suite/sharding/logical_select/limit/negative.expected test/command/suite/sharding/logical_select/limit/positive.expected test/command/suite/sharding/logical_select/no_condition/all.expected test/command/suite/sharding/logical_select/no_condition/max_exclude.expected test/command/suite/sharding/logical_select/no_condition/max_include.expected test/command/suite/sharding/logical_select/no_condition/min_exclude.expected test/command/suite/sharding/logical_select/no_condition/min_exclude_max_exclude.expected test/command/suite/sharding/logical_select/no_condition/min_exclude_max_include.expected test/command/suite/sharding/logical_select/no_condition/min_include.expected test/command/suite/sharding/logical_select/no_condition/min_include_max_exclude.expected test/command/suite/sharding/logical_select/no_condition/min_include_max_include.expected test/command/suite/sharding/logical_select/offset/negative.expected test/command/suite/sharding/logical_select/offset/positive.expected test/command/suite/sharding/logical_select/sortby/shard_key/ascending.expected Modified: plugins/sharding/logical_select.rb (+1 -1) =================================================================== --- plugins/sharding/logical_select.rb 2015-07-08 23:02:42 +0900 (53b0255) +++ plugins/sharding/logical_select.rb 2015-07-09 12:19:53 +0900 (4d8a933) @@ -187,7 +187,7 @@ module Groonga @offset = (@input[:offset] || 0).to_i @limit = (@input[:limit] || 10).to_i @sort_keys = parse_keys(@input[:sortby]) - @output_columns = @input[:output_columns] || "_key, *" + @output_columns = @input[:output_columns] || "_id, _key, *" @result_sets = [] @unsorted_result_sets = [] Modified: test/command/suite/sharding/logical_select/drilldown/labeled/keys/multiple.expected (+8 -4) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/keys/multiple.expected 2015-07-08 23:02:42 +0900 (2f5c39a) +++ test/command/suite/sharding/logical_select/drilldown/labeled/keys/multiple.expected 2015-07-09 12:19:53 +0900 (ebf82b0) @@ -110,12 +110,12 @@ logical_select Logs timestamp --command_version 2 --limit 0 --drilldown[ac ], [ [ - "action", - "ShortText" + "_id", + "UInt32" ], [ - null, - null + "action", + "ShortText" ], [ "date", @@ -124,6 +124,10 @@ logical_select Logs timestamp --command_version 2 --limit 0 --drilldown[ac [ "memo", "ShortText" + ], + [ + "timestamp", + "Time" ] ] ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/keys/one.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/keys/one.expected 2015-07-08 23:02:42 +0900 (828d2a1) +++ test/command/suite/sharding/logical_select/drilldown/labeled/keys/one.expected 2015-07-09 12:19:53 +0900 (fc6b55c) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/limit/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/limit/negative.expected 2015-07-08 23:02:42 +0900 (fdea0e9) +++ test/command/suite/sharding/logical_select/drilldown/labeled/limit/negative.expected 2015-07-09 12:19:53 +0900 (a4b325c) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/limit/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/limit/positive.expected 2015-07-08 23:02:42 +0900 (b17a055) +++ test/command/suite/sharding/logical_select/drilldown/labeled/limit/positive.expected 2015-07-09 12:19:53 +0900 (ee3587e) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/offset/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/offset/negative.expected 2015-07-08 23:02:42 +0900 (f78ceb4) +++ test/command/suite/sharding/logical_select/drilldown/labeled/offset/negative.expected 2015-07-09 12:19:53 +0900 (2e3d197) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/offset/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/offset/positive.expected 2015-07-08 23:02:42 +0900 (0c82313) +++ test/command/suite/sharding/logical_select/drilldown/labeled/offset/positive.expected 2015-07-09 12:19:53 +0900 (f7a6f30) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/output_columns/multiple/value_v1.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/output_columns/multiple/value_v1.expected 2015-07-08 23:02:42 +0900 (a8ee410) +++ test/command/suite/sharding/logical_select/drilldown/labeled/output_columns/multiple/value_v1.expected 2015-07-09 12:19:53 +0900 (d8c5aa5) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.expected 2015-07-08 23:02:42 +0900 (f93ccdd) +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/ascending.expected 2015-07-09 12:19:53 +0900 (9f0de34) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.expected 2015-07-08 23:02:42 +0900 (54368f1) +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/descending.expected 2015-07-09 12:19:53 +0900 (8415828) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.expected 2015-07-08 23:02:42 +0900 (0e1fa2e) +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/limit.expected 2015-07-09 12:19:53 +0900 (a7ec32e) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.expected 2015-07-08 23:02:42 +0900 (49aacf6) +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/multiple/one_shard.expected 2015-07-09 12:19:53 +0900 (7d284d1) @@ -116,6 +116,10 @@ logical_select Logs timestamp --min "2015-02-05 00:00:00" --min_border "incl ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.expected 2015-07-08 23:02:42 +0900 (29f278e) +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset.expected 2015-07-09 12:19:53 +0900 (ba0efde) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.expected 2015-07-08 23:02:42 +0900 (f6bee3d) +++ test/command/suite/sharding/logical_select/drilldown/labeled/sortby/offset_limit.expected 2015-07-09 12:19:53 +0900 (fdd976d) @@ -110,6 +110,10 @@ logical_select Logs timestamp --limit 0 --drilldown[action_date].keys action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/keys/multiple.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/keys/multiple.expected 2015-07-08 23:02:42 +0900 (6d89464) +++ test/command/suite/sharding/logical_select/drilldown/plain/keys/multiple.expected 2015-07-09 12:19:53 +0900 (61dc5ee) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action,action,action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/keys/reference.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/keys/reference.expected 2015-07-08 23:02:42 +0900 (86d013a) +++ test/command/suite/sharding/logical_select/drilldown/plain/keys/reference.expected 2015-07-09 12:19:53 +0900 (93bd749) @@ -97,6 +97,10 @@ logical_select Logs timestamp --limit 0 --drilldown action ], [ [ + "_id", + "UInt32" + ], + [ "action", "Actions" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/keys/single.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/keys/single.expected 2015-07-08 23:02:42 +0900 (03ab188) +++ test/command/suite/sharding/logical_select/drilldown/plain/keys/single.expected 2015-07-09 12:19:53 +0900 (1367a2c) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2015-07-08 23:02:42 +0900 (d842bc9) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/negative.expected 2015-07-09 12:19:53 +0900 (fd53276) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_lim ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected 2015-07-08 23:02:42 +0900 (9ff6037) +++ test/command/suite/sharding/logical_select/drilldown/plain/limit/positive.expected 2015-07-09 12:19:53 +0900 (737ac52) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_lim ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected 2015-07-08 23:02:42 +0900 (03796d1) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/negative.expected 2015-07-09 12:19:53 +0900 (aba79de) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_off ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected 2015-07-08 23:02:42 +0900 (c0cd88f) +++ test/command/suite/sharding/logical_select/drilldown/plain/offset/positive.expected 2015-07-09 12:19:53 +0900 (3ef463e) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_off ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.expected 2015-07-08 23:02:42 +0900 (d61fa64) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/ascending.expected 2015-07-09 12:19:53 +0900 (f3812de) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.expected 2015-07-08 23:02:42 +0900 (8fe3c15) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/descending.expected 2015-07-09 12:19:53 +0900 (c686b24) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected 2015-07-08 23:02:42 +0900 (65d5a15) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/limit.expected 2015-07-09 12:19:53 +0900 (4407499) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.expected 2015-07-08 23:02:42 +0900 (fac9050) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/multiple.expected 2015-07-09 12:19:53 +0900 (72b87b4) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected 2015-07-08 23:02:42 +0900 (6889256) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset.expected 2015-07-09 12:19:53 +0900 (4a4f6aa) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected (+4 -0) =================================================================== --- test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected 2015-07-08 23:02:42 +0900 (eabf462) +++ test/command/suite/sharding/logical_select/drilldown/plain/sortby/offset_limit.expected 2015-07-09 12:19:53 +0900 (e074d7a) @@ -95,6 +95,10 @@ logical_select Logs timestamp --limit 0 --drilldown action --drilldown_sor ], [ [ + "_id", + "UInt32" + ], + [ "action", "ShortText" ], Modified: test/command/suite/sharding/logical_select/limit/negative.expected (+8 -0) =================================================================== --- test/command/suite/sharding/logical_select/limit/negative.expected 2015-07-08 23:02:42 +0900 (d46ccc2) +++ test/command/suite/sharding/logical_select/limit/negative.expected 2015-07-09 12:19:53 +0900 (0ba3ada) @@ -92,6 +92,10 @@ logical_select Logs timestamp --limit -6 ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,18 +105,22 @@ logical_select Logs timestamp --limit -6 ] ], [ + 1, "2015-02-03 12:49:00", 1422935340.0 ], [ + 2, "2015-02-03 23:59:59", 1422975599.0 ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ], [ + 2, "2015-02-04 13:49:00", 1423025340.0 ] Modified: test/command/suite/sharding/logical_select/limit/positive.expected (+7 -0) =================================================================== --- test/command/suite/sharding/logical_select/limit/positive.expected 2015-07-08 23:02:42 +0900 (2297945) +++ test/command/suite/sharding/logical_select/limit/positive.expected 2015-07-09 12:19:53 +0900 (4144771) @@ -92,6 +92,10 @@ logical_select Logs timestamp --limit 3 ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,14 +105,17 @@ logical_select Logs timestamp --limit 3 ] ], [ + 1, "2015-02-03 12:49:00", 1422935340.0 ], [ + 2, "2015-02-03 23:59:59", 1422975599.0 ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/all.expected (+13 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/all.expected 2015-07-08 23:02:42 +0900 (7fd97e5) +++ test/command/suite/sharding/logical_select/no_condition/all.expected 2015-07-09 12:19:53 +0900 (bbe00ba) @@ -92,6 +92,10 @@ logical_select Logs timestamp ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,38 +105,47 @@ logical_select Logs timestamp ] ], [ + 1, "2015-02-03 12:49:00", 1422935340.0 ], [ + 2, "2015-02-03 23:59:59", 1422975599.0 ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ], [ + 2, "2015-02-04 13:49:00", 1423025340.0 ], [ + 3, "2015-02-04 13:50:00", 1423025400.0 ], [ + 1, "2015-02-05 13:49:00", 1423111740.0 ], [ + 2, "2015-02-05 13:50:00", 1423111800.0 ], [ + 3, "2015-02-05 13:51:00", 1423111860.0 ], [ + 4, "2015-02-05 13:52:00", 1423111920.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/max_exclude.expected (+6 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/max_exclude.expected 2015-07-08 23:02:42 +0900 (4987a49) +++ test/command/suite/sharding/logical_select/no_condition/max_exclude.expected 2015-07-09 12:19:53 +0900 (4561318) @@ -92,6 +92,10 @@ logical_select Logs timestamp --max "2015-02-04 00:00:00" --max_border "excl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,10 +105,12 @@ logical_select Logs timestamp --max "2015-02-04 00:00:00" --max_border "excl ] ], [ + 1, "2015-02-03 12:49:00", 1422935340.0 ], [ + 2, "2015-02-03 23:59:59", 1422975599.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/max_include.expected (+7 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/max_include.expected 2015-07-08 23:02:42 +0900 (3275007) +++ test/command/suite/sharding/logical_select/no_condition/max_include.expected 2015-07-09 12:19:53 +0900 (81fedbc) @@ -92,6 +92,10 @@ logical_select Logs timestamp --max "2015-02-04 00:00:00" --max_border "incl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,14 +105,17 @@ logical_select Logs timestamp --max "2015-02-04 00:00:00" --max_border "incl ] ], [ + 1, "2015-02-03 12:49:00", 1422935340.0 ], [ + 2, "2015-02-03 23:59:59", 1422975599.0 ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/min_exclude.expected (+10 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/min_exclude.expected 2015-07-08 23:02:42 +0900 (262e03e) +++ test/command/suite/sharding/logical_select/no_condition/min_exclude.expected 2015-07-09 12:19:53 +0900 (e2772af) @@ -92,6 +92,10 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "excl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,26 +105,32 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "excl ] ], [ + 2, "2015-02-04 13:49:00", 1423025340.0 ], [ + 3, "2015-02-04 13:50:00", 1423025400.0 ], [ + 1, "2015-02-05 13:49:00", 1423111740.0 ], [ + 2, "2015-02-05 13:50:00", 1423111800.0 ], [ + 3, "2015-02-05 13:51:00", 1423111860.0 ], [ + 4, "2015-02-05 13:52:00", 1423111920.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/min_exclude_max_exclude.expected (+8 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/min_exclude_max_exclude.expected 2015-07-08 23:02:42 +0900 (cfbbc6d) +++ test/command/suite/sharding/logical_select/no_condition/min_exclude_max_exclude.expected 2015-07-09 12:19:53 +0900 (b7316ac) @@ -108,6 +108,10 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "excl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -117,18 +121,22 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "excl ] ], [ + 2, "2015-02-04 00:00:01", 1422975601.0 ], [ + 3, "2015-02-04 13:49:00", 1423025340.0 ], [ + 4, "2015-02-04 13:50:00", 1423025400.0 ], [ + 5, "2015-02-04 23:59:59", 1423061999.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/min_exclude_max_include.expected (+9 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/min_exclude_max_include.expected 2015-07-08 23:02:42 +0900 (dd942a7) +++ test/command/suite/sharding/logical_select/no_condition/min_exclude_max_include.expected 2015-07-09 12:19:53 +0900 (6ba5b4f) @@ -108,6 +108,10 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "excl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -117,22 +121,27 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "excl ] ], [ + 2, "2015-02-04 00:00:01", 1422975601.0 ], [ + 3, "2015-02-04 13:49:00", 1423025340.0 ], [ + 4, "2015-02-04 13:50:00", 1423025400.0 ], [ + 5, "2015-02-04 23:59:59", 1423061999.0 ], [ + 1, "2015-02-05 00:00:00", 1423062000.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/min_include.expected (+11 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/min_include.expected 2015-07-08 23:02:42 +0900 (72900e0) +++ test/command/suite/sharding/logical_select/no_condition/min_include.expected 2015-07-09 12:19:53 +0900 (ebf1584) @@ -92,6 +92,10 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "incl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,30 +105,37 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "incl ] ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ], [ + 2, "2015-02-04 13:49:00", 1423025340.0 ], [ + 3, "2015-02-04 13:50:00", 1423025400.0 ], [ + 1, "2015-02-05 13:49:00", 1423111740.0 ], [ + 2, "2015-02-05 13:50:00", 1423111800.0 ], [ + 3, "2015-02-05 13:51:00", 1423111860.0 ], [ + 4, "2015-02-05 13:52:00", 1423111920.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/min_include_max_exclude.expected (+9 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/min_include_max_exclude.expected 2015-07-08 23:02:42 +0900 (475fd7d) +++ test/command/suite/sharding/logical_select/no_condition/min_include_max_exclude.expected 2015-07-09 12:19:53 +0900 (9e65df3) @@ -108,6 +108,10 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "incl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -117,22 +121,27 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "incl ] ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ], [ + 2, "2015-02-04 00:00:01", 1422975601.0 ], [ + 3, "2015-02-04 13:49:00", 1423025340.0 ], [ + 4, "2015-02-04 13:50:00", 1423025400.0 ], [ + 5, "2015-02-04 23:59:59", 1423061999.0 ] Modified: test/command/suite/sharding/logical_select/no_condition/min_include_max_include.expected (+10 -0) =================================================================== --- test/command/suite/sharding/logical_select/no_condition/min_include_max_include.expected 2015-07-08 23:02:42 +0900 (a44b50d) +++ test/command/suite/sharding/logical_select/no_condition/min_include_max_include.expected 2015-07-09 12:19:53 +0900 (64aa2f0) @@ -108,6 +108,10 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "incl ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -117,26 +121,32 @@ logical_select Logs timestamp --min "2015-02-04 00:00:00" --min_border "incl ] ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ], [ + 2, "2015-02-04 00:00:01", 1422975601.0 ], [ + 3, "2015-02-04 13:49:00", 1423025340.0 ], [ + 4, "2015-02-04 13:50:00", 1423025400.0 ], [ + 5, "2015-02-04 23:59:59", 1423061999.0 ], [ + 1, "2015-02-05 00:00:00", 1423062000.0 ] Modified: test/command/suite/sharding/logical_select/offset/negative.expected (+9 -0) =================================================================== --- test/command/suite/sharding/logical_select/offset/negative.expected 2015-07-08 23:02:42 +0900 (cdd5fd1) +++ test/command/suite/sharding/logical_select/offset/negative.expected 2015-07-09 12:19:53 +0900 (745a444) @@ -92,6 +92,10 @@ logical_select Logs timestamp --offset -5 ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,22 +105,27 @@ logical_select Logs timestamp --offset -5 ] ], [ + 3, "2015-02-04 13:50:00", 1423025400.0 ], [ + 1, "2015-02-05 13:49:00", 1423111740.0 ], [ + 2, "2015-02-05 13:50:00", 1423111800.0 ], [ + 3, "2015-02-05 13:51:00", 1423111860.0 ], [ + 4, "2015-02-05 13:52:00", 1423111920.0 ] Modified: test/command/suite/sharding/logical_select/offset/positive.expected (+10 -0) =================================================================== --- test/command/suite/sharding/logical_select/offset/positive.expected 2015-07-08 23:02:42 +0900 (d6af24e) +++ test/command/suite/sharding/logical_select/offset/positive.expected 2015-07-09 12:19:53 +0900 (983f087) @@ -92,6 +92,10 @@ logical_select Logs timestamp --offset 3 ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -101,26 +105,32 @@ logical_select Logs timestamp --offset 3 ] ], [ + 2, "2015-02-04 13:49:00", 1423025340.0 ], [ + 3, "2015-02-04 13:50:00", 1423025400.0 ], [ + 1, "2015-02-05 13:49:00", 1423111740.0 ], [ + 2, "2015-02-05 13:50:00", 1423111800.0 ], [ + 3, "2015-02-05 13:51:00", 1423111860.0 ], [ + 4, "2015-02-05 13:52:00", 1423111920.0 ] Modified: test/command/suite/sharding/logical_select/sortby/shard_key/ascending.expected (+13 -0) =================================================================== --- test/command/suite/sharding/logical_select/sortby/shard_key/ascending.expected 2015-07-08 23:02:42 +0900 (9e48299) +++ test/command/suite/sharding/logical_select/sortby/shard_key/ascending.expected 2015-07-09 12:19:53 +0900 (4478548) @@ -80,6 +80,10 @@ logical_select Logs timestamp --sortby timestamp ], [ [ + "_id", + "UInt32" + ], + [ "memo", "ShortText" ], @@ -89,38 +93,47 @@ logical_select Logs timestamp --sortby timestamp ] ], [ + 2, "2015-02-03 12:49:00", 1422935340.0 ], [ + 1, "2015-02-03 23:59:59", 1422975599.0 ], [ + 1, "2015-02-04 00:00:00", 1422975600.0 ], [ + 3, "2015-02-04 13:49:00", 1423025340.0 ], [ + 2, "2015-02-04 13:50:00", 1423025400.0 ], [ + 4, "2015-02-05 13:49:00", 1423111740.0 ], [ + 3, "2015-02-05 13:50:00", 1423111800.0 ], [ + 2, "2015-02-05 13:51:00", 1423111860.0 ], [ + 1, "2015-02-05 13:52:00", 1423111920.0 ] -------------- next part -------------- HTML����������������������������...Download