适配最新的tango cache client.HEADmaster

12 files changed, 20 insertions, 7 deletions

diff --git a/src/Makefile b/src/Makefile
index 5ef1901..966fe20 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,7 @@ CFLAGS= -g $(INC_PATH)
 #CFLAGS=-Wall -g $(INC_PATH)
 LDFLAGS = 
 LIBS = ./libs/libtango_cache_client.a ./libs/libcjson.a  ./libs/libcrypto.a  ./libs/libcurl.a  ./libs/libevent.a  ./libs/libhiredis_vip.a  ./libs/libssl.a  ./libs/libxml2.a
-LIBS += -lMESA_handle_logger -lMESA_htable -lMESA_prof_load -lMESA_field_stat2 -lpthread -lwiredcfg -lWiredLB -lrdkafka
+LIBS += -lMESA_handle_logger -lMESA_htable -lMESA_prof_load -lMESA_field_stat2 -lpthread -lwiredcfg -lWiredLB -lrdkafka -lz
 LIBS += -laid2name -lAVLSDK
 
 OBJS = objectscanner_analyze.o objectscanner_kafka.o objectscanner_main.o
@@ -18,7 +18,7 @@ ALL:$(TARGET_EXE)
 
 $(TARGET_EXE):$(OBJS)
 	$(CCC) $(LDFLAGS) $^ -o $@ $(LIBS)
-	cp $@ ../bin/
+#	cp $@ ../bin/
 
 .c.o:
 	$(CCC) $(CFLAGS) -c $<
diff --git a/src/include/cache_evbase_client.h b/src/include/cache_evbase_client.h
index feab191..991015a 100644
--- a/src/include/cache_evbase_client.h
+++ b/src/include/cache_evbase_client.h
@@ -18,7 +18,8 @@ struct cache_evbase_instance
 
 struct cache_evbase_ctx
 {
-	size_t object_size; //tango_ctx�������Ա�޷����ع�����ֱ�ӻ�ȡ�Ļ����ڶ�дһ��������
+	size_t object_size; //tango_ctx�������Ա�޷����ع�����ֱ�ӻ�ȡ�Ļ����ڶ�дһ��������	
+	struct evbuffer *evbuf;
 	struct tango_cache_ctx *ctx;
 	struct tango_losf_meta *losf_meta; //LOSFһ�����ϴ�ʱû��ctx
 	struct cache_evbase_instance *instance_asyn;
@@ -38,6 +39,7 @@ struct tango_cache_parameter *cache_evbase_parameter_new(const char* profile_pat
 
 /*����ʵ�����̰߳�ȫ���ڲ�������һ���߳�*/
 struct cache_evbase_instance *cache_evbase_instance_new(struct tango_cache_parameter *param, void *runtimelog);
+struct event_base *cache_evbase_get_event_base(struct cache_evbase_instance *instance);
 
 /******************************************* GET�ӿ� ****************************************/
 //�ɹ�����0��ʧ�ܷ���-1��future�ص���������������߳���ִ�У���ͬ
diff --git a/src/include/tango_cache_client.h b/src/include/tango_cache_client.h
index 07e43f2..1a3493a 100644
--- a/src/include/tango_cache_client.h
+++ b/src/include/tango_cache_client.h
@@ -26,6 +26,7 @@ enum CACHE_ERR_CODE
 	CACHE_ERR_EVBUFFER     = -112,
 	CACHE_UPDATE_CANCELED  = -113,
 	CACHE_ERR_INSTANCE_ID  = -114,
+	CACHE_ERR_BAD_REQUEST  = -115,
 };
 
 struct cache_statistics
@@ -43,6 +44,8 @@ struct cache_statistics
 	long long put_err_redis; //UPLOAD redisʧ�ܵĴ���
 	long long put_cancel;    //UPLOAD Cancel����
 	long long put_losf_num;  //LOSF�ϲ���ĸ���
+	long long put_multipart; //�����˷ֶ��ϴ��Ķ������
+	long long put_duplicate; //LOSF�ظ���
 	long long del_recv_num;	 //����DELETE�Ĵ���
 	long long del_succ_num;	 //DELETE�ɹ��Ĵ���
 	long long del_error_num; //DELETEʧ�ܵĴ���
@@ -89,18 +92,26 @@ enum OBJECT_LOCATION
 	OBJECT_IN_REDIS
 };
 
