add primitive thrift and hadoop avro support

dubbo-rpc/dubbo-rpc-avro/pom.xml

@@ -0,0 +1,47 @@
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ -
+ - Licensed 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.alibaba</groupId>
+        <artifactId>dubbo-rpc</artifactId>
+        <version>2.8.4a</version>
+    </parent>
+    <artifactId>dubbo-rpc-avro</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <description>The avro-rpc module of dubbo project</description>
+    <properties>
+        <skip_maven_deploy>true</skip_maven_deploy>
+
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-rpc-api</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro-ipc</artifactId>
+        </dependency>
+    </dependencies>
+</project>

dubbo-rpc/dubbo-rpc-avro/src/main/java/com/alibaba/dubbo/rpc/protocol/avro/AvroProtocol.java

@@ -0,0 +1,69 @@
+package com.alibaba.dubbo.rpc.protocol.avro;
+
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.logger.Logger;
+import com.alibaba.dubbo.common.logger.LoggerFactory;
+import com.alibaba.dubbo.rpc.RpcException;
+import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol;
+import org.apache.avro.ipc.NettyServer;
+import org.apache.avro.ipc.NettyTransceiver;
+import org.apache.avro.ipc.Server;
+import org.apache.avro.ipc.reflect.ReflectRequestor;
+import org.apache.avro.ipc.reflect.ReflectResponder;
+
+import java.net.InetSocketAddress;
+
+/**
+ * 为dubbo-rpc添加"原生thrift"支持
+ * by 杨俊明(http://yjmyzz.cnblogs.com/)
+ */
+public class AvroProtocol extends AbstractProxyProtocol {
+    public static final int DEFAULT_PORT = 40881;
+    private static final Logger logger = LoggerFactory.getLogger(AvroProtocol.class);
+
+    public int getDefaultPort() {
+        return DEFAULT_PORT;
+    }
+
+    @Override
+    protected <T> Runnable doExport(T impl, Class<T> type, URL url)
+            throws RpcException {
+
+        logger.info("impl => " + impl.getClass());
+        logger.info("type => " + type.getName());
+        logger.info("url => " + url);
+
+        final Server server = new NettyServer(new ReflectResponder(type, impl),
+                new InetSocketAddress(url.getHost(), url.getPort()));
+        server.start();
+
+        return new Runnable() {
+            public void run() {
+                try {
+                    logger.info("Close Avro Server");
+                    server.close();
+                } catch (Throwable e) {
+                    logger.warn(e.getMessage(), e);
+                }
+            }
+        };
+    }
+
+    @Override
+    protected <T> T doRefer(Class<T> type, URL url) throws RpcException {
+
+        logger.info("type => " + type.getName());
+        logger.info("url => " + url);
+
+        try {
+            NettyTransceiver client = new NettyTransceiver(new InetSocketAddress(url.getHost(), url.getPort()));
+            T ref = ReflectRequestor.getClient(type, client);
+            logger.info("Create Avro Client");
+            return ref;
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            throw new RpcException("Fail to create remoting client for service(" + url + "): " + e.getMessage(), e);
+        }
+    }
+
+}

dubbo-rpc/dubbo-rpc-avro/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol

@@ -0,0 +1 @@
+avro=com.alibaba.dubbo.rpc.protocol.avro.AvroProtocol

dubbo-rpc/dubbo-rpc-thrift2/pom.xml

@@ -0,0 +1,51 @@
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ -
+ - Licensed 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.alibaba</groupId>
+        <artifactId>dubbo-rpc</artifactId>
+        <version>2.8.4a</version>
+    </parent>
+    <artifactId>dubbo-rpc-thrift2</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <description>The avro-rpc module of dubbo project</description>
+    <properties>
+        <skip_maven_deploy>true</skip_maven_deploy>
+
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-rpc-api</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>0.9.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>

dubbo-rpc/dubbo-rpc-thrift2/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift2/Thrift2Protocol.java

