More tests

Author: AnaNek

test/integration/count_test.lua

@@ -27,6 +27,7 @@ pgroup.after_all(function(g) helpers.stop_cluster(g.cluster) end)
 
 pgroup.before_each(function(g)
     helpers.truncate_space_on_cluster(g.cluster, 'customers')
+    helpers.truncate_space_on_cluster(g.cluster, 'coord')
 end)
 
 pgroup.test_count_non_existent_space = function(g)
@@ -48,48 +49,12 @@ pgroup.test_not_valid_value_type = function(g)
         {'==', 'id', 'not_number'}
     }
 
-    local obj, err = g.cluster.main_server.net_box:eval([[
-        local crud = require('crud')
-        local conditions = ...
-
-        local result, err = crud.count('customers', conditions)
-        return result, err
-    ]], {conditions})
-
-    t.assert_equals(obj, nil)
-    t.assert_str_contains(err.err, "Supplied key type of part 0 does not match index part type: expected unsigned")
-end
-
-pgroup.test_count_all = function(g)
-    local customers = {}
-    local expected_len = 100
-
-    -- let's insert a large number of tuples in a simple loop that gives
-    -- really high probability that there is at least one tuple on each storage
-    for i = 1, expected_len do
-        table.insert(customers, {
-            id = i, name = tostring(i), last_name = tostring(i),
-            age = i, city = tostring(i),
-        })
-    end
-
-    helpers.insert_objects(g, 'customers', customers)
-
-    -- use box.count
-    local result, err = g.cluster.main_server.net_box:call('crud.count',
-            {'customers'}
-    )
-
-    t.assert_equals(err, nil)
-    t.assert_equals(result, expected_len)
-
-    -- use approximate algorithm
     local result, err = g.cluster.main_server.net_box:call('crud.count',
-            {'customers', nil, {use_box_count = false}}
+            {'customers', conditions}
     )
 
-    t.assert_equals(err, nil)
-    t.assert_equals(result, expected_len)
+    t.assert_equals(result, nil)
+    t.assert_str_contains(err.err, "Supplied key type of part 0 does not match index part type: expected unsigned")
 end
 
 pgroup.test_count_all = function(g)
@@ -175,14 +140,12 @@ pgroup.test_select_by_primary_index = function(g)
     local conditions = {{'==', 'id_index', 3}}
 
     -- use box.count
-    --[[
     local result, err = g.cluster.main_server.net_box:call('crud.count',
             {'customers', conditions}
     )
 
     t.assert_equals(err, nil)
     t.assert_equals(result, expected_len)
-    --]]
 
     -- use approximate algorithm
     local result, err = g.cluster.main_server.net_box:call('crud.count',
@@ -467,3 +430,86 @@ pgroup.test_lt_condition_with_index = function(g)
     t.assert_equals(err, nil)
     t.assert_equals(result, expected_len)
 end
+
+--[[
+pgroup.test_multiple_conditions = function(g)
+    local bucket_id = 1
+    local other_bucket_id, err = helpers.get_other_storage_bucket_id(g.cluster, bucket_id)
+    t.assert(other_bucket_id ~= nil, err)
+
+    -- let's insert five tuples on different replicasets
+    -- (two tuples on one replica and three on the other)
+    -- to check that  the total length will be calculated on the router
+    helpers.insert_objects(g, 'customers', {
+        {
+            id = 1, name = "Elizabeth", last_name = "Jackson",
+            age = 31, city = "New York",
+            bucket_id = bucket_id,
+        }, {
+            id = 2, name = "Mary", last_name = "Brown",
+            age = 33, city = "Los Angeles",
+            bucket_id = other_bucket_id,
+        },  {
+            id = 3, name = "Elizabeth", last_name = "Smith",
+            age = 33, city = "Los Angeles",
+            bucket_id = bucket_id
+        }, {
+            id = 4, name = "William", last_name = "White",
+            age = 81, city = "Chicago",
+            bucket_id = bucket_id
+        }, {
+            id = 5, name = "Elizabeth", last_name = "May",
+            age = 28, city = "New York",
+            bucket_id = other_bucket_id
+        },
+    })
+
+    local conditions = {
+        {'>', 'age', 25},
+        {'==', 'name', 'Elizabeth'},
+        {'==', 'city', 'New York'},
+    }
+
+    local expected_len = 2
+
+    -- use box.count
+    local result, err = g.cluster.main_server.net_box:call('crud.count',
+            {'customers', conditions}
+    )
+
+    t.assert_equals(err, nil)
+    --t.assert_equals(result, expected_len)
+
+    -- use approximate algorithm
+    local result, err = g.cluster.main_server.net_box:call('crud.count',
+            {'customers', conditions, {use_box_count = false}}
+    )
+
+    t.assert_equals(err, nil)
+    t.assert_equals(result, expected_len)
+end
+--]]
+
+pgroup.test_multipart_primary_index = function(g)
+    local bucket_id = 1
+    local other_bucket_id, err = helpers.get_other_storage_bucket_id(g.cluster, bucket_id)
+    t.assert(other_bucket_id ~= nil, err)
+
+    helpers.insert_objects(g, 'coord', {
+        { x = 0, y = 0, bucket_id = bucket_id },       -- 1
+        { x = 0, y = 1, bucket_id = other_bucket_id }, -- 2
+        { x = 0, y = 2, bucket_id = bucket_id },       -- 3
+        { x = 1, y = 3, bucket_id = other_bucket_id }, -- 4
+        { x = 1, y = 4, bucket_id = bucket_id },       -- 5
+    })
+
+    local conditions = {{'=', 'primary', 0}}
+    local result, err = g.cluster.main_server.net_box:call('crud.count', {'coord', conditions})
+    t.assert_equals(err, nil)
+    t.assert_equals(result, 3)
+
+    local conditions = {{'=', 'primary', {0, 2}}}
+    local result, err = g.cluster.main_server.net_box:call('crud.count', {'coord', conditions})
+    t.assert_equals(err, nil)
+    t.assert_equals(result, 1)
+end