+//Range֧��3��: bytes=x-y; bytes=x-; bytes=-y
+struct tango_cache_get_range
+{
+	int64_t start_offset; // -1��ʾ������
+	int64_t end_offset;   // -1��ʾ������
+};
+
 struct tango_cache_meta_get
 {
 	const char* url; //����:URL���ǽṹ����־:�ļ�·������CACHE_OBJECT_KEY_HASH_SWITCH=0ʱ��󳤶�256�ֽڣ�=1ʱ������
 	struct request_freshness get;
+	struct tango_cache_get_range *range; //����ͷRange
 };
 
 //promise_success�Ľ��result
 struct tango_cache_result
 {
 	const char *data_frag; //���typeΪRESULT_TYPE_HEADER��ÿ��ͷ��������һ������(HTTP1.1��ʽ)
-	size_t size;
-	size_t tlength; //������ܳ��ȣ��ص�ʱ����Ч
+	size_t size;   //����Ƭ�εij���
+	size_t tlength;//��������response body���Ƶ��ܳ���(��Range����ͷʱ������Ĵ�С)���ص�ʱ����Ч
 	enum CACHE_RESULT_TYPE type;
 	enum OBJECT_LOCATION location;
 };
@@ -129,7 +140,7 @@ enum PUT_MEMORY_COPY_WAY
 enum EVBUFFER_COPY_WAY
 {
 	EVBUFFER_MOVE=0,//evbuffer_add_buffer
-	EVBUFFER_COPY,  //evbuffer_add_buffer_reference
+	EVBUFFER_COPY,  //evbuffer_add_buffer_reference�����Ƽ�
 };
 
 enum CACHE_HTTP_HDR_TYPE
diff --git a/src/libs/libcjson.a b/src/libs/libcjson.a
index 9a96805..12dfb2e 100644
--- a/src/libs/libcjson.a
+++ b/src/libs/libcjson.a
diff --git a/src/libs/libcrypto.a b/src/libs/libcrypto.a
index fddaa22..9c6df21 100644
--- a/src/libs/libcrypto.a
+++ b/src/libs/libcrypto.a
diff --git a/src/libs/libcurl.a b/src/libs/libcurl.a
index 1d15f69..cfff503 100644
--- a/src/libs/libcurl.a
+++ b/src/libs/libcurl.a
diff --git a/src/libs/libevent.a b/src/libs/libevent.a
index 1d87211..7bc8127 100644
--- a/src/libs/libevent.a
+++ b/src/libs/libevent.a
diff --git a/src/libs/libhiredis_vip.a b/src/libs/libhiredis_vip.a
index ce86d90..6ce82e5 100644
--- a/src/libs/libhiredis_vip.a
+++ b/src/libs/libhiredis_vip.a
diff --git a/src/libs/libssl.a b/src/libs/libssl.a
index a90a427..5d6c238 100644
--- a/src/libs/libssl.a
+++ b/src/libs/libssl.a
diff --git a/src/libs/libtango_cache_client.a b/src/libs/libtango_cache_client.a
index 6454c11..6c118cc 100644
--- a/src/libs/libtango_cache_client.a
+++ b/src/libs/libtango_cache_client.a
diff --git a/src/libs/libxml2.a b/src/libs/libxml2.a
index 915036d..c52156b 100644
--- a/src/libs/libxml2.a
+++ b/src/libs/libxml2.a
diff --git a/src/objectscanner_kafka.cpp b/src/objectscanner_kafka.cpp
index 6b52447..da53d67 100644
--- a/src/objectscanner_kafka.cpp
+++ b/src/objectscanner_kafka.cpp
@@ -107,7 +107,7 @@ int32_t rdkafka_consumer_init(void)
 	/*Topic configuration*/
 	topic_conf = rd_kafka_topic_conf_new();
 	rd_kafka_topic_conf_set(topic_conf, "consume.callback.max.messages", confbuf, errString, 512);
-	rd_kafka_topic_conf_set(topic_conf, "auto.commit.enable", "true", errString, 512);
+	rd_kafka_topic_conf_set(topic_conf, "enable.auto.commit", "true", errString, 512);
 	rd_kafka_topic_conf_set(topic_conf, "auto.offset.reset", "earliest", errString, 512); //RD_KAFKA_OFFSET_STORED��ʼû��offesetʱ
 	if(rd_kafka_topic_conf_set(topic_conf, "offset.store.method", "broker", errString, 512) != RD_KAFKA_CONF_OK)
 	{