drop heap module

This is really happy case because currently we can drop part of
crud module (heap) and replace it with a heap that shipped with
vshard.

Interfaces is not the same but it's easy to fix. Also I want to
note that heap is used for an ancient 1.10 version (that didn't
support tuple-keydef/tuple-merger modules) and 2.2 that has merger
that segfaults. There is no significant benefits to keep our heap
implementation if we could use heap directly from vshard.

Author: olegrok

crud-scm-1.rockspec

@@ -9,7 +9,7 @@ dependencies = {
     'lua ~> 5.1',
     'checks == 3.1.0-1',
     'errors == 2.2.1-1',
-    'vshard == 0.1.17-1',
+    'vshard >= 0.1.18-1',
 }
 
 build = {

crud/common/heap.lua

@@ -141,6 +141,10 @@ local function build_select_iterator(space_name, user_conditions, opts)
         cmp_operator, cmp_key_parts, plan.field_names, space_format
     )
 
+    local function comparator(node1, node2)
+        return not tuples_comparator(node1.obj, node2.obj)
+    end
+
     -- filter space format by plan.field_names (user defined fields + primary key + scan key)
     -- to pass it user as metadata
     local filtered_space_format, err = utils.get_fields_format(space_format, plan.field_names)
@@ -152,7 +156,7 @@ local function build_select_iterator(space_name, user_conditions, opts)
         space_name = space_name,
         space_format = filtered_space_format,
         iteration_func = select_iteration,
-        comparator = tuples_comparator,
+        comparator = comparator,
 
         plan = plan,
 

crud/select/compat/select_old.lua

@@ -7,7 +7,7 @@ local utils = require('crud.common.utils')
 local UpdateTuplesError = errors.new_class('UpdateTuplesError')
 local GetTupleError = errors.new_class('GetTupleError')
 
-local Heap = require('crud.common.heap')
+local Heap = require('vshard.heap')
 
 local Iterator = {}
 Iterator.__index = Iterator
@@ -48,7 +48,7 @@ function Iterator.new(opts)
         tuples_by_replicasets = {},
         next_tuple_indexes = {},
 
-        heap = Heap.new({ comparator = opts.comparator }),
+        heap = Heap.new(opts.comparator),
         tuples_count = 0,
 
         update_tuples_channel = fiber.channel(1),
@@ -63,7 +63,7 @@ function Iterator.new(opts)
 end
 
 function Iterator:has_next()
-    if self.heap:size() == 0 and self.empty_replicasets_count >= self.replicasets_count then
+    if self.heap:count() == 0 and self.empty_replicasets_count >= self.replicasets_count then
         return false
     end
 
@@ -119,8 +119,9 @@ local function update_replicasets_tuples(iter, after_tuple, replicaset_uuid)
         local next_tuple = get_next_replicaset_tuple(iter, replicaset_uuid)
 
         if next_tuple ~= nil then
-            iter.heap:add(next_tuple, {
-                replicaset_uuid = replicaset_uuid
+            iter.heap:push({
+                obj = next_tuple,
+                meta = {replicaset_uuid = replicaset_uuid},
             })
         end
     end
@@ -182,9 +183,11 @@ function Iterator:get()
         if next_tuple_index <= replicaset_tuples_count then
             local next_tuple = get_next_replicaset_tuple(self, last_tuple_replicaset_uuid)
 
-            self.heap:add(next_tuple, {
-                replicaset_uuid = last_tuple_replicaset_uuid
+            self.heap:push({
+                obj = next_tuple,
+                meta = {replicaset_uuid = last_tuple_replicaset_uuid},
             })
+
         elseif not self.empty_replicasets[last_tuple_replicaset_uuid] then
             self:_update_replicasets_tuples(
                 tuple,