Merge pull request #1 from apache/master

merge master from apache

Author: francisoliverlee

CMakeLists.txt

@@ -31,6 +31,13 @@ if (COMMAND cmake_policy)
     cmake_policy(SET CMP0005 NEW)
 endif ()
 
+if (POLICY CMP0048)
+    cmake_policy(SET CMP0048 NEW)
+endif ()
+
+if (POLICY CMP0064)
+    cmake_policy(SET CMP0064 NEW)
+endif ()
 # First, declare project (important for prerequisite checks).
 project(rocketmq-client-python)
 
@@ -56,7 +63,7 @@ if (NOT CMAKE_BUILD_TYPE)
 endif ()
 
 set(CXX_FLAGS
-        #-std=c++0x
+        -std=c++11
         -g
         -Wall
         -Wno-deprecated
@@ -151,7 +158,7 @@ option(Boost_USE_STATIC_LIBS "only find boost static libs" OFF) # find boost lib
 if (WIN32)
     find_package(Boost REQUIRED COMPONENTS python)
 elseif (APPLE)
-    find_package(Boost REQUIRED COMPONENTS python27)
+    find_package(Boost REQUIRED COMPONENTS python)
 else ()
     find_package(Boost REQUIRED COMPONENTS python)
 endif (WIN32)
@@ -196,4 +203,14 @@ set(STDC_HEADERS 1)
 set(TIME_WITH_SYS_TIME 1)
 set(HAVE_SOCKLEN_T 1)
 
+option(TEST "Build test cases" OFF)
+
+if (TEST)
+    enable_testing()
+    option(gtest_build_tests OFF)
+    add_subdirectory(third_party/googletest/googletest)
+    include_directories(SYSTEM ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
+    add_subdirectory(unitests)
+endif ()
+
 add_subdirectory(project)

install_boostpython.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+VERSION=1.58.0
+BOOST=boost_1_58_0
+
+if [ ! -d ${HOME}/${BOOST} ]; then
+    if [ -e ${HOME}/${BOOST}.tar.gz ]; then
+        echo "Find Packge ${HOME}/${BOOST}.tar.gz......."
+    else    
+        wget -O ${HOME}/${BOOST}.tar.gz http://sourceforge.net/projects/boost/files/boost/${VERSION}/${BOOST}.tar.gz
+    fi
+    if [ $? -ne 0 ];then
+        exit 1
+    fi
+    tar -xzf ${HOME}/${BOOST}.tar.gz -C ${HOME}
+    if [ $? -ne 0 ];then
+        exit 1
+    fi
+else
+    echo "Find Boost Source:${HOME}/${BOOST}, Build and install....."
+fi
+
+cd ${HOME}/${BOOST}
+
+./bootstrap.sh --prefix=/usr/local --with-libraries=python
+if [ $? -ne 0 ];then
+    exit 1
+fi
+echo "Install boost static library...."
+sudo   ./bjam cflags="-fPIC" cxxflags="-fPIC -Wno-unused-local-typedefs -Wno-strict-aliasing" link=static \
+       --with-python  \
+       -a install 
+if [ $? -ne 0 ];then
+    exit 1
+fi
+echo "Install boost dynamic library....."
+sudo   ./bjam cflags="-fPIC" cxxflags="-fPIC -Wno-unused-local-typedefs -Wno-strict-aliasing" link=shared \
+       --with-python 
+       -a install 

sample/testProducer.py

@@ -42,6 +42,16 @@ def testSendMssage(producer,topic,key,body):
     DestroyMessage(msg)
     print("Done...............")
 
+def testSendMessageOneway(producer, topic, key, body):
+    print("Starting Sending(Oneway).....")
+    msg = CreateMessage(topic)
+    SetMessageBody(msg, body)
+    SetMessageKeys(msg, key)
+    SetMessageTags(msg, "Send Message Oneway Test.")
+    SendMessageOneway(producer,msg)
+    DestroyMessage(msg)
+    print("Done...............")
+
 def releaseProducer(producer):
     ShutdownProducer(producer)
     DestroyProducer(producer)
@@ -59,4 +69,9 @@ def releaseProducer(producer):
 
     print("Now Send Message:",i)
 
+while i < 10:
+    i += 1
+    testSendMessageOneway(producer, topic, key, body)
+    print("Now Send Message One way:",i)
+
 releaseProducer(producer)

src/PythonWrapper.cpp

@@ -133,6 +133,10 @@ PySendResult PySendMessageSync(void *producer, void *msg) {
     return ret;
 }
 
+int PySendMessageOneway(void *producer, void *msg) {
+    return SendMessageOneway((CProducer *) producer, (CMessage *) msg);
+}
+
 //SendResult
 const char *PyGetSendResultMsgID(CSendResult &sendResult) {
     return (const char *) (sendResult.msgId);
@@ -263,6 +267,7 @@ BOOST_PYTHON_MODULE (librocketmqclientpython) {
     def("SetProducerInstanceName", PySetProducerInstanceName);
     def("SetProducerSessionCredentials", PySetProducerSessionCredentials);
     def("SendMessageSync", PySendMessageSync);
+    def("SendMessageOneway", PySendMessageOneway);
 
     //For Consumer
     def("CreatePushConsumer", PyCreatePushConsumer, return_value_policy<return_opaque_pointer>());

src/PythonWrapper.h

@@ -74,6 +74,7 @@ int PySetProducerNameServerAddress(void *producer, const char *namesrv);
 int PySetProducerInstanceName(void *producer, const char *instanceName);
 int PySetProducerSessionCredentials(void *producer, const char *accessKey, const char *secretKey, const char *channel);
 PySendResult PySendMessageSync(void *producer, void *msg);
+int PySendMessageOneway(void *producer, void *msg);
 
 //sendResult
 const char *PyGetSendResultMsgID(CSendResult &sendResult);

test/TestConsumeMessages.py

@@ -0,0 +1,78 @@
+# /*
+# * Licensed to the Apache Software Foundation (ASF) under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The ASF licenses this file to You under the Apache License, Version 2.0
+# * (the "License"); you may not use this file except in compliance with
+# * the License.  You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+
+import __init__
+from librocketmqclientpython import *
+
+import time
+import sys
+
+topic = 'test'
+name_srv = '127.0.0.1:9876'
+tag = 'rmq-tag'
+consumer_group = 'test-consumer-group'
+totalMsg = 0
+
+
+def sigint_handler(signum, frame):
+    global is_sigint_up
+    is_sigint_up = True
+    sys.exit(0)
+
+
+def consumer_message(msg):
+    global totalMsg
+    totalMsg += 1
+    print 'total count %d' % totalMsg
+    print 'topic=%s' % GetMessageTopic(msg)
+    print 'tag=%s' % GetMessageTags(msg)
+    print 'body=%s' % GetMessageBody(msg)
+    print 'msg id=%s' % GetMessageId(msg)
+
+    print 'map.keys %s' % GetMessageKeys(msg)
+
+    print 'map.name %s' % GetMessageProperty(msg, 'name')
+    print 'map.id %s' % GetMessageProperty(msg, 'id')
+    return 0
+
+
+def init_producer(_group, _topic, _tag):
+    consumer = CreatePushConsumer(_group)
+    SetPushConsumerNameServerAddress(consumer, name_srv)
+    SetPushConsumerThreadCount(consumer, 1)
+    Subscribe(consumer, _topic, _tag)
+    RegisterMessageCallback(consumer, consumerMessage)
+    StartPushConsumer(consumer)
+    print 'consumer is ready...'
+    return consumer
+
+
+def start_one_consumer(_group, _topic, _tag):
+    consumer = init_producer(_group, _topic, _tag)
+    i = 1
+    while i <= 10:
+        print 'clock: ' + str(i)
+        i += 1
+        time.sleep(10)
+
+    ShutdownPushConsumer(consumer)
+    DestroyPushConsumer(consumer)
+    print("Consumer Down....")
+
+
+if __name__ == '__main__':
+    start_one_consumer(consumer_group, topic, '*')