Revert "Remove support of Tarantool wo tuple-keydef support"

This reverts commit 56247f2.

We will remove support of Tarantool version a bit later.

Author: ligurio

.github/workflows/test_on_push.yaml

@@ -56,7 +56,9 @@ jobs:
     if: github.event_name == 'push'
     strategy:
       matrix:
-        bundle_version: [ "1.10.11-0-gf0b0e7ecf-r422", "2.7.3-0-gdddf926c3-r422" ]
+        # We need 1.10.6 here to check that module works with
+        # old Tarantool versions that don't have "tuple-keydef"/"tuple-merger" support.
+        bundle_version: [ "1.10.6-1-g52c786b", "1.10.10-0-gaea7ae77a-r399", "2.7.2-0-g4d8c06890-r399" ]
       fail-fast: false
     runs-on: [ ubuntu-latest ]
     steps:

CHANGELOG.md

@@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-* Remove support of Tarantool versions that have no builtin tuple-keydef
-  module.
 * Tarantool versions 2.{4,5,6} have reached EOL and removed from regression
   testing. It means that methods `crud.min()` and `crud.max` won't work for old
   versions (< 1.10.8) anymore.

crud/borders.lua

@@ -6,7 +6,8 @@ local dev_checks = require('crud.common.dev_checks')
 local call = require('crud.common.call')
 local utils = require('crud.common.utils')
 local schema = require('crud.common.schema')
-local Keydef = require('crud.compare.keydef')
+local has_keydef, Keydef = pcall(require, 'crud.compare.keydef')
+local select_comparators = require('crud.compare.comparators')
 
 local BorderError = errors.new_class('BorderError', {capture_stack = false})
 
@@ -44,14 +45,25 @@ function borders.init()
    _G._crud.get_border_on_storage = get_border_on_storage
 end
 
-local is_closer = function (compare_sign, keydef, tuple, res_tuple)
-    if res_tuple == nil then
-        return true
-    end
+local is_closer
+
+if has_keydef then
+    is_closer = function (compare_sign, keydef, tuple, res_tuple)
+        if res_tuple == nil then
+            return true
+        end
 
-    local cmp = keydef:compare(tuple, res_tuple)
+        local cmp = keydef:compare(tuple, res_tuple)
 
-    return cmp * compare_sign > 0
+        return cmp * compare_sign > 0
+    end
+else
+    is_closer = function (_, comparator, tuple, res_tuple)
+        if res_tuple == nil then
+            return true
+        end
+        return comparator(tuple, res_tuple)
+    end
 end
 
 local function call_get_border_on_router(border_name, space_name, index_name, opts)
@@ -100,7 +112,20 @@ local function call_get_border_on_router(border_name, space_name, index_name, op
     end
 
     local compare_sign = border_name == 'max' and 1 or -1
-    local keydef = Keydef.new(space, field_names, index.id)
+    local comparator
+    if has_keydef then
+        comparator = Keydef.new(space, field_names, index.id)
+    else
+        local tarantool_iter
+        if compare_sign > 0 then
+            tarantool_iter = box.index.GT
+        else
+            tarantool_iter = box.index.LT
+        end
+        local key_parts = utils.merge_primary_key_parts(index.parts, primary_index.parts)
+        local cmp_operator = select_comparators.get_cmp_operator(tarantool_iter)
+        comparator = select_comparators.gen_tuples_comparator(cmp_operator, key_parts, field_names, space:format())
+    end
 
     local res_tuple = nil
     for _, storage_result in pairs(results) do
@@ -111,7 +136,7 @@ local function call_get_border_on_router(border_name, space_name, index_name, op
         end
 
         local tuple = storage_result.res
-        if tuple ~= nil and is_closer(compare_sign, keydef, tuple, res_tuple) then
+        if tuple ~= nil and is_closer(compare_sign, comparator, tuple, res_tuple) then
             res_tuple = tuple
         end
     end