Skip to content

Update for TopK.Add which returns expelled items #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jun 24, 2019
Merged

Update for TopK.Add which returns expelled items #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0634fca
bloom client + tests
ashtul Jun 6, 2019
b0838d7
Some comment
ashtul Jun 6, 2019
cded112
Merge branch 'master' into dev
ashtul Jun 11, 2019
7fa81e7
circleci
ashtul Jun 11, 2019
9d04f22
Merge branch 'dev' of github.com:RedisBloom/rebloom-py into dev
ashtul Jun 11, 2019
0cac4fb
test
ashtul Jun 11, 2019
50207be
.
ashtul Jun 11, 2019
c67d4e8
.
ashtul Jun 11, 2019
0bc9ff0
.
ashtul Jun 11, 2019
8dd061b
.
ashtul Jun 11, 2019
66dfdb3
improve covarge
ashtul Jun 11, 2019
d2c70f3
appenditems
ashtul Jun 11, 2019
c0dde42
check nocreate
ashtul Jun 11, 2019
6842607
README.md
ashtul Jun 13, 2019
348eb80
.
ashtul Jun 13, 2019
46ba7ce
update heavyhitter detection
ashtul Jun 15, 2019
5e7a519
fix for add returns value of dropped
ashtul Jun 20, 2019
dd951d9
Update test_commands.py
ashtul Jun 20, 2019
3969fd0
Update client.py
ashtul Jun 20, 2019
4f8ac00
Merge branch 'master' into dev
ashtul Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions redisbloom/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ def spaceHolder(response):
def parseToList(response):
res = []
for item in response:
res.append(nativestr(item))
if item is not None:
res.append(nativestr(item))
else:
res.append(None)
return res

class Client(Redis): #changed from StrictRedis
Expand Down Expand Up @@ -101,34 +104,35 @@ def __init__(self, *args, **kwargs):
self.BF_RESERVE : bool_ok,
#self.BF_ADD : spaceHolder,
#self.BF_MADD : spaceHolder,
self.BF_INSERT : spaceHolder,
self.BF_EXISTS : spaceHolder,
self.BF_MEXISTS : spaceHolder,
self.BF_SCANDUMP : spaceHolder,
self.BF_LOADCHUNK : spaceHolder,
#self.BF_INSERT : spaceHolder,
#self.BF_EXISTS : spaceHolder,
#self.BF_MEXISTS : spaceHolder,
#self.BF_SCANDUMP : spaceHolder,
#self.BF_LOADCHUNK : spaceHolder,

self.CF_RESERVE : bool_ok,
self.CF_ADD : spaceHolder,
self.CF_ADDNX : spaceHolder,
self.CF_INSERT : spaceHolder,
self.CF_INSERTNX : spaceHolder,
self.CF_EXISTS : spaceHolder,
self.CF_DEL : spaceHolder,
self.CF_COUNT : spaceHolder,
self.CF_SCANDUMP : spaceHolder,
self.CF_LOADDUMP : spaceHolder,
#self.CF_ADD : spaceHolder,
#self.CF_ADDNX : spaceHolder,
#self.CF_INSERT : spaceHolder,
#self.CF_INSERTNX : spaceHolder,
#self.CF_EXISTS : spaceHolder,
#self.CF_DEL : spaceHolder,
#self.CF_COUNT : spaceHolder,
#self.CF_SCANDUMP : spaceHolder,
#self.CF_LOADDUMP : spaceHolder,


self.CMS_INITBYDIM : bool_ok,
self.CMS_INITBYPROB : bool_ok,
self.CMS_INCRBY : bool_ok,
self.CMS_QUERY : spaceHolder,
#self.CMS_QUERY : spaceHolder,
self.CMS_MERGE : bool_ok,
self.CMS_INFO : CMSInfo,

self.TOPK_RESERVE : bool_ok,
self.TOPK_ADD : bool_ok,
self.TOPK_QUERY : spaceHolder,
self.TOPK_COUNT : spaceHolder,
self.TOPK_ADD : parseToList,
#self.TOPK_QUERY : spaceHolder,
#self.TOPK_COUNT : spaceHolder,
self.TOPK_LIST : parseToList,
self.TOPK_INFO : TopKInfo,
}
Expand Down Expand Up @@ -460,10 +464,13 @@ def topkList(self, key):
"""
Return full list of items in Top-K list of ``key```.
"""

return self.execute_command(self.TOPK_LIST, key)

def topkInfo(self, key):
"""
Returns k, width, depth and decay values of ``key``.
"""
return self.execute_command(self.TOPK_INFO, key)

return self.execute_command(self.TOPK_INFO, key)

10 changes: 6 additions & 4 deletions test_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,12 @@ def testCMSMerge(self):
################### Test Top-K ###################
def testTopK(self):
# test list with empty buckets
self.assertTrue(rb.topkReserve('topk', 10, 50, 3, 0.9))
self.assertTrue(rb.topkAdd('topk', 'A', 'B', 'C', 'D', 'E', 'A', 'A', 'B', 'C',
'G', 'D', 'B', 'D', 'A', 'E', 'E'))
self.assertEqual([1, 1, 1, 1, 1, 0, 1],
self.assertTrue(rb.topkReserve('topk', 3, 50, 4, 0.9))
self.assertEqual([None, None, None, None, None, None, None, None,
None, None, None, None, 'C', None, None, None, None],
rb.topkAdd('topk', 'A', 'B', 'C', 'D', 'E', 'A', 'A', 'B', 'C',
'G', 'D', 'B', 'D', 'A', 'E', 'E', 1))
self.assertEqual([1, 1, 0, 1, 0, 0, 0],
rb.topkQuery('topk', 'A', 'B', 'C', 'D', 'E', 'F', 'G'))
self.assertEqual([4, 3, 2, 3, 3, 0, 1],
rb.topkCount('topk', 'A', 'B', 'C', 'D', 'E', 'F', 'G'))
Expand Down