fix conflict in normal file.

pingcap · Feb 25, 2022 · 05bee9b · 05bee9b
1 parent 6cef8e2
commit 05bee9b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 376 deletions.
diff --git a/cdc/metrics.go b/cdc/metrics.go
@@ -22,17 +22,7 @@ import (
 	"github.com/pingcap/tiflow/cdc/puller"
 	"github.com/pingcap/tiflow/cdc/puller/sorter"
 	"github.com/pingcap/tiflow/cdc/sink"
-<<<<<<< HEAD
-=======
 	"github.com/pingcap/tiflow/cdc/sink/producer/kafka"
-	"github.com/pingcap/tiflow/cdc/sorter"
-	"github.com/pingcap/tiflow/cdc/sorter/leveldb"
-	"github.com/pingcap/tiflow/cdc/sorter/memory"
-	"github.com/pingcap/tiflow/cdc/sorter/unified"
-	"github.com/pingcap/tiflow/pkg/actor"
-	"github.com/pingcap/tiflow/pkg/db"
-	"github.com/pingcap/tiflow/pkg/etcd"
->>>>>>> 8a709d748 (cdc/metrics: Integrate sarama producer metrics (#4520))
 	"github.com/pingcap/tiflow/pkg/orchestrator"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -53,18 +43,5 @@ func init() {
 	tablepipeline.InitMetrics(registry)
 	owner.InitMetrics(registry)
 	initServerMetrics(registry)
-<<<<<<< HEAD
-=======
-	actor.InitMetrics(registry)
-	orchestrator.InitMetrics(registry)
-	p2p.InitMetrics(registry)
-	// Sorter metrics
-	sorter.InitMetrics(registry)
-	memory.InitMetrics(registry)
-	unified.InitMetrics(registry)
-	leveldb.InitMetrics(registry)
-	redowriter.InitMetrics(registry)
-	db.InitMetrics(registry)
 	kafka.InitMetrics(registry)
->>>>>>> 8a709d748 (cdc/metrics: Integrate sarama producer metrics (#4520))
 }
diff --git a/cdc/sink/producer/kafka/kafka.go b/cdc/sink/producer/kafka/kafka.go
@@ -37,17 +37,13 @@ import (
 	"go.uber.org/zap"
 )
 
-<<<<<<< HEAD
-const defaultPartitionNum = 3
-=======
 const (
 	// defaultPartitionNum specifies the default number of partitions when we create the topic.
 	defaultPartitionNum = 3
 
 	// flushMetricsInterval specifies the interval of refresh sarama metrics.
 	flushMetricsInterval = 5 * time.Second
 )
->>>>>>> 8a709d748 (cdc/metrics: Integrate sarama producer metrics (#4520))
 
 // Config stores user specified Kafka producer configuration
 type Config struct {
@@ -207,14 +203,11 @@ type kafkaSaramaProducer struct {
 	closeCh chan struct{}
 	// atomic flag indicating whether the producer is closing
 	closing kafkaProducerClosingFlag
-<<<<<<< HEAD
-=======
 
 	role util.Role
 	id   model.ChangeFeedID
 
 	metricsMonitor *saramaMetricsMonitor
->>>>>>> 8a709d748 (cdc/metrics: Integrate sarama producer metrics (#4520))
 }
 
 type kafkaProducerClosingFlag = int32
@@ -430,8 +423,6 @@ func topicPreProcess(topic string, config *Config, saramaConfig *sarama.Config)
 		}
 	}()
 
-<<<<<<< HEAD
-=======
 	if err := validateAndCreateTopic(admin, topic, config, cfg, opts); err != nil {
 		return nil, cerror.WrapError(cerror.ErrKafkaNewSaramaProducer, err)
 	}
@@ -513,7 +504,6 @@ func kafkaClientID(role, captureAddr, changefeedID, configuredClientID string) (
 
 func validateAndCreateTopic(admin kafka.ClusterAdminClient, topic string, config *Config, saramaConfig *sarama.Config,
 	opts map[string]string) error {
->>>>>>> 8a709d748 (cdc/metrics: Integrate sarama producer metrics (#4520))
 	topics, err := admin.ListTopics()
 	if err != nil {
 		return cerror.WrapError(cerror.ErrKafkaNewSaramaProducer, err)

diff --git a/go.mod b/go.mod
@@ -45,14 +45,8 @@ require (
 	github.com/pingcap/tidb-tools v5.0.3+incompatible
 	github.com/prometheus/client_golang v1.5.1
 	github.com/r3labs/diff v1.1.0
-<<<<<<< HEAD
 	github.com/spf13/cobra v1.0.0
-=======
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
-	github.com/shopspring/decimal v1.3.0
-	github.com/soheilhy/cmux v0.1.5
-	github.com/spf13/cobra v1.2.1
->>>>>>> 8a709d748 (cdc/metrics: Integrate sarama producer metrics (#4520))
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14