Make first safer.

Author: floere

indexes/ext/arrays.rs

@@ -98,7 +98,10 @@ impl Array {
         self.data.first()
     }
 
-    pub fn first_amount(&mut self, amount: usize) -> Array {
+    pub fn first_amount(&mut self, mut amount: usize) -> Array {
+        // Check for length.
+        let length = self.length();
+        if amount > length { amount = length; }
         let mut vector = Vec::with_capacity(amount);
         vector.extend(self.data[0..amount].iter().cloned());
         Array {

indexes/lib/picky-indexes/libpicky_rust.dylib

@@ -30,6 +30,9 @@ module ArrayBackend
     attach_function :rust_array_sort_by_bang, [:pointer, :rust_array_sort_by_bang_callback], :pointer
     attach_function :rust_array_dup,          [:pointer],                   :pointer
     attach_function :rust_array_inspect,      [:pointer],                   :string
+    
+    # attach_function :rust_array_find,         [:pointer, :uint16],          :uint16
+    # attach_function :rust_array_reject,         [:pointer, :uint16],          :uint16
   end
 
   class Array < FFI::AutoPointer
@@ -130,6 +133,7 @@ def include? item
 
     def sort_by! &block
       return self unless block_given?
+      return self if size < 2
 
       @internal_instance = rust_array_sort_by_bang(to_ptr, block)
 

indexes/lib/picky-indexes/rust/array.rb

@@ -101,7 +101,6 @@ def process_with_illegals! amount, offset, illegal_ids, sorting = nil
         #
         calculated_ids = calculate_ids amount + illegal_ids.size, offset
         calculated_ids = calculated_ids - illegal_ids
-        p [:process_with_illegals!, calculated_ids, sorting]
         calculated_ids.sort_by! &sorting if sorting
         @count = calculated_ids.size                         # cache the count before throwing away the ids
         @ids   = calculated_ids.slice!(offset, amount) || [] # slice out the relevant part

server/lib/picky/query/allocation.rb

@@ -36,6 +36,7 @@ def weight
         # Note: Caching is most of the time useful.
         #
         def ids
+          # FIXME Use empty_array from bundle!
           @ids ||= @combinations.inject([]) do |total, combination|
             total + combination.ids
           end.uniq