Skip to content

Commit 3b8be56

Browse files
isapegoivandasch
andauthored
GG-32679 [IGNITE-14154] Remove unnecessary test, remove duplicates (#23)
Co-authored-by: Ivan Dashchinskiy <ivandasch@gmail.com>
1 parent 71deb00 commit 3b8be56

3 files changed

Lines changed: 5 additions & 32 deletions

File tree

pygridgain/queries/response.py

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class Response:
3030
following = attr.ib(type=list, factory=list)
3131
protocol_version = attr.ib(type=tuple, factory=tuple)
3232
_response_header = None
33+
_response_class_name = 'Response'
3334

3435
def __attrs_post_init__(self):
3536
# replace None with empty list
@@ -88,19 +89,16 @@ def parse(self, stream):
8889
else:
8990
self._parse_success(stream, fields)
9091

91-
response_class = self._create_response_class(stream, header_class, fields)
92-
stream.seek(init_pos + ctypes.sizeof(response_class))
93-
return self._create_response_class(stream, header_class, fields)
94-
95-
def _create_response_class(self, stream, header_class, fields: list):
9692
response_class = type(
97-
'Response',
93+
self._response_class_name,
9894
(header_class,),
9995
{
10096
'_pack_': 1,
10197
'_fields_': fields,
10298
}
10399
)
100+
101+
stream.seek(init_pos + ctypes.sizeof(response_class))
104102
return response_class
105103

106104
def _parse_success(self, stream, fields: list):
@@ -130,6 +128,7 @@ class SQLResponse(Response):
130128
"""
131129
include_field_names = attr.ib(type=bool, default=False)
132130
has_cursor = attr.ib(type=bool, default=False)
131+
_response_class_name = 'SQLResponse'
133132

134133
def fields_or_field_count(self):
135134
if self.include_field_names:
@@ -182,17 +181,6 @@ def _parse_success(self, stream, fields: list):
182181
('more', ctypes.c_byte),
183182
]
184183

185-
def _create_response_class(self, stream, header_class, fields: list):
186-
final_class = type(
187-
'SQLResponse',
188-
(header_class,),
189-
{
190-
'_pack_': 1,
191-
'_fields_': fields,
192-
}
193-
)
194-
return final_class
195-
196184
def to_python(self, ctype_object, *args, **kwargs):
197185
if getattr(ctype_object, 'status_code', 0) == 0:
198186
result = {

tests/config/ignite-config.xml.jinja2

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,6 @@
8080
</bean>
8181
</property>
8282

83-
<property name="cacheConfiguration">
84-
<list>
85-
<bean class="org.apache.ignite.configuration.CacheConfiguration">
86-
<property name="name" value="custom-affinity"/>
87-
<property name="affinity">
88-
<bean class="org.apache.ignite.internal.processors.affinity.LocalAffinityFunction"/>
89-
</property>
90-
</bean>
91-
</list>
92-
</property>
93-
9483
<property name="gridLogger">
9584
<bean class="org.apache.ignite.logger.log4j2.Log4J2Logger">
9685
<constructor-arg type="java.lang.String" value="config/log4j-{{ ignite_instance_idx }}.xml"/>

tests/test_affinity_request_routing.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,6 @@ def test_cache_operation_routed_to_new_cluster_node(request, start_ignite_server
184184
kill_process_tree(srv.pid)
185185

186186

187-
def test_unsupported_affinity_cache_operation_routed_to_random_node(client_partition_aware):
188-
verify_random_node(client_partition_aware.get_cache("custom-affinity"))
189-
190-
191187
def test_replicated_cache_operation_routed_to_random_node(request, client_partition_aware):
192188
cache = client_partition_aware.get_or_create_cache({
193189
PROP_NAME: request.node.name,

0 commit comments

Comments
 (0)