Skip to content
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

Jump to bottom

merge twitter twemproxy master changes #3

Merged
merged 36 commits into from
Oct 29, 2014
Merged

merge twitter twemproxy master changes #3

merged 36 commits into from
Oct 29, 2014

Conversation

andyqzb
Copy link
Owner

@andyqzb andyqzb commented Oct 29, 2014

No description provided.

idning and others added 30 commits July 4, 2014 21:52
@idning
add frag_owner counter
4801705
@idning
After rebase: mget split to many mget and send to backend
9739f3a 
reabse following::

    * 0fd32bb - (HEAD, idning/mget-improve, mget-improve) unchange (10 hours ago) <idning>
    * 705acab - clean code (10 hours ago) <idning>
    * 32e8559 - correct, but not clean. (18 hours ago) <idning>
    * fde1f12 - mget-improve almost done. (2 days ago) <idning>
    * b30fa4f - mget split to many mget and send to backend (3 days ago) <idning>
    * 7cf5625 - add frag_owner counter (4 days ago) <idning>

    * 8a4f5c0 - (origin/master, origin/HEAD, idning/master) Update README.md (12 days ago) <Manju Rajashekhar>
@idning
fix multi DEL, a bug on parse key, and remove assert on conn_sendv
3064dc2
@idning
add benchmark code
9556a70
@idning
MSET/MSETNX support now
50fd57a
@idning
follow the coding style
9eda07d
@idning
enhance error handling on backend down
a909fcd
@idning
fix bug on msg_fragment_argx when key_len=mbuf_size-1
68860c9
@idning
1. get/gets for memcache passed cases
1c92298 
2. fix req_done(nfrag_done) for memcache
@idning
1. do not rewrite the orig mget as a ping msg for redis, and del usel…
d6e2798 
…ess code

2. nfrag_done work for memcache
@idning
MSETNX should not support
cbe547e 
MSETNX Return:

- 1 if the all the keys were set.
- 0 if no key was set (at least one key already existed).
@idning
adjust style
a1ca201
@idning
add msg->fragement handler, main logic of mget-improve is put into pr…
de902c1 
…oto/
@idning
put hash_tag logic into server_pool_idx
2ccd285
@idning
reduce mem usage in fragement
122e9e6
@idning
formating
576ff39
@idning
remove dead code
1f0a133 
remove:
- msg_fragment
- MSG_PARSE_FRAGMENT:
- first_fragment/last_fragment
@idning
error handling on fragment/coalesce
f89c7d9
@idning
remove dead code (pre/post splitcopy)
4a99a4c
@idning
formating & compile warning
79059c7
@idning
modifies base on Manj's review advise.
191cdcf
@idning
use array(keypos) to trace all key positions (start and end) in the m…
da2170f 
…essage struct,

and del key_start/key_end.
@idning
use msg_append to avoid small mbuf fragments
8e719c0
@idning
use ms in _log()
257b564
@idning
Merge pull request #210 from idning/mget-improve
f6cc55b 
MGET improve 

Merge pull request #210 from idning/mget-improve
@idning
add hscan/sscan/zscan cmd, but the rsp parse need upgrade
6e172fc
@idning
handle xscan replay
1e3a5d0
@idning
update comment
efece2e
@idning
Merge pull request #254 from idning/xscan
b72c722 
hscan/sscan/zscan supported
@areina
Add support for SORT command in redis.
a97c8e2
andyqzb added a commit that referenced this pull request Oct 29, 2014
@andyqzb
Merge pull request #3 from twitter/master
49d62f7 
merge twitter twemproxy master changes
@andyqzb andyqzb merged commit 49d62f7 into andyqzb:master Oct 29, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@andyqzb @idning @areina