-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support new muilti pop commands (#2051)
* Support new muilti pop commands * remove .only * clean code * fix for 4558ec6 * fix tests Co-authored-by: leibale <leibale1998@gmail.com>
- Loading branch information
1 parent
0f7ae93
commit b1a0b48
Showing
15 changed files
with
298 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { strict as assert } from 'assert'; | ||
import testUtils, { GLOBAL } from '../test-utils'; | ||
import { transformArguments } from './BLMPOP'; | ||
|
||
describe('BLMPOP', () => { | ||
testUtils.isVersionGreaterThanHook([7, 0]); | ||
|
||
describe('transformArguments', () => { | ||
it('simple', () => { | ||
assert.deepEqual( | ||
transformArguments(0, 'key', 'LEFT'), | ||
['BLMPOP', '0', '1', 'key', 'LEFT'] | ||
); | ||
}); | ||
|
||
it('with COUNT', () => { | ||
assert.deepEqual( | ||
transformArguments(0, 'key', 'LEFT', { | ||
COUNT: 2 | ||
}), | ||
['BLMPOP', '0', '1', 'key', 'LEFT', 'COUNT', '2'] | ||
); | ||
}); | ||
}); | ||
|
||
testUtils.testWithClient('client.blmPop', async client => { | ||
assert.deepEqual( | ||
await client.blmPop(1, 'key', 'RIGHT'), | ||
null | ||
); | ||
}, GLOBAL.SERVERS.OPEN); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { RedisCommandArgument, RedisCommandArguments } from '.'; | ||
import { transformLMPopArguments, LMPopOptions, ListSide } from './generic-transformers'; | ||
|
||
export const FIRST_KEY_INDEX = 3; | ||
|
||
export function transformArguments( | ||
timeout: number, | ||
keys: RedisCommandArgument | Array<RedisCommandArgument>, | ||
side: ListSide, | ||
options?: LMPopOptions | ||
): RedisCommandArguments { | ||
return transformLMPopArguments( | ||
['BLMPOP', timeout.toString()], | ||
keys, | ||
side, | ||
options | ||
); | ||
} | ||
|
||
export { transformReply } from './LMPOP'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { strict as assert } from 'assert'; | ||
import testUtils, { GLOBAL } from '../test-utils'; | ||
import { transformArguments } from './BZMPOP'; | ||
|
||
describe('BZMPOP', () => { | ||
testUtils.isVersionGreaterThanHook([7, 0]); | ||
|
||
describe('transformArguments', () => { | ||
it('simple', () => { | ||
assert.deepEqual( | ||
transformArguments(0, 'key', 'MIN'), | ||
['BZMPOP', '0', '1', 'key', 'MIN'] | ||
); | ||
}); | ||
|
||
it('with COUNT', () => { | ||
assert.deepEqual( | ||
transformArguments(0, 'key', 'MIN', { | ||
COUNT: 2 | ||
}), | ||
['BZMPOP', '0', '1', 'key', 'MIN', 'COUNT', '2'] | ||
); | ||
}); | ||
}); | ||
|
||
testUtils.testWithClient('client.bzmPop', async client => { | ||
assert.deepEqual( | ||
await client.bzmPop(1, 'key', 'MAX'), | ||
null | ||
); | ||
}, GLOBAL.SERVERS.OPEN); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { RedisCommandArgument, RedisCommandArguments } from '.'; | ||
import { SortedSetSide, transformZMPopArguments, ZMPopOptions } from './generic-transformers'; | ||
|
||
export const FIRST_KEY_INDEX = 3; | ||
|
||
export function transformArguments( | ||
timeout: number, | ||
keys: RedisCommandArgument | Array<RedisCommandArgument>, | ||
side: SortedSetSide, | ||
options?: ZMPopOptions | ||
): RedisCommandArguments { | ||
return transformZMPopArguments( | ||
['BZMPOP', timeout.toString()], | ||
keys, | ||
side, | ||
options | ||
); | ||
} | ||
|
||
export { transformReply } from './ZMPOP'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { strict as assert } from 'assert'; | ||
import testUtils, { GLOBAL } from '../test-utils'; | ||
import { transformArguments } from './LMPOP'; | ||
|
||
describe('LMPOP', () => { | ||
testUtils.isVersionGreaterThanHook([7, 0]); | ||
|
||
describe('transformArguments', () => { | ||
it('simple', () => { | ||
assert.deepEqual( | ||
transformArguments('key', 'LEFT'), | ||
['LMPOP', '1', 'key', 'LEFT'] | ||
); | ||
}); | ||
|
||
it('with COUNT', () => { | ||
assert.deepEqual( | ||
transformArguments('key', 'LEFT', { | ||
COUNT: 2 | ||
}), | ||
['LMPOP', '1', 'key', 'LEFT', 'COUNT', '2'] | ||
); | ||
}); | ||
}); | ||
|
||
testUtils.testWithClient('client.lmPop', async client => { | ||
assert.deepEqual( | ||
await client.lmPop('key', 'RIGHT'), | ||
null | ||
); | ||
}, GLOBAL.SERVERS.OPEN); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import { RedisCommandArgument, RedisCommandArguments } from '.'; | ||
import { transformLMPopArguments, LMPopOptions, ListSide } from './generic-transformers'; | ||
|
||
export const FIRST_KEY_INDEX = 2; | ||
|
||
export function transformArguments( | ||
keys: RedisCommandArgument | Array<RedisCommandArgument>, | ||
side: ListSide, | ||
options?: LMPopOptions | ||
): RedisCommandArguments { | ||
return transformLMPopArguments( | ||
['LMPOP'], | ||
keys, | ||
side, | ||
options | ||
); | ||
} | ||
|
||
export declare function transformReply(): null | [ | ||
key: string, | ||
elements: Array<string> | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { strict as assert } from 'assert'; | ||
import testUtils, { GLOBAL } from '../test-utils'; | ||
import { transformArguments } from './ZMPOP'; | ||
|
||
describe('ZMPOP', () => { | ||
testUtils.isVersionGreaterThanHook([7, 0]); | ||
|
||
describe('transformArguments', () => { | ||
it('simple', () => { | ||
assert.deepEqual( | ||
transformArguments('key', 'MIN'), | ||
['ZMPOP', '1', 'key', 'MIN'] | ||
); | ||
}); | ||
|
||
it('with score and count', () => { | ||
assert.deepEqual( | ||
transformArguments('key', 'MIN', { | ||
COUNT: 2 | ||
}), | ||
['ZMPOP', '1', 'key', 'MIN', 'COUNT', '2'] | ||
); | ||
}); | ||
}); | ||
|
||
testUtils.testWithClient('client.zmPop', async client => { | ||
assert.deepEqual( | ||
await client.zmPop('key', 'MIN'), | ||
null | ||
); | ||
}, GLOBAL.SERVERS.OPEN); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import { RedisCommandArgument, RedisCommandArguments } from '.'; | ||
import { SortedSetSide, transformSortedSetMemberReply, transformZMPopArguments, ZMember, ZMPopOptions } from './generic-transformers'; | ||
|
||
export const FIRST_KEY_INDEX = 2; | ||
|
||
export function transformArguments( | ||
keys: RedisCommandArgument | Array<RedisCommandArgument>, | ||
side: SortedSetSide, | ||
options?: ZMPopOptions | ||
): RedisCommandArguments { | ||
return transformZMPopArguments( | ||
['ZMPOP'], | ||
keys, | ||
side, | ||
options | ||
); | ||
} | ||
|
||
type ZMPopRawReply = null | [ | ||
key: string, | ||
elements: Array<[RedisCommandArgument, RedisCommandArgument]> | ||
]; | ||
|
||
type ZMPopReply = null | { | ||
key: string, | ||
elements: Array<ZMember> | ||
}; | ||
|
||
export function transformReply(reply: ZMPopRawReply): ZMPopReply { | ||
return reply === null ? null : { | ||
key: reply[0], | ||
elements: reply[1].map(transformSortedSetMemberReply) | ||
}; | ||
} |
Oops, something went wrong.