Merge pull request #626 from cloudwego/hotfix/revert_go_16_api

hotfix: revert golang 1.16 api for compatibility with lower go version

Author: YangruiEmma

.github/workflows/tests.yml

@@ -6,7 +6,7 @@ jobs:
   unit-benchmark-test:
     strategy:
       matrix:
-        go: [ 1.17, 1.18, 1.19 ]
+        go: [ 1.15, 1.17, 1.18, 1.19 ]
         os: [ X64, ARM64 ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -34,7 +34,7 @@ jobs:
   scenario-test:
     strategy:
       matrix:
-        go: [ 1.17, 1.18 ]
+        go: [ 1.15, 1.18 ]
     runs-on: [ self-hosted, X64 ]
     steps:
       - uses: actions/checkout@v3

.licenserc.yaml

@@ -4,11 +4,14 @@ header:
     copyright-owner: CloudWeGo Authors
 
   paths:
-    - '**/*.go'
-    - '**/*.s'
+    - "**/*.go"
+    - "**/*.s"
 
   paths-ignore:
     - internal/mocks/thrift/test.go
+    - pkg/remote/codec/thrift/thrift_frugal.go
+    - pkg/remote/codec/thrift/thrift_frugal_test.go
+    - pkg/remote/codec/thrift/thrift_others.go
     - pkg/remote/trans/nphttp2/codes/codes.go
     - pkg/remote/trans/nphttp2/grpc/grpcframe/
     - pkg/remote/trans/nphttp2/grpc/bdp_estimator.go

go.mod

@@ -1,6 +1,6 @@
 module github.com/cloudwego/kitex
 
-go 1.16
+go 1.13
 
 require (
 	github.com/apache/thrift v0.13.0
@@ -9,7 +9,7 @@ require (
 	github.com/cloudwego/fastpb v0.0.2
 	github.com/cloudwego/frugal v0.1.3
 	github.com/cloudwego/netpoll v0.2.6
-	github.com/cloudwego/thriftgo v0.2.0
+	github.com/cloudwego/thriftgo v0.2.1
 	github.com/golang/mock v1.6.0
 	github.com/jhump/protoreflect v1.8.2
 	github.com/json-iterator/go v1.1.12

go.sum

@@ -23,8 +23,8 @@ github.com/cloudwego/netpoll v0.2.4/go.mod h1:1T2WVuQ+MQw6h6DpE45MohSvDTKdy2DlzC
 github.com/cloudwego/netpoll v0.2.6 h1:vzN8cyayoa9RdCOG87tqkYO/j2hA4SMLC+vkcNUq6uI=
 github.com/cloudwego/netpoll v0.2.6/go.mod h1:1T2WVuQ+MQw6h6DpE45MohSvDTKdy2DlzCx2KsnPI4E=
 github.com/cloudwego/thriftgo v0.1.2/go.mod h1:LzeafuLSiHA9JTiWC8TIMIq64iadeObgRUhmVG1OC/w=
-github.com/cloudwego/thriftgo v0.2.0 h1:gDNxU1CmNkwwe/I9UfuCTIc1DXu5FVFa2cMWwT61e50=
-github.com/cloudwego/thriftgo v0.2.0/go.mod h1:aZxiVX7KJdonZwwnapZEMDAAGUGk9WCIkNU3YoVjbpg=
+github.com/cloudwego/thriftgo v0.2.1 h1:pKEZDDND14+kG4ILPCq0sqv3gidjxOnf/wLjOwxzBks=
+github.com/cloudwego/thriftgo v0.2.1/go.mod h1:8i9AF5uDdWHGqzUhXDlubCjx4MEfKvWXGQlMWyR0tM4=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

pkg/generic/httppbthrift_codec.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"strings"
 	"sync/atomic"
@@ -168,7 +169,7 @@ func FromHTTPPbRequest(req *http.Request) (*HTTPRequest, error) {
 		// body == nil if from Get request
 		return customReq, nil
 	}
-	if customReq.RawBody, err = io.ReadAll(b); err != nil {
+	if customReq.RawBody, err = ioutil.ReadAll(b); err != nil {
 		return nil, err
 	}
 	if len(customReq.RawBody) == 0 {

pkg/generic/httpthrift_codec.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"sync/atomic"
 
@@ -154,7 +155,7 @@ func FromHTTPRequest(req *http.Request) (*HTTPRequest, error) {
 		// body == nil if from Get request
 		return customReq, nil
 	}
-	if customReq.RawBody, err = io.ReadAll(b); err != nil {
+	if customReq.RawBody, err = ioutil.ReadAll(b); err != nil {
 		return nil, err
 	}
 	if len(customReq.RawBody) == 0 {

pkg/remote/codec/thrift/thrift.go

@@ -172,7 +172,7 @@ func (c thriftCodec) Unmarshal(ctx context.Context, message remote.Message, in r
 	data := message.Data()
 
 	// decode with hyper unmarshal
-	if c.hyperMarshalEnabled() && hyperMessageUnmarshalAvailable(data, message) {
+	if c.hyperMessageUnmarshalEnabled() && hyperMessageUnmarshalAvailable(data, message) {
 		msgBeginLen := bthrift.Binary.MessageBeginLength(methodName, msgType, seqID)
 		ri := message.RPCInfo()
 		internal_stats.Record(ctx, ri, stats.WaitReadStart, nil)

pkg/remote/codec/thrift/thrift_frugal.go

@@ -1,5 +1,5 @@
-//go:build amd64 && !windows
-// +build amd64,!windows
+//go:build amd64 && !windows && !go1.13 && !go.14
+// +build amd64,!windows,!go1.13,!go.14
 
 /*
  * Copyright 2021 CloudWeGo Authors

pkg/remote/codec/thrift/thrift_frugal_test.go

@@ -1,5 +1,5 @@
-//go:build amd64 && !windows
-// +build amd64,!windows
+//go:build amd64 && !windows && !go1.13 && !go.14
+// +build amd64,!windows,!go1.13,!go.14
 
 // Copyright 2022 ByteDance Inc.
 //

pkg/remote/codec/thrift/thrift_others.go

@@ -1,5 +1,5 @@
-//go:build !amd64 || windows
-// +build !amd64 windows
+//go:build !amd64 || windows || go1.13 || go1.14
+// +build !amd64 windows go1.13 go1.14
 
 /*
  * Copyright 2021 CloudWeGo Authors