Skip to content

Commit 99fade2

Browse files
chillaqchillaq
committed
polishing
1 parent 26e2b1a commit 99fade2

File tree

2 files changed

+24
-30
lines changed

2 files changed

+24
-30
lines changed

‎splitio/engine/impressions/adapters.py‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
from splitio.storage.adapters.redis import RedisAdapterException
66

77
_LOGGER = logging.getLogger(__name__)
8+
_MTK_QUEUE_KEY = 'SPLITIO.uniquekeys'
9+
_MTK_KEY_DEFAULT_TTL = 3600
10+
_IMP_COUNT_QUEUE_KEY = 'SPLITIO.impressions.count'
11+
_IMP_COUNT_KEY_DEFAULT_TTL = 3600
812

913
class ImpressionsSenderAdapter(object, metaclass=abc.ABCMeta):
1014
"""Impressions Sender Adapter interface."""
@@ -53,11 +57,6 @@ def _uniques_formatter(self, uniques):
5357
class RedisSenderAdapter(ImpressionsSenderAdapter):
5458
"""In Memory Impressions Sender Adapter class."""
5559

56-
MTK_QUEUE_KEY = 'SPLITIO.uniquekeys'
57-
MTK_KEY_DEFAULT_TTL = 3600
58-
IMP_COUNT_QUEUE_KEY = 'SPLITIO.impressions.count'
59-
IMP_COUNT_KEY_DEFAULT_TTL = 3600
60-
6160
def __init__(self, redis_client):
6261
"""
6362
Initialize In memory sender adapter instance
@@ -76,8 +75,8 @@ def record_unique_keys(self, uniques):
7675
"""
7776
bulk_mtks = _uniques_formatter(uniques)
7877
try:
79-
inserted = self._redis_client.rpush(self.MTK_QUEUE_KEY, *bulk_mtks)
80-
self._expire_keys(self.MTK_QUEUE_KEY, self.MTK_KEY_DEFAULT_TTL, inserted, len(bulk_mtks))
78+
inserted = self._redis_client.rpush(_MTK_QUEUE_KEY, *bulk_mtks)
79+
self._expire_keys(_MTK_QUEUE_KEY, _MTK_KEY_DEFAULT_TTL, inserted, len(bulk_mtks))
8180
return True
8281
except RedisAdapterException:
8382
_LOGGER.error('Something went wrong when trying to add mtks to redis')
@@ -96,11 +95,11 @@ def flush_counters(self, to_send):
9695
counted = 0
9796
pipe = self._redis_client.pipeline()
9897
for pf_count in to_send:
99-
pipe.hincrby(self.IMP_COUNT_QUEUE_KEY, pf_count.feature + "::" + str(pf_count.timeframe), pf_count.count)
98+
pipe.hincrby(_IMP_COUNT_QUEUE_KEY, pf_count.feature + "::" + str(pf_count.timeframe), pf_count.count)
10099
counted += pf_count.count
101100
resulted = sum(pipe.execute())
102-
self._expire_keys(self.IMP_COUNT_QUEUE_KEY,
103-
self.IMP_COUNT_KEY_DEFAULT_TTL, resulted, counted)
101+
self._expire_keys(_IMP_COUNT_QUEUE_KEY,
102+
_IMP_COUNT_KEY_DEFAULT_TTL, resulted, counted)
104103
return True
105104
except RedisAdapterException:
106105
_LOGGER.error('Something went wrong when trying to add counters to redis')
@@ -122,11 +121,6 @@ def _expire_keys(self, queue_key, key_default_ttl, total_keys, inserted):
122121
class PluggableSenderAdapter(ImpressionsSenderAdapter):
123122
"""In Memory Impressions Sender Adapter class."""
124123