@@ -0,0 +1,132 @@
+package com.alibaba.dubbo.rpc.protocol.thrift2;
+
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.logger.Logger;
+import com.alibaba.dubbo.common.logger.LoggerFactory;
+import com.alibaba.dubbo.rpc.RpcException;
+import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol;
+import org.apache.thrift.TProcessor;
+import org.apache.thrift.protocol.TCompactProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.server.TNonblockingServer;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TNonblockingServerSocket;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * 为dubbo-rpc添加"原生thrift"支持
+ * by 杨俊明(http://yjmyzz.cnblogs.com/)
+ */
+public class Thrift2Protocol extends AbstractProxyProtocol {
+    public static final int DEFAULT_PORT = 33208;
+    private static final Logger logger = LoggerFactory.getLogger(Thrift2Protocol.class);
+
+    public int getDefaultPort() {
+        return DEFAULT_PORT;
+    }
+
+    @Override
+    protected <T> Runnable doExport(T impl, Class<T> type, URL url)
+            throws RpcException {
+
+        logger.info("impl => " + impl.getClass());
+        logger.info("type => " + type.getName());
+        logger.info("url => " + url);
+
+        TProcessor tprocessor;
+        TNonblockingServer.Args tArgs = null;
+        String iFace = "$Iface";
+        String processor = "$Processor";
+        String typeName = type.getName();
+        TNonblockingServerSocket transport;
+        if (typeName.endsWith(iFace)) {
+            String processorClsName = typeName.substring(0, typeName.indexOf(iFace)) + processor;
+            try {
+                Class<?> clazz = Class.forName(processorClsName);
+                Constructor constructor = clazz.getConstructor(type);
+                try {
+                    tprocessor = (TProcessor) constructor.newInstance(impl);
+                    transport = new TNonblockingServerSocket(url.getPort());
+                    tArgs = new TNonblockingServer.Args(transport);
+                    tArgs.processor(tprocessor);
+                    tArgs.transportFactory(new TFramedTransport.Factory());
+                    tArgs.protocolFactory(new TCompactProtocol.Factory());
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                    throw new RpcException("Fail to create thrift server(" + url + ") : " + e.getMessage(), e);
+                }
+            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
+                throw new RpcException("Fail to create thrift server(" + url + ") : " + e.getMessage(), e);
+            }
+        }
+
+        if (tArgs == null) {
+            logger.error("Fail to create thrift server(" + url + ") due to null args");
+            throw new RpcException("Fail to create thrift server(" + url + ") due to null args");
+        }
+        final TServer thriftServer = new TNonblockingServer(tArgs);
+
+        new Thread(new Runnable() {
+            public void run() {
+                logger.info("Start Thrift Server");
+                thriftServer.serve();
+                logger.info("Thrift server started.");
+            }
+        }).start();
+
+        return new Runnable() {
+            public void run() {
+                try {
+                    logger.info("Close Thrift Server");
+                    thriftServer.stop();
+                } catch (Throwable e) {
+                    logger.warn(e.getMessage(), e);
+                }
+            }
+        };
+    }
+
+    @Override
+    protected <T> T doRefer(Class<T> type, URL url) throws RpcException {
+
+        logger.info("type => " + type.getName());
+        logger.info("url => " + url);
+
+        try {
+            TSocket tSocket;
+            TTransport transport;
+            TProtocol protocol;
+            T thriftClient = null;
+            String iFace = "$Iface";
+            String client = "$Client";
+
+            String typeName = type.getName();
+            if (typeName.endsWith(iFace)) {
+                String clientClsName = typeName.substring(0, typeName.indexOf(iFace)) + client;
+                Class<?> clazz = Class.forName(clientClsName);
+                Constructor constructor = clazz.getConstructor(TProtocol.class);
+                try {
+                    tSocket = new TSocket(url.getHost(), url.getPort());
+                    transport = new TFramedTransport(tSocket);
+                    protocol = new TCompactProtocol(transport);
+                    thriftClient = (T) constructor.newInstance(protocol);
+                    transport.open();
+                    logger.info("thrift client opened for service(" + url + ")");
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                    throw new RpcException("Fail to create remoting client:" + e.getMessage(), e);
+                }
+            }
+            return thriftClient;
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            throw new RpcException("Fail to create remoting client for service(" + url + "): " + e.getMessage(), e);
+        }
+    }
+
+}

dubbo-rpc/dubbo-rpc-thrift2/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol

@@ -0,0 +1 @@
+thrift2=com.alibaba.dubbo.rpc.protocol.thrift2.Thrift2Protocol

dubbo-rpc/pom.xml

@@ -30,15 +30,17 @@
 	</properties>
 	<modules>
 		<module>dubbo-rpc-api</module>
+		<module>dubbo-rpc-avro</module>
 		<module>dubbo-rpc-default</module>
 		<module>dubbo-rpc-injvm</module>
 		<module>dubbo-rpc-rmi</module>
 		<module>dubbo-rpc-hessian</module>
 		<module>dubbo-rpc-http</module>
 		<module>dubbo-rpc-webservice</module>
 		<module>dubbo-rpc-thrift</module>
+		<module>dubbo-rpc-thrift2</module>
 		<module>dubbo-rpc-memcached</module>
 		<module>dubbo-rpc-redis</module>
-		<module>dubbo-rpc-rest</module>
+		<module>dubbo-rpc-rest</module>		
 	</modules>
 </project>

pom.xml

@@ -107,6 +107,8 @@
 		<xmemcached_version>1.3.6</xmemcached_version>
 		<cxf_version>2.6.1</cxf_version>
 		<thrift_version>0.8.0</thrift_version>
+		<thrift2_version>0.9.3</thrift2_version>
+		<avro_version>1.8.0</avro_version>
 		<jfreechart_version>1.0.13</jfreechart_version>
 		<hessian_version>4.0.7</hessian_version>
 		<servlet_version>3.1.0</servlet_version>
@@ -185,6 +187,7 @@
 
         <maven-surefire-plugin_version>2.17</maven-surefire-plugin_version>
 		<maven-jetty-plugin_version>8.1.15.v20140411</maven-jetty-plugin_version>
+		<avro_maven_plugin_version>1.8.0</avro_maven_plugin_version>
 
 	</properties>
 	<dependencyManagement>
@@ -296,6 +299,16 @@
 				<artifactId>libthrift</artifactId>
 				<version>${thrift_version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.avro</groupId>
+				<artifactId>avro</artifactId>
+				<version>${avro_version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.avro</groupId>
+				<artifactId>avro-ipc</artifactId>
+				<version>${avro_version}</version>
+			</dependency>
 			<dependency>
 				<groupId>jfree</groupId>
 				<artifactId>jfreechart</artifactId>