fix unit test.

pingcap · Aug 18, 2023 · 6f6aafc · 6f6aafc
1 parent c5ada12
commit 6f6aafc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/cdc/sink/dmlsink/cloudstorage/defragmenter_test.go b/cdc/sink/dmlsink/cloudstorage/defragmenter_test.go
@@ -47,11 +47,12 @@ func TestDeframenter(t *testing.T) {
 		return defrag.run(egCtx)
 	})
 
-	changefeedID := model.DefaultChangeFeedID("changefeed-test")
 	uri := "file:///tmp/test"
 	txnCnt := 50
 	sinkURI, err := url.Parse(uri)
 	require.Nil(t, err)
+
+	changefeedID := model.DefaultChangeFeedID("changefeed-test")
 	encoderConfig, err := util.GetEncoderConfig(changefeedID, sinkURI, config.ProtocolCsv,
 		config.GetDefaultReplicaConfig(), config.DefaultMaxMessageBytes)
 	require.Nil(t, err)

diff --git a/pkg/sink/codec/canal/canal_json_row_event_encoder.go b/pkg/sink/codec/canal/canal_json_row_event_encoder.go
@@ -507,18 +507,13 @@ type jsonRowEventEncoderBuilder struct {
 }
 
 // NewJSONRowEventEncoderBuilder creates a canal-json batchEncoderBuilder.
-func NewJSONRowEventEncoderBuilder(
-	config *common.Config,
-) codec.RowEventEncoderBuilder {
-	return &jsonRowEventEncoderBuilder{
-		config: config,
-	}
+func NewJSONRowEventEncoderBuilder(config *common.Config) codec.RowEventEncoderBuilder {
+	return &jsonRowEventEncoderBuilder{config: config}
 }
 
 // Build a `jsonRowEventEncoderBuilder`
 func (b *jsonRowEventEncoderBuilder) Build() codec.RowEventEncoder {
-	encoder := newJSONRowEventEncoder(b.config)
-	return encoder
+	return newJSONRowEventEncoder(b.config)
 }
 
 func shouldIgnoreColumn(col *model.Column,