WIP on gh-105-unpack-binary: 0f95f28 Skip SQL tests if tarantool version < 2.0.0

1

WIP

Author: DifferentialOrange

tarantool/request.py

@@ -84,9 +84,6 @@ def __init__(self, conn):
         # The option controls whether to pack binary (non-unicode)
         # string values as mp_bin or as mp_str.
         #
-        # The default behaviour of the connector is to pack both
-        # bytes and Unicode strings as mp_str.
-        #
         # msgpack-0.5.0 (and only this version) warns when the
         # option is unset:
         #
@@ -98,7 +95,16 @@ def __init__(self, conn):
         # just always set it for all msgpack versions to get rid
         # of the warning on msgpack-0.5.0 and to keep our
         # behaviour on msgpack-1.0.0.
-        packer_kwargs['use_bin_type'] = False
+        #
+        # Currect default connector behavior is to pack str as mp_str
+        # and to pack bytes as mp_bin and vice versa on unpack if
+        # connection encoding is not None. If encoding is None,
+        # pack bytes as mp_str and unpack mp_str to bytes. mp_bin is
+        # unsupported in this mode.
+        if conn.encoding is None:
+            packer_kwargs['use_bin_type'] = False
+        else:
+            packer_kwargs['use_bin_type'] = True
 
         self.packer = msgpack.Packer(**packer_kwargs)
 

tarantool/utils.py

@@ -43,7 +43,7 @@ def check_key(*args, **kwargs):
         elif args[0] is None and kwargs['select']:
             return []
     for key in args:
-        assert isinstance(key, integer_types + string_types + (float,))
+        assert isinstance(key, integer_types + string_types + binary_types + (float,))
     return list(args)
 
 

test/suites/test_dml.py

@@ -4,10 +4,12 @@
 
 import sys
 import unittest
+
 import tarantool
 
 from .lib.tarantool_server import TarantoolServer
 
+
 class TestSuite_Request(unittest.TestCase):
     @classmethod
     def setUpClass(self):
@@ -17,6 +19,7 @@ def setUpClass(self):
         self.srv.script = 'test/suites/box.lua'
         self.srv.start()
         self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'])
+        self.con_encoding_none = tarantool.Connection(self.srv.host, self.srv.args['primary'], encoding=None)
         self.adm = self.srv.admin
         self.space_created = self.adm("box.schema.create_space('space_1')")
         self.adm("""
@@ -31,17 +34,64 @@ def setUpClass(self):
             parts = {2, 'num', 3, 'str'},
             unique = false})
         """.replace('\n', ' '))
+
         self.space_created = self.adm("box.schema.create_space('space_2')")
         self.adm("""
         box.space['space_2']:create_index('primary', {
             type = 'hash',
             parts = {1, 'num'},
             unique = true})
         """.replace('\n', ' '))
+
+        self.adm("box.schema.create_space('space_str')")
+        self.adm("""
+        box.space['space_str']:create_index('primary', {
+            type = 'tree',
+            parts = {1, 'str'},
+            unique = true})
+        """.replace('\n', ' '))
+
+        self.adm("box.schema.create_space('space_varbin')")
+        self.adm("""
+        box.space['space_varbin']:create_index('primary', {
+            type = 'tree',
+            parts = {1, 'varbinary'},
+            unique = true})
+        """.replace('\n', ' '))
+        self.adm("""
+        buffer = require('buffer')
+        ffi = require('ffi')
+
+        function encode_bin(bytes)
+            local tmpbuf = buffer.ibuf()
+            local p = tmpbuf:alloc(3 + #bytes)
+            p[0] = 0x91
+            p[1] = 0xC4
+            p[2] = #bytes
+            for i, c in pairs(bytes) do
+                p[i + 3 - 1] = c
+            end
+            return tmpbuf
+        end
+
+        function bintuple_insert(space, bytes)
+            local tmpbuf = encode_bin(bytes)
+            ffi.cdef[[
+                int box_insert(uint32_t space_id, const char *tuple, const char *tuple_end, box_tuple_t **result);
+            ]]
+            ffi.C.box_insert(space.id, tmpbuf.rpos, tmpbuf.wpos, nil)
+        end
+        """)
         self.adm("json = require('json')")
         self.adm("fiber = require('fiber')")
         self.adm("uuid = require('uuid')")
 
+    def assertNotRaises(self, func, *args, **kwargs):
+        try:
+            func(*args, **kwargs)
+        except Exception as e:
+            self.fail('Function raised Exception: %s' % repr(e))
+
     def setUp(self):
         # prevent a remote tarantool from clean our session
         if self.srv.is_started():
@@ -55,6 +105,7 @@ def test_00_00_authenticate(self):
         box.schema.user.grant('test', 'execute,read,write', 'universe')
         """))
         self.assertEqual(self.con.authenticate('test', 'test')._data, None)
+        self.assertEqual(self.con_encoding_none.authenticate('test', 'test')._data, None)
 
     def test_00_01_space_created(self):
         # Check that space is created in setUpClass
@@ -299,6 +350,32 @@ def test_12_update_fields(self):
             [[2, 'help', 7]]
         )
 
+    def test_13_00_string_insert_default_behavior(self):
+        self.assertNotRaises(self.con.insert, 'space_str', [ 'test_13_string_insert_default_behavior' ])
+
+    def test_13_01_string_select_default_behavior(self):
+        self.adm(r"box.space['space_str']:insert{'test_14_string_select_default_behavior'}")
+        resp = self.con.select('space_str', ['test_14_string_select_default_behavior'])
+        self.assertIsInstance(resp[0][0], tarantool.utils.string_types)
+
+    def test_13_02_varbinary_insert_default_behavior(self):
+        self.assertNotRaises(self.con.insert, 'space_varbin', [ b'test_15_varbinary_insert_default_behavior' ])
+
+    def test_13_03_varbinary_select_default_behavior(self):
+        self.adm(r"""
+             bintuple_insert(box.space['space_varbin'], {0xDE, 0xAD, 0xBE, 0xAF, 0x16})
+        """)
+        resp = self.con.select('space_varbin', [bytes.fromhex('DEADBEAF16')])
+        self.assertIsInstance(resp[0][0], tarantool.utils.binary_types)
+
+    def test_14_00_string_insert_encoding_none_behavior(self):
+        self.assertNotRaises(self.con_encoding_none.insert, 'space_str', [ bytes.fromhex('DEADBEAF17') ])
+
+    def test_14_01_string_select_encoding_none_behavior(self):
+        self.adm(r"box.space['space_str']:insert{'\xDE\xAD\xBE\xAF\x18'}")
+        resp = self.con_encoding_none.select('space_str', [bytes.fromhex('DEADBEAF18')])
+        self.assertIsInstance(resp[0][0], tarantool.utils.binary_types)
+
     @classmethod
     def tearDownClass(self):
         self.con.close()