Commit Graph

59 Commits

Author SHA1 Message Date
lyr90329 09199591ca Merge branch 'Memcached_Client' 2014-08-13 17:57:36 +08:00
lyr90329 4f1b963fcf bug 2014-08-13 17:56:39 +08:00
lyr90329 43b0aa5847 fix bug 2014-08-13 17:51:21 +08:00
lyr90329 4727c2dd9f fix bug in stats 2014-08-13 17:50:01 +08:00
lyr90329 7b5b485200 stats 2014-08-13 17:45:28 +08:00
lyr90329 e2bb71d18c register stats 2014-08-13 17:44:11 +08:00
lyr90329 156ed948b1 add stats message 2014-08-13 17:42:14 +08:00
lyr90329 05a95ad014 Merge branch 'Memcached_Client'
Conflicts:
	MemcachedClient/src/client.xml
	MemcachedClient/src/common/MessageManager.java
	MemcachedClient/src/log4j.properties
	MemcachedClient/src/messageBody/memcachedmsg.java
	MemcachedClient/src/messageBody/requestMsg.java
	MemcachedClient/src/r_memcached/Client.java
	MemcachedClient/src/r_memcached/MClientPipelineFactory.java
	MemcachedClient/src/server/ClientConfig.java
	MemcachedClient/src/server/LockKey.java
	MemcachedClient/src/server/MDecoder.java
	MemcachedClient/src/server/MEncoder.java
	MemcachedClient/src/server/MServerHandler.java
	MemcachedClient/src/server/MServerPipelineFactory.java
	MemcachedClient/src/server/NetMsg.java
	MemcachedClient/src/server/Server.java
	R-Memcached/protobuf/memcached.proto
	R-Memcached/protobuf/requestMsg.proto
	R-Memcached/src/client.xml
	R-Memcached/src/client/Client.java
	R-Memcached/src/client/ClientMgr.java
	R-Memcached/src/client/MClientHandler.java
	R-Memcached/src/client/MClientPipelineFactory.java
	R-Memcached/src/common/EMSGID.java
	R-Memcached/src/common/MessageManager.java
	R-Memcached/src/common/RegisterHandler.java
	R-Memcached/src/config.properties
	R-Memcached/src/log4j.properties
	R-Memcached/src/memcached/ByteBufArrayInputStream.java
	R-Memcached/src/memcached/ContextObjectInputStream.java
	R-Memcached/src/memcached/ErrorHandler.java
	R-Memcached/src/memcached/LineInputStream.java
	R-Memcached/src/memcached/MemcachedClient.java
	R-Memcached/src/memcached/NativeHandler.java
	R-Memcached/src/memcached/NestedIOException.java
	R-Memcached/src/memcached/SockIO.java
	R-Memcached/src/messageBody/memcachedmsg.java
	R-Memcached/src/messageBody/requestMsg.java
	R-Memcached/src/server/ClientConfig.java
	R-Memcached/src/server/LockKey.java
	R-Memcached/src/server/MDecoder.java
	R-Memcached/src/server/MEncoder.java
	R-Memcached/src/server/MServerHandler.java
	R-Memcached/src/server/MServerPipelineFactory.java
	R-Memcached/src/server/MemcachedMain.java
	R-Memcached/src/server/NetMsg.java
	R-Memcached/src/server/Server.java
	R-Memcached/src/server/memSession.java
	R-Memcached/src/test/MainTest.java
	src/client.xml
	src/client/Client.java
	src/client/MClientPipelineFactory.java
	src/common/MessageManager.java
	src/log4j.properties
	src/messageBody/memcachedmsg.java
	src/messageBody/requestMsg.java
	src/server/ClientConfig.java
	src/server/LockKey.java
	src/server/MDecoder.java
	src/server/MEncoder.java
	src/server/MServerHandler.java
	src/server/MServerPipelineFactory.java
	src/server/NetMsg.java
	src/server/Server.java
