Fixed the update method of key_name and the condition to sort `resu…

…lt_sets` in reverse order
groonga · Oct 26, 2017 · abcb4f4 · abcb4f4
1 parent 7e2b7cf
commit abcb4f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/mrb/scripts/table.rb b/lib/mrb/scripts/table.rb
@@ -102,7 +102,7 @@ def ensure_sort_key(key, converted_keys)
         order    = key[:order] || order
         offset   = key[:offset] || offset
       else
-        key_name = key.dup
+        key_name = key
       end
 
       case key_name
@@ -117,10 +117,10 @@ def ensure_sort_key(key, converted_keys)
       end
 
       if key_name.start_with?("-")
-        key_name[0] = ""
+        key_name = key_name[1..-1]
         order = :descending
       elsif key_name.start_with?("+")
-        key_name[0] = ""
+        key_name = key_name[1..-1]
       end
 
       key = find_column(key_name)

diff --git a/plugins/sharding/logical_select.rb b/plugins/sharding/logical_select.rb
@@ -152,10 +152,8 @@ def write_records(writer, context)
             :offset => current_offset,
             :limit => current_limit,
           }
-          context.sort_keys.each do |sort_key|
-            if sort_key.match("-timestamp")
+          if context.sort_keys.any? {|sort_key| sort_key.start_with?("-")}
               result_sets = result_sets.reverse
-            end
           end
           result_sets.each do |result_set|
             if result_set.size > current_offset