updated

Author: ermyar

example_test.go

@@ -1291,6 +1291,7 @@ func ExampleConnection_Do_failure() {
 
 	// We got a future, the request actually not performed yet.
 	future := conn.Do(req)
+	defer future.Release()
 
 	// When the future receives the response, the result of the Future is set
 	// and becomes available. We could wait for that moment with Future.Get(),
@@ -1305,7 +1306,7 @@ func ExampleConnection_Do_failure() {
 		fmt.Printf("Response error: %s\n", resp.Header().Error)
 	}
 
-	data, err := future.Get()
+	data, err := future.GetResult()
 	if err != nil {
 		fmt.Printf("Data: %v\n", data)
 	}

future.go

@@ -109,6 +109,14 @@ func (fut *Future) Get() ([]interface{}, error) {
 	return fut.resp.Decode()
 }
 
+func (fut *Future) GetResult() ([]interface{}, error) {
+	fut.wait()
+	if fut.err != nil {
+		return nil, fut.err
+	}
+	return fut.resp.Decode()
+}
+
 // GetTyped waits for Future and calls msgpack.Decoder.Decode(result) if no error happens.
 // It is could be much faster than Get() function.
 //
@@ -122,6 +130,14 @@ func (fut *Future) GetTyped(result interface{}) error {
 	return fut.resp.DecodeTyped(result)
 }
 
+func (fut *Future) GetTypedResult(result interface{}) error {
+	fut.wait()
+	if fut.err != nil {
+		return fut.err
+	}
+	return fut.resp.DecodeTyped(result)
+}
+
 var closedChan = make(chan struct{})
 
 func init() {

response.go

@@ -64,12 +64,13 @@ func createBaseResponse(header Header, body io.Reader) (*baseResponse, error) {
 func (resp *baseResponse) clear() *[]byte {
 	resp.header.RequestId, resp.header.Error = 0, 0
 	resp.data = nil
-	resp.buf.b = resp.buf.b[:0]
+	ptr := resp.buf.b
+	resp.buf.b = nil
 	resp.buf.p = 0
 	resp.decoded = false
 	resp.decodedTyped = false
 	resp.err = nil
-	return &resp.buf.b
+	return &ptr
 }
 
 func (resp *baseResponse) Release() *[]byte {
@@ -719,7 +720,7 @@ func createSelectResponse(header Header, body io.Reader) (*SelectResponse, error
 
 func (resp *SelectResponse) Release() *[]byte {
 	ptr := resp.baseResponse.clear()
-	resp.pos = resp.pos[:0]
+	resp.pos = nil
 
 	selectResponsePool.Put(resp)
 	return ptr

tarantool_test.go

@@ -529,6 +529,7 @@ func TestFutureMultipleGetGetTyped(t *testing.T) {
 	defer conn.Close()
 
 	fut := conn.Call17Async("simple_concat", []interface{}{"1"})
+	defer fut.Release()
 
 	for i := 0; i < 30; i++ {
 		// [0, 10) fut.Get()
@@ -540,7 +541,7 @@ func TestFutureMultipleGetGetTyped(t *testing.T) {
 		}
 
 		if get {
-			data, err := fut.Get()
+			data, err := fut.GetResult()
 			if err != nil {
 				t.Errorf("Failed to call Get(): %s", err)
 			}
@@ -551,7 +552,7 @@ func TestFutureMultipleGetGetTyped(t *testing.T) {
 			tpl := struct {
 				Val string
 			}{}
-			err := fut.GetTyped(&tpl)
+			err := fut.GetTypedResult(&tpl)
 			if err != nil {
 				t.Errorf("Failed to call GetTyped(): %s", err)
 			}
@@ -567,9 +568,10 @@ func TestFutureMultipleGetWithError(t *testing.T) {
 	defer conn.Close()
 
 	fut := conn.Call17Async("non_exist", []interface{}{"1"})
+	defer fut.Release()
 
 	for i := 0; i < 2; i++ {
-		if _, err := fut.Get(); err == nil {
+		if _, err := fut.GetResult(); err == nil {
 			t.Fatalf("An error expected")
 		}
 	}
@@ -580,6 +582,7 @@ func TestFutureMultipleGetTypedWithError(t *testing.T) {
 	defer conn.Close()
 
 	fut := conn.Call17Async("simple_concat", []interface{}{"1"})
+	defer fut.Release()
 
 	wrongTpl := struct {
 		Val int
@@ -588,10 +591,10 @@ func TestFutureMultipleGetTypedWithError(t *testing.T) {
 		Val string
 	}{}
 
-	if err := fut.GetTyped(&wrongTpl); err == nil {
+	if err := fut.GetTypedResult(&wrongTpl); err == nil {
 		t.Fatalf("An error expected")
 	}
-	if err := fut.GetTyped(&goodTpl); err != nil {
+	if err := fut.GetTypedResult(&goodTpl); err != nil {
 		t.Fatalf("Unexpected error: %s", err)
 	}
 	if goodTpl.Val != "11" {