fix

Signed-off-by: Ping Yu <yuping@pingcap.com>
tikv · Dec 31, 2023 · 63fc1b3 · 63fc1b3
1 parent 6912e0a
commit 63fc1b3
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 32 deletions.
diff --git a/cdc/cdc/model/sink.go b/cdc/cdc/model/sink.go
@@ -13,7 +13,7 @@
 
 package model
 
-// go:generate msgp
+//go:generate msgp
 
 // MqMessageType is the type of message
 type MqMessageType int

diff --git a/cdc/cdc/model/sink_gen.go b/cdc/cdc/model/sink_gen.go
diff --git a/cdc/cdc/model/sink_gen_test.go b/cdc/cdc/model/sink_gen_test.go
diff --git a/cdc/cdc/sink/codec/codec_test.go b/cdc/cdc/sink/codec/codec_test.go
@@ -14,8 +14,6 @@
 package codec
 
 import (
-	"bytes"
-	"compress/zlib"
 	"testing"
 
 	"github.com/pingcap/check"
@@ -97,26 +95,26 @@ var _ = check.Suite(&codecTestSuite{})
 
 type codecTestSuite struct{}
 
-func (s *codecTestSuite) checkCompressedSize(messages []*MQMessage) (int, int) {
-	var buff bytes.Buffer
-	writer := zlib.NewWriter(&buff)
-	originalSize := 0
-	for _, message := range messages {
-		originalSize += len(message.Key) + len(message.Value)
-		if len(message.Key) > 0 {
-			_, _ = writer.Write(message.Key)
-		}
-		_, _ = writer.Write(message.Value)
-	}
-	writer.Close()
-	return originalSize, buff.Len()
-}
+// func (s *codecTestSuite) checkCompressedSize(messages []*MQMessage) (int, int) {
+// 	var buff bytes.Buffer
+// 	writer := zlib.NewWriter(&buff)
+// 	originalSize := 0
+// 	for _, message := range messages {
+// 		originalSize += len(message.Key) + len(message.Value)
+// 		if len(message.Key) > 0 {
+// 			_, _ = writer.Write(message.Key)
+// 		}
+// 		_, _ = writer.Write(message.Value)
+// 	}
+// 	writer.Close()
+// 	return originalSize, buff.Len()
+// }
 
-func (s *codecTestSuite) encodeKvCase(c *check.C, encoder EventBatchEncoder, events []*model.RawKVEntry) []*MQMessage {
-	msg, err := codecEncodeKvCase(encoder, events)
-	c.Assert(err, check.IsNil)
-	return msg
-}
+// func (s *codecTestSuite) encodeKvCase(c *check.C, encoder EventBatchEncoder, events []*model.RawKVEntry) []*MQMessage {
+// 	msg, err := codecEncodeKvCase(encoder, events)
+// 	c.Assert(err, check.IsNil)
+// 	return msg
+// }
 
 // func (s *codecTestSuite) TestJsonVsCraftVsPB(c *check.C) {
 // 	defer testleak.AfterTest(c)()
@@ -335,17 +333,17 @@ func BenchmarkJsonEncoding(b *testing.B) {
 func BenchmarkJsonDecoding(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		for _, message := range codecJSONEncodedKvChanges {
-			if decoder, err := NewJSONEventBatchDecoder(message.Key, message.Value); err != nil {
+			decoder, err := NewJSONEventBatchDecoder(message.Key, message.Value)
+			if err != nil {
 				panic(err)
-			} else {
-				for {
-					if _, hasNext, err := decoder.HasNext(); err != nil {
-						panic(err)
-					} else if hasNext {
-						_, _ = decoder.NextChangedEvent()
-					} else {
-						break
-					}
+			}
+			for {
+				if _, hasNext, err := decoder.HasNext(); err != nil {
+					panic(err)
+				} else if hasNext {
+					_, _ = decoder.NextChangedEvent()
+				} else {
+					break
 				}
 			}
 		}