125-
MTK_QUEUE_KEY = 'SPLITIO.uniquekeys'
126-
MTK_KEY_DEFAULT_TTL = 3600
127-
IMP_COUNT_QUEUE_KEY = 'SPLITIO.impressions.count'
128-
IMP_COUNT_KEY_DEFAULT_TTL = 3600
129-
130124
def __init__(self, adapter_client, prefix=None):
131125
"""
132126
Initialize pluggable sender adapter instance
@@ -148,8 +142,8 @@ def record_unique_keys(self, uniques):
148142
"""
149143
bulk_mtks = _uniques_formatter(uniques)
150144
try:
151-
inserted = self._adapter_client.push_items(self.MTK_QUEUE_KEY, *bulk_mtks)
152-
self._expire_keys(self._prefix + self.MTK_QUEUE_KEY, self.MTK_KEY_DEFAULT_TTL, inserted, len(bulk_mtks))
145+
inserted = self._adapter_client.push_items(_MTK_QUEUE_KEY, *bulk_mtks)
146+
self._expire_keys(self._prefix + _MTK_QUEUE_KEY, _MTK_KEY_DEFAULT_TTL, inserted, len(bulk_mtks))
153147
return True
154148
except RedisAdapterException:
155149
_LOGGER.error('Something went wrong when trying to add mtks to storage adapter')
@@ -166,9 +160,9 @@ def flush_counters(self, to_send):
166160
try:
167161
resulted = 0
168162
for pf_count in to_send:
169-
resulted = self._adapter_client.increment(self._prefix + self.IMP_COUNT_QUEUE_KEY + "." + pf_count.feature + "::" + str(pf_count.timeframe), pf_count.count)
170-
self._expire_keys(self._prefix + self.IMP_COUNT_QUEUE_KEY + "." + pf_count.feature + "::" + str(pf_count.timeframe),
171-
self.IMP_COUNT_KEY_DEFAULT_TTL, resulted, pf_count.count)
163+
key = self._prefix + _IMP_COUNT_QUEUE_KEY + "." + pf_count.feature + "::" + str(pf_count.timeframe)
164+
resulted = self._adapter_client.increment(key, pf_count.count)
165+
self._expire_keys(key, _IMP_COUNT_KEY_DEFAULT_TTL, resulted, pf_count.count)
172166
return True
173167
except RedisAdapterException:
174168
_LOGGER.error('Something went wrong when trying to add counters to storage adapter')

‎tests/engine/test_send_adapters.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ def test_record_unique_keys(self, mocker):
120120
]
121121

122122
sender_adapter.record_unique_keys(uniques)
123-
assert(sorted(json.loads(adapter._keys[sender_adapter.MTK_QUEUE_KEY][0])["ks"]) == sorted(json.loads(formatted[0])["ks"]))
124-
assert(sorted(json.loads(adapter._keys[sender_adapter.MTK_QUEUE_KEY][1])["ks"]) == sorted(json.loads(formatted[1])["ks"]))
125-
assert(json.loads(adapter._keys[sender_adapter.MTK_QUEUE_KEY][0])["f"] == "feature1")
126-
assert(json.loads(adapter._keys[sender_adapter.MTK_QUEUE_KEY][1])["f"] == "feature2")
127-
assert(adapter._expire[sender_adapter.MTK_QUEUE_KEY] == sender_adapter.MTK_KEY_DEFAULT_TTL)
123+
assert(sorted(json.loads(adapter._keys[adapters._MTK_QUEUE_KEY][0])["ks"]) == sorted(json.loads(formatted[0])["ks"]))
124+
assert(sorted(json.loads(adapter._keys[adapters._MTK_QUEUE_KEY][1])["ks"]) == sorted(json.loads(formatted[1])["ks"]))
125+
assert(json.loads(adapter._keys[adapters._MTK_QUEUE_KEY][0])["f"] == "feature1")
126+
assert(json.loads(adapter._keys[adapters._MTK_QUEUE_KEY][1])["f"] == "feature2")
127+
assert(adapter._expire[adapters._MTK_QUEUE_KEY] == adapters._MTK_KEY_DEFAULT_TTL)
128128
sender_adapter.record_unique_keys(uniques)
129-
assert(adapter._expire[sender_adapter.MTK_QUEUE_KEY] != -1)
129+
assert(adapter._expire[adapters._MTK_QUEUE_KEY] != -1)
130130

131131
def test_flush_counters(self, mocker):
132132
"""Test sending counters."""
@@ -139,8 +139,8 @@ def test_flush_counters(self, mocker):
139139
]
140140

141141
sender_adapter.flush_counters(counters)
142-
assert(adapter._keys[sender_adapter.IMP_COUNT_QUEUE_KEY + "." + 'f1::123'] == 2)
143-
assert(adapter._keys[sender_adapter.IMP_COUNT_QUEUE_KEY + "." + 'f2::123'] == 123)
144-
assert(adapter._expire[sender_adapter.IMP_COUNT_QUEUE_KEY + "." + 'f1::123'] == sender_adapter.IMP_COUNT_KEY_DEFAULT_TTL)
142+
assert(adapter._keys[adapters._IMP_COUNT_QUEUE_KEY + "." + 'f1::123'] == 2)
143+
assert(adapter._keys[adapters._IMP_COUNT_QUEUE_KEY + "." + 'f2::123'] == 123)
144+
assert(adapter._expire[adapters._IMP_COUNT_QUEUE_KEY + "." + 'f1::123'] == adapters._IMP_COUNT_KEY_DEFAULT_TTL)
145145
sender_adapter.flush_counters(counters)
146-
assert(adapter._expire[sender_adapter.IMP_COUNT_QUEUE_KEY + "." + 'f2::123'] == sender_adapter.IMP_COUNT_KEY_DEFAULT_TTL)
146+
assert(adapter._expire[adapters._IMP_COUNT_QUEUE_KEY + "." + 'f2::123'] == adapters._IMP_COUNT_KEY_DEFAULT_TTL)

0 commit comments

Comments
 (0)