From 5f4833d0dda663e8432c6ed61dae38fa42d52ed9 Mon Sep 17 00:00:00 2001 From: Aleksey Pesternikov Date: Mon, 14 Apr 2014 05:59:39 -0700 Subject: [PATCH] THRIFT-2458 Generated code for oneway function --- compiler/cpp/src/generate/t_go_generator.cc | 41 ++++++---- lib/go/test/Makefile.am | 3 +- lib/go/test/OnewayTest.thrift | 5 ++ lib/go/test/tests/one_way_test.go | 89 +++++++++++++++++++++ 4 files changed, 120 insertions(+), 18 deletions(-) create mode 100644 lib/go/test/OnewayTest.thrift create mode 100644 lib/go/test/tests/one_way_test.go diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc index 0cba09dcf48..4561dcfe918 100644 --- a/compiler/cpp/src/generate/t_go_generator.cc +++ b/compiler/cpp/src/generate/t_go_generator.cc @@ -1707,7 +1707,7 @@ void t_go_generator::generate_service_client(t_service* tservice) f_service_ << indent() << "}" << endl << endl; - if (true) { //!(*f_iter)->is_oneway() || true) {} + if (!(*f_iter)->is_oneway()) { std::string resultname = publicize((*f_iter)->get_name() + "_result",true); // Open function f_service_ << endl << @@ -2354,8 +2354,12 @@ void t_go_generator::generate_process_function(t_service* tservice, indent() << " oprot.Flush()" << endl << indent() << " return" << endl << indent() << "}" << endl << - indent() << "iprot.ReadMessageEnd()" << endl << - indent() << "result := New" << resultname << "()" << endl << + indent() << "iprot.ReadMessageEnd()" << endl; + if (!tfunction->is_oneway()) { + f_service_ << + indent() << "result := New" << resultname << "()" << endl; + } + f_service_ << indent() << "var err2 error" << endl << indent() << "if "; @@ -2414,21 +2418,24 @@ void t_go_generator::generate_process_function(t_service* tservice, f_service_ << indent() << "}" << endl; } - + f_service_ << + indent() << "}" << endl; + if(!tfunction->is_oneway()) { + f_service_ << + indent() << "if err2 = oprot.WriteMessageBegin(\"" << escape_string(tfunction->get_name()) << "\", thrift.REPLY, seqId); err2 != nil {" << endl << + indent() << " err = err2" << endl << + indent() << "}" << endl << + indent() << "if err2 = result.Write(oprot); err == nil && err2 != nil {" << endl << + indent() << " err = err2" << endl << + indent() << "}" << endl << + indent() << "if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {" << endl << + indent() << " err = err2" << endl << + indent() << "}" << endl << + indent() << "if err2 = oprot.Flush(); err == nil && err2 != nil {" << endl << + indent() << " err = err2" << endl << + indent() << "}" << endl; + } f_service_ << - indent() << "}" << endl << - indent() << "if err2 = oprot.WriteMessageBegin(\"" << escape_string(tfunction->get_name()) << "\", thrift.REPLY, seqId); err2 != nil {" << endl << - indent() << " err = err2" << endl << - indent() << "}" << endl << - indent() << "if err2 = result.Write(oprot); err == nil && err2 != nil {" << endl << - indent() << " err = err2" << endl << - indent() << "}" << endl << - indent() << "if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {" << endl << - indent() << " err = err2" << endl << - indent() << "}" << endl << - indent() << "if err2 = oprot.Flush(); err == nil && err2 != nil {" << endl << - indent() << " err = err2" << endl << - indent() << "}" << endl << indent() << "if err != nil {" << endl << indent() << " return" << endl << indent() << "}" << endl << diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am index cb6073c1bcc..046448ce32f 100644 --- a/lib/go/test/Makefile.am +++ b/lib/go/test/Makefile.am @@ -21,11 +21,12 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift -out gopath/src/ --gen go:thrift_impo THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift # Thrift for GO has problems with complex map keys: THRIFT-2063 -gopath: $(top_srcdir)/compiler/cpp/thrift $(THRIFTTEST) IncludesTest.thrift NamespacedTest.thrift +gopath: $(top_srcdir)/compiler/cpp/thrift $(THRIFTTEST) IncludesTest.thrift NamespacedTest.thrift OnewayTest.thrift mkdir -p gopath/src grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift $(THRIFT) -r IncludesTest.thrift $(THRIFT) BinaryKeyTest.thrift + $(THRIFT) OnewayTest.thrift ln -nfs ../../../thrift gopath/src/thrift ln -nfs ../../tests gopath/src/tests touch gopath diff --git a/lib/go/test/OnewayTest.thrift b/lib/go/test/OnewayTest.thrift new file mode 100644 index 00000000000..9ba75253bf7 --- /dev/null +++ b/lib/go/test/OnewayTest.thrift @@ -0,0 +1,5 @@ +service OneWay { + oneway void hi(1: i64 i, 2: string s) + void emptyfunc() + i64 echo_int(1: i64 param) +} diff --git a/lib/go/test/tests/one_way_test.go b/lib/go/test/tests/one_way_test.go new file mode 100644 index 00000000000..5ffbbfe4d7e --- /dev/null +++ b/lib/go/test/tests/one_way_test.go @@ -0,0 +1,89 @@ +/* + * 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. + */ + +package tests + +import ( + "OnewayTest" + "fmt" + "net" + "testing" + "thrift" + "time" +) + +func findPort() net.Addr { + if l, err := net.Listen("tcp", "127.0.0.1:0"); err != nil { + panic("Could not find available server port") + } else { + defer l.Close() + return l.Addr() + } +} + +type impl struct{} + +func (i *impl) Hi(in int64, s string) (err error) { fmt.Println("Hi!"); return } +func (i *impl) Emptyfunc() (err error) { return } +func (i *impl) EchoInt(param int64) (r int64, err error) { return param, nil } + +const TIMEOUT = time.Second + +var addr net.Addr +var server *thrift.TSimpleServer +var client *OnewayTest.OneWayClient + +func TestInitOneway(t *testing.T) { + var err error + addr = findPort() + serverTransport, err := thrift.NewTServerSocketTimeout(addr.String(), TIMEOUT) + if err != nil { + t.Fatal("Unable to create server socket", err) + } + processor := OnewayTest.NewOneWayProcessor(&impl{}) + server = thrift.NewTSimpleServer2(processor, serverTransport) + + go server.Serve() +} + +func TestInitOnewayClient(t *testing.T) { + transport := thrift.NewTSocketFromAddrTimeout(addr, TIMEOUT) + protocol := thrift.NewTBinaryProtocolTransport(transport) + client = OnewayTest.NewOneWayClientProtocol(transport, protocol, protocol) + err := transport.Open() + if err != nil { + t.Fatal("Unable to open client socket", err) + } +} + +func TestCallOnewayServer(t *testing.T) { + //call oneway function + err := client.Hi(1, "") + if err != nil { + t.Fatal("Unexpected error: ", err) + } + //There is no way to detect protocol problems with single oneway call so we call it second time + i, err := client.EchoInt(42) + if err != nil { + t.Fatal("Unexpected error: ", err) + } + if i != 42 { + t.Fatal("Unexpected returned value: ", i) + } +}