You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2021/09/09 10:20:34 UTC

[ignite-python-thin-client] branch pyignite-0.5.2 updated (e080710 -> 3f6734f)

This is an automated email from the ASF dual-hosted git repository.

ivandasch pushed a change to branch pyignite-0.5.2
in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git.


 discard e080710  IGNITE-15479 Fix incorrect partial read from socket in sync client - Fixes #50.
     new 77cc9fc  IGNITE-15266 Fix nested object arrays deserialization - Fixes #48.
     new 3f6734f  IGNITE-15479 Fix incorrect partial read from socket in sync client - Fixes #50.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e080710)
            \
             N -- N -- N   refs/heads/pyignite-0.5.2 (3f6734f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pyignite/utils.py              |  3 ++-
 tests/common/test_datatypes.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

[ignite-python-thin-client] 01/02: IGNITE-15266 Fix nested object arrays deserialization - Fixes #48.

Posted by iv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ivandasch pushed a commit to branch pyignite-0.5.2
in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git

commit 77cc9fc9706ccf312340ee8445e639a164312f87
Author: Bojidar Marinov <bo...@gmail.com>
AuthorDate: Fri Aug 6 13:43:52 2021 +0300

    IGNITE-15266 Fix nested object arrays deserialization - Fixes #48.
    
    Signed-off-by: Ivan Daschinsky <iv...@apache.org>
---
 pyignite/utils.py              |  3 ++-
 tests/common/test_datatypes.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/pyignite/utils.py b/pyignite/utils.py
index 427cceb..5fcbd38 100644
--- a/pyignite/utils.py
+++ b/pyignite/utils.py
@@ -66,7 +66,8 @@ def is_hinted(value):
     """
     Check if a value is a tuple of data item and its type hint.
     """
-    return isinstance(value, tuple) and len(value) == 2 and issubclass(value[1], IgniteDataType)
+    return isinstance(value, tuple) and len(value) == 2 and inspect.isclass(value[1]) and \
+        issubclass(value[1], IgniteDataType)
 
 
 def int_overflow(value: int) -> int:
diff --git a/tests/common/test_datatypes.py b/tests/common/test_datatypes.py
index ebbafb6..3a0ee51 100644
--- a/tests/common/test_datatypes.py
+++ b/tests/common/test_datatypes.py
@@ -166,6 +166,41 @@ async def test_put_get_data_async(async_cache, value, value_hint):
     assert await async_cache.get('my_key') == value
 
 
+nested_array_objects_params = [
+    [
+        (ObjectArrayObject.OBJECT, [
+            ((ObjectArrayObject.OBJECT, [
+                'test', 1, Value(1, 'test'),
+                ((ObjectArrayObject.OBJECT, ['test', 1, Value(1, 'test')]), ObjectArrayObject)
+            ]), ObjectArrayObject)
+        ]),
+        (ObjectArrayObject.OBJECT, [
+            (ObjectArrayObject.OBJECT, ['test', 1, Value(1, 'test'),
+                                        (ObjectArrayObject.OBJECT, ['test', 1, Value(1, 'test')])])
+        ])
+    ],
+]
+
+
+@pytest.mark.parametrize(
+    'hinted_value, value',
+    nested_array_objects_params
+)
+def test_put_get_nested_array_objects(cache, hinted_value, value):
+    cache.put('my_key', hinted_value, value_hint=ObjectArrayObject)
+    assert cache.get('my_key') == value
+
+
+@pytest.mark.parametrize(
+    'hinted_value, value',
+    nested_array_objects_params
+)
+@pytest.mark.asyncio
+async def test_put_get_nested_array_objects_async(async_cache, hinted_value, value):
+    await async_cache.put('my_key', hinted_value, value_hint=ObjectArrayObject)
+    assert await async_cache.get('my_key') == value
+
+
 bytearray_params = [
     ([1, 2, 3, 5], ByteArrayObject),
     ((7, 8, 13, 18), ByteArrayObject),

[ignite-python-thin-client] 02/02: IGNITE-15479 Fix incorrect partial read from socket in sync client - Fixes #50.

Posted by iv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ivandasch pushed a commit to branch pyignite-0.5.2
in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git

commit 3f6734f0ff7497f9192b1ae3b032872b70e57eec
Author: Ivan Daschinsky <iv...@apache.org>
AuthorDate: Thu Sep 9 12:26:25 2021 +0300

    IGNITE-15479 Fix incorrect partial read from socket in sync client - Fixes #50.
---
 pyignite/connection/connection.py | 31 ++++++++++++++---------------
 tests/common/test_sync_socket.py  | 42 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/pyignite/connection/connection.py b/pyignite/connection/connection.py
index 98ba7e0..3d86f01 100644
--- a/pyignite/connection/connection.py
+++ b/pyignite/connection/connection.py
@@ -156,6 +156,9 @@ class BaseConnection:
         return self.client._event_listeners
 
 
+DEFAULT_INITIAL_BUF_SIZE = 1024
+
+
 class Connection(BaseConnection):
     """
     This is a `pyignite` class, that represents a connection to Ignite
@@ -348,15 +351,15 @@ class Connection(BaseConnection):
         if flags is not None:
             kwargs['flags'] = flags
 
-        data = bytearray(1024)
+        data = bytearray(DEFAULT_INITIAL_BUF_SIZE)
         buffer = memoryview(data)
-        bytes_total_received, bytes_to_receive = 0, 0
+        total_rcvd, packet_len = 0, 0
         while True:
             try:
-                bytes_received = self._socket.recv_into(buffer, len(buffer), **kwargs)
-                if bytes_received == 0:
+                bytes_rcvd = self._socket.recv_into(buffer, len(buffer), **kwargs)
+                if bytes_rcvd == 0:
                     raise SocketError('Connection broken.')
-                bytes_total_received += bytes_received
+                total_rcvd += bytes_rcvd
             except connection_errors as e:
                 self.failed = True
                 if reconnect:
@@ -364,23 +367,19 @@ class Connection(BaseConnection):
                     self.reconnect()
                 raise e
 
-            if bytes_total_received < 4:
-                continue
-            elif bytes_to_receive == 0:
-                response_len = int.from_bytes(data[0:4], PROTOCOL_BYTE_ORDER)
-                bytes_to_receive = response_len
-
-                if response_len + 4 > len(data):
+            if packet_len == 0 and total_rcvd > 4:
+                packet_len = int.from_bytes(data[0:4], PROTOCOL_BYTE_ORDER, signed=True) + 4
+                if packet_len > len(data):
                     buffer.release()
-                    data.extend(bytearray(response_len + 4 - len(data)))
-                    buffer = memoryview(data)[bytes_total_received:]
+                    data.extend(bytearray(packet_len - len(data)))
+                    buffer = memoryview(data)[total_rcvd:]
                     continue
 
-            if bytes_total_received >= bytes_to_receive:
+            if 0 < packet_len <= total_rcvd:
                 buffer.release()
                 break
 
-            buffer = buffer[bytes_received:]
+            buffer = buffer[bytes_rcvd:]
 
         return data
 
diff --git a/tests/common/test_sync_socket.py b/tests/common/test_sync_socket.py
new file mode 100644
index 0000000..cd41809
--- /dev/null
+++ b/tests/common/test_sync_socket.py
@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import secrets
+import socket
+import unittest.mock as mock
+
+import pytest
+
+from pyignite import Client
+from tests.util import get_or_create_cache
+
+old_recv_into = socket.socket.recv_into
+
+
+def patched_recv_into_factory(buf_len):
+    def patched_recv_into(self, buffer, nbytes, **kwargs):
+        return old_recv_into(self, buffer, min(nbytes, buf_len) if buf_len else nbytes, **kwargs)
+    return patched_recv_into
+
+
+@pytest.mark.parametrize('buf_len', [0, 1, 4, 16, 32, 64, 128, 256, 512, 1024])
+def test_get_large_value(buf_len):
+    with mock.patch.object(socket.socket, 'recv_into', new=patched_recv_into_factory(buf_len)):
+        c = Client()
+        with c.connect("127.0.0.1", 10801):
+            with get_or_create_cache(c, 'test') as cache:
+                value = secrets.token_hex((1 << 16) + 1)
+                cache.put(1, value)
+                assert value == cache.get(1)