This is an automated cherry-pick of pingcap#9090

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · May 30, 2023 · 2a6e8de · 2a6e8de
1 parent a1dce78
commit 2a6e8de
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/cdc/api/v2/model_test.go b/cdc/api/v2/model_test.go
@@ -47,10 +47,19 @@ var defaultAPIConfig = &ReplicaConfig{
 			Delimiter:  config.Comma,
 			NullString: config.NULL,
 		},
+<<<<<<< HEAD
 		EncoderConcurrency:       16,
 		Terminator:               config.CRLF,
 		DateSeparator:            config.DateSeparatorDay.String(),
 		EnablePartitionSeparator: true,
+=======
+		EncoderConcurrency:       util.AddressOf(16),
+		Terminator:               util.AddressOf(config.CRLF),
+		DateSeparator:            util.AddressOf(config.DateSeparatorDay.String()),
+		EnablePartitionSeparator: util.AddressOf(true),
+		EnableKafkaSinkV2:        util.AddressOf(false),
+		OnlyOutputUpdatedColumns: util.AddressOf(false),
+>>>>>>> edda949d87 (config(ticdc): fix deafult setting of DateSeparator (#9090))
 	},
 	Consistent: &ConsistentConfig{
 		Level:             "none",

diff --git a/pkg/cmd/util/helper_test.go b/pkg/cmd/util/helper_test.go
@@ -200,10 +200,19 @@ func TestAndWriteExampleReplicaTOML(t *testing.T) {
 			Delimiter:  string(config.Comma),
 			NullString: config.NULL,
 		},
+<<<<<<< HEAD
 		Terminator:               "\r\n",
 		DateSeparator:            config.DateSeparatorDay.String(),
 		EnablePartitionSeparator: true,
 		Protocol:                 "open-protocol",
+=======
+		Terminator:               util.AddressOf("\r\n"),
+		DateSeparator:            util.AddressOf(config.DateSeparatorDay.String()),
+		EnablePartitionSeparator: util.AddressOf(true),
+		EnableKafkaSinkV2:        util.AddressOf(false),
+		OnlyOutputUpdatedColumns: util.AddressOf(false),
+		Protocol:                 util.AddressOf("open-protocol"),
+>>>>>>> edda949d87 (config(ticdc): fix deafult setting of DateSeparator (#9090))
 	}, cfg.Sink)
 }
 

diff --git a/pkg/config/config_test_data.go b/pkg/config/config_test_data.go
@@ -35,6 +35,10 @@ const (
   "sink": {
     "encoder-concurrency": 16,
     "terminator": "\r\n",
+<<<<<<< HEAD
+=======
+	"date-separator": "day",
+>>>>>>> edda949d87 (config(ticdc): fix deafult setting of DateSeparator (#9090))
     "dispatch-rules": [
       {
         "db-name": "a",

diff --git a/pkg/config/replica_config.go b/pkg/config/replica_config.go
@@ -54,10 +54,19 @@ var defaultReplicaConfig = &ReplicaConfig{
 			Delimiter:  Comma,
 			NullString: NULL,
 		},
+<<<<<<< HEAD
 		EncoderConcurrency:       16,
 		Terminator:               CRLF,
 		DateSeparator:            DateSeparatorDay.String(),
 		EnablePartitionSeparator: true,
+=======
+		EncoderConcurrency:       util.AddressOf(16),
+		Terminator:               util.AddressOf(CRLF),
+		DateSeparator:            util.AddressOf(DateSeparatorDay.String()),
+		EnablePartitionSeparator: util.AddressOf(true),
+		EnableKafkaSinkV2:        util.AddressOf(false),
+		OnlyOutputUpdatedColumns: util.AddressOf(false),
+>>>>>>> edda949d87 (config(ticdc): fix deafult setting of DateSeparator (#9090))
 		TiDBSourceID:             1,
 	},
 	Consistent: &ConsistentConfig{

diff --git a/pkg/sink/cloudstorage/config_test.go b/pkg/sink/cloudstorage/config_test.go
@@ -29,14 +29,17 @@ func TestConfigApply(t *testing.T) {
 	expected.FlushInterval = 10 * time.Second
 	expected.FileSize = 16 * 1024 * 1024
 	expected.FileIndexWidth = config.DefaultFileIndexWidth
-	expected.DateSeparator = config.DateSeparatorNone.String()
+	expected.DateSeparator = config.DateSeparatorDay.String()
 	expected.EnablePartitionSeparator = true
 	uri := "s3://bucket/prefix?worker-count=32&flush-interval=10s&file-size=16777216&protocol=csv"
 	sinkURI, err := url.Parse(uri)
 	require.Nil(t, err)
 
 	replicaConfig := config.GetDefaultReplicaConfig()
+<<<<<<< HEAD
 	replicaConfig.Sink.DateSeparator = config.DateSeparatorNone.String()
+=======
+>>>>>>> edda949d87 (config(ticdc): fix deafult setting of DateSeparator (#9090))
 	err = replicaConfig.ValidateAndAdjust(sinkURI)
 	require.NoError(t, err)
 	cfg := NewConfig()