commit 0224a6b205ad9aaa395148c5bc58ead31de0ecc3
author duhenglucky <duheng0522@gmail.com> Sun Oct 13 21:30:19 2019 +0800
committer duhenglucky <duheng0522@gmail.com> Sun Oct 13 21:30:19 2019 +0800
tree 62d63e116c27bc116aa61d33d03b5ca6ad12317d
parent 0f58c739e8c076b145095d3dff01989d26c0fefd

feat(producer) remove batch message logic

src/PythonWrapper.cpp

diff --git a/src/PythonWrapper.cpp b/src/PythonWrapper.cpp
index af80175..2783015 100644
--- a/src/PythonWrapper.cpp
+++ b/src/PythonWrapper.cpp
@@ -17,7 +17,6 @@
 #include "CCommon.h"
 #include "CMessage.h"
 #include "CMessageExt.h"
-#include "CBatchMessage.h"
 #include "CSendResult.h"
 #include "CProducer.h"
 #include "CPushConsumer.h"
@@ -98,18 +97,6 @@
     return SetDelayTimeLevel((CMessage *) msg, level);
 }
 
-//batch message
-void *PyCreateBatchMessage() {
-    return (void *) CreateBatchMessage();
-}
-
-int PyAddMessage(void *batchMsg, void *msg) {
-    return AddMessage((CBatchMessage *) batchMsg, (CMessage *) msg);
-}
-
-int PyDestroyBatchMessage(void *batchMsg) {
-    return DestroyBatchMessage((CBatchMessage *) batchMsg);
-}
 
 //messageExt
 const char *PyGetMessageTopic(PyMessageExt msgExt) {
@@ -250,17 +237,6 @@
                      (void *) pyCallback);
 }
 
-PySendResult PySendBatchMessage(void *producer, void *batchMessage) {
-    PySendResult ret;
-    CSendResult result;
-    SendBatchMessage((CProducer *) producer, (CBatchMessage *) batchMessage, &result);
-    ret.sendStatus = result.sendStatus;
-    ret.offset = result.offset;
-    strncpy(ret.msgId, result.msgId, MAX_MESSAGE_ID_LENGTH - 1);
-    ret.msgId[MAX_MESSAGE_ID_LENGTH - 1] = 0;
-    return ret;
-}
-
 
 PySendResult PySendMessageOrderly(void *producer, void *msg, int autoRetryTimes, void *args, PyObject *queueSelector) {
     PySendResult ret;
@@ -488,11 +464,6 @@
     def("SetMessageProperty", PySetMessageProperty);
     def("SetDelayTimeLevel", PySetMessageDelayTimeLevel);
 
-    //For batch message
-    def("CreateBatchMessage", PyCreateBatchMessage, return_value_policy<return_opaque_pointer>());
-    def("AddMessage", PyAddMessage);
-    def("DestroyBatchMessage", PyDestroyBatchMessage);
-
     //For MessageExt
     def("GetMessageTopic", PyGetMessageTopic);
     def("GetMessageTags", PyGetMessageTags);
@@ -522,7 +493,6 @@
 
     def("SendMessageSync", PySendMessageSync);
     def("SendMessageAsync", PySendMessageAsync);
-    def("SendBatchMessage", PySendBatchMessage);
 
     def("SendMessageOneway", PySendMessageOneway);
     def("SendMessageOrderly", PySendMessageOrderly);

src/PythonWrapper.h

diff --git a/src/PythonWrapper.h b/src/PythonWrapper.h
index 8e8e27d..732320b 100644
--- a/src/PythonWrapper.h
+++ b/src/PythonWrapper.h
@@ -18,7 +18,6 @@
 #include "CCommon.h"
 #include "CMessage.h"
 #include "CMessageExt.h"
-#include "CBatchMessage.h"
 #include "CSendResult.h"
 #include "CProducer.h"
 #include "CPushConsumer.h"
@@ -91,11 +90,6 @@
 int PySetMessageProperty(void *msg, const char *key, const char *value);
 int PySetMessageDelayTimeLevel(void *msg, int level);
 
-//batch message
-void *PyCreateBatchMessage();
-int PyAddMessage(void *batchMsg, void *msg);
-int PyDestroyBatchMessage(void *batchMsg);
-
 //messageExt
 const char *PyGetMessageTopic(PyMessageExt msgExt);
 const char *PyGetMessageTags(PyMessageExt msgExt);
@@ -132,7 +126,6 @@
 void PySendExceptionCallback(CMQException e, CMessage *msg, void *pyCallback);
 int PySendMessageAsync(void *producer, void *msg, PyObject *sendSuccessCallback, PyObject *sendExceptionCallback);
 
-PySendResult PySendBatchMessage(void *producer, void *msg);
 PySendResult PySendMessageOrderly(void *producer, void *msg, int autoRetryTimes, void *args, PyObject *queueSelector);
 PySendResult PySendMessageOrderlyByShardingKey(void *producer, void *msg, const char *shardingKey);
 PySendResult PySendMessageInTransaction(void *producer , void *msg, PyObject *localTransactionExecuteCallback , void *args);