feat: grid buffer tests

Author: jayantxie

protocol/thrift/gridbuf.go

@@ -32,7 +32,7 @@ func (p GridBufferProtocol) Skip(b *gridbuf.ReadBuffer, t TType, unknownFields [
 	return p.skipType(b, t, defaultRecursionDepth, unknownFields, receiveUnknownFields)
 }
 
-func (p GridBufferProtocol) skipType(b *gridbuf.ReadBuffer, t TType, maxdepth int, unknownFields []byte, receiveUnknownFields bool, ) ([]byte, error) {
+func (p GridBufferProtocol) skipType(b *gridbuf.ReadBuffer, t TType, maxdepth int, unknownFields []byte, receiveUnknownFields bool) ([]byte, error) {
 	if maxdepth == 0 {
 		return unknownFields, errDepthLimitExceeded
 	}

protocol/thrift/gridbuf_test.go

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2025 CloudWeGo Authors
+ *
+ * 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.
+ */
+
 package thrift
 
 import (
@@ -63,52 +79,64 @@ func TestGridBufferSkip(t *testing.T) {
 	b = Binary.AppendI32(b, 1)
 	b = Binary.AppendFieldStop(b)
 
-	gbuf := gridbuf.NewReadBuffer([][]byte{b})
+	tf := func(gbuf *gridbuf.ReadBuffer) {
+		var ufs []byte
 
-	var ufs []byte
+		ufs, err := GridBuffer.Skip(gbuf, BYTE, ufs, true)
+		require.NoError(t, err)
 
-	ufs, err := GridBuffer.Skip(gbuf, BYTE, ufs, true)
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, STRING, ufs, true)
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, STRING, ufs, true)
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, LIST, ufs, true) // list<i32>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, LIST, ufs, true) // list<i32>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, LIST, ufs, true) // list<string>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, LIST, ufs, true) // list<string>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, LIST, ufs, true) // list<list<i32>>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, LIST, ufs, true) // list<list<i32>>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<i32, i64>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<i32, i64>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<i32, string>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<i32, string>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<string, i64>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<string, i64>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<i32, list<i32>>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<i32, list<i32>>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<list<i32>, i32>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, MAP, ufs, true) // map<list<i32>, i32>
-	require.NoError(t, err)
+		ufs, err = GridBuffer.Skip(gbuf, STRUCT, ufs, true) // struct i32, list<i32>
+		require.NoError(t, err)
 
-	ufs, err = GridBuffer.Skip(gbuf, STRUCT, ufs, true) // struct i32, list<i32>
-	require.NoError(t, err)
+		require.Equal(t, b, ufs)
+	}
 
-	require.Equal(t, b, ufs)
+	// test split bytes
+	var nbuf [][]byte
+	for _, byt := range b {
+		nbuf = append(nbuf, []byte{byt})
+	}
+	gbuf := gridbuf.NewReadBuffer(nbuf)
+	tf(gbuf)
+
+	// test merge bytes
+	gbuf = gridbuf.NewReadBuffer([][]byte{b})
+	tf(gbuf)
 
 	// errDepthLimitExceeded
 	b = b[:0]
 	for i := 0; i < defaultRecursionDepth+1; i++ {
 		b = Binary.AppendFieldBegin(b, STRUCT, 1)
 	}
 	gbuf = gridbuf.NewReadBuffer([][]byte{b})
-	_, err = GridBuffer.Skip(gbuf, STRUCT, nil, false)
+	_, err := GridBuffer.Skip(gbuf, STRUCT, nil, false)
 	require.Same(t, errDepthLimitExceeded, err)
 
 	// unknown type