2014-08-13 16:59:54 +08:00
lyr90329 70ed9ed641 Test Memcached client to R-Memcached 2014-08-13 16:51:10 +08:00
lyr90329 5c35bdd822 handling read and write request 2014-08-13 16:49:42 +08:00
lyr90329 b7cc9cee53 find node 2014-08-13 16:49:03 +08:00
lyr90329 170f8b3edf lock 2014-08-10 11:46:26 +08:00
lyr90329 ac54e51d2a netty server 2014-08-10 11:43:38 +08:00
lyr90329 50857e2988 log 2014-08-10 11:43:16 +08:00
lyr90329 9fa31a189e 2014-08-10 11:42:50 +08:00
lyr90329 2c8ceb2e95 client xml 2014-08-10 11:40:33 +08:00
lyr90329 98567bdc63 client manager 2014-08-10 11:39:03 +08:00
lyr90329 14a2bcf170 init netty client 2014-08-10 11:32:48 +08:00
lyr90329 98c83ea8c5 encoder and decoder in client 2014-08-10 11:30:46 +08:00
lyr90329 c3ed5db164 MessageManager module in client 2014-08-10 11:20:03 +08:00
lyr90329 c72fc7fdc5 enumeration message category in client 2014-08-10 11:18:59 +08:00
lyr90329 508214066f Message in Memcached Client 2014-08-07 18:53:28 +08:00
lyr90329 f0f9797c54 Test New Branch 2014-08-05 16:03:59 +08:00
lyr90329 df1c7460ef move to R-Memcached 2014-08-05 16:03:29 +08:00
lyr90329 448802c7fd change dir 2014-08-05 16:02:50 +08:00
lyr90329 e5425d082d properties 2014-08-05 15:56:21 +08:00
lyr90329 3680c3debc Extract variables which can be configured and fix some bug 2014-08-05 15:52:09 +08:00
lyr90329 d7dc51651c Entrance function 2014-08-05 15:47:10 +08:00
lyr90329 a3dd33dcde fix bug 2014-08-05 15:39:27 +08:00
lyr90329 4d06451a92 write phase two - update 2014-08-05 15:37:29 +08:00
lyr90329 d850d33011 wait for enough replay 2014-08-05 15:36:52 +08:00
lyr90329 8c929769b8 write phase one - Invalidation reply 2014-08-05 15:35:23 +08:00
lyr90329 013f08e7e3 write phase one-Invalidation request 2014-08-05 15:34:48 +08:00
lyr90329 e10f04ca25 handling nm_read 2014-08-05 15:31:56 +08:00
lyr90329 9f62222af4 handling nr_read 2014-08-05 15:30:38 +08:00
lyr90329 c9a13c14a3 handling connect message 2014-08-05 15:28:52 +08:00
lyr90329 7c3ae703bc memSession.java 2014-08-05 15:26:21 +08:00
lyr90329 fed6c97954 LockKey.java 2014-08-05 15:21:10 +08:00
lyr90329 99cad82d68 Cluster Manager 2014-07-31 15:40:48 +08:00
lyr90329 9184844f5b R-Memcached cluster config xml 2014-07-31 15:03:32 +08:00
lyr90329 44cf4e28f0 Netty Client 2014-07-31 14:59:30 +08:00
lyr90329 4026bba33b Netty Server 2014-07-31 14:53:04 +08:00
lyr90329 21b7f5adfe PipelineFactory 2014-07-31 14:51:45 +08:00
lyr90329 67e67c68a7 handling received message 2014-07-29 16:19:00 +08:00
lyr90329 45e68c66e6 Decode stream 2014-07-29 16:18:11 +08:00
lyr90329 2e280386d7 Encode message 2014-07-29 16:17:32 +08:00
lyr90329 4682d2283c Defining Message Wrapper Class 2014-07-28 14:58:31 +08:00
yuanwei 7f46e288ed For message registration. 2014-07-25 10:30:25 +08:00
yuanwei d2d67df06c Create a hashmap and manage different types of messages. 2014-07-25 10:28:57 +08:00
yuanwei c131d241eb Enumerate all types of messages. 2014-07-25 10:25:49 +08:00