Adjust for v18

Signed-off-by: Matt Lord <[email protected]>
vitessio · Feb 27, 2024 · f1a9c89 · f1a9c89
1 parent 80f0390
commit f1a9c89
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 19 deletions.
diff --git a/go/vt/topo/memorytopo/election.go b/go/vt/topo/memorytopo/election.go
@@ -26,11 +26,6 @@ import (
 
 // NewLeaderParticipation is part of the topo.Server interface
 func (c *Conn) NewLeaderParticipation(name, id string) (topo.LeaderParticipation, error) {
-<<<<<<< HEAD
-=======
-	c.factory.callstats.Add([]string{"NewLeaderParticipation"}, 1)
-
->>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	if c.closed.Load() {
 		return nil, ErrConnectionClosed
 	}

diff --git a/go/vt/topo/memorytopo/memorytopo.go b/go/vt/topo/memorytopo/memorytopo.go
@@ -142,10 +142,6 @@ func (c *Conn) dial(ctx context.Context) error {
 
 // Close is part of the topo.Conn interface.
 func (c *Conn) Close() {
-<<<<<<< HEAD
-=======
-	c.factory.callstats.Add([]string{"Close"}, 1)
->>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	c.closed.Store(true)
 }
 

diff --git a/go/vt/topo/memorytopo/watch.go b/go/vt/topo/memorytopo/watch.go
@@ -25,11 +25,6 @@ import (
 
 // Watch is part of the topo.Conn interface.
 func (c *Conn) Watch(ctx context.Context, filePath string) (*topo.WatchData, <-chan *topo.WatchData, error) {
-<<<<<<< HEAD
-=======
-	c.factory.callstats.Add([]string{"Watch"}, 1)
-
->>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	if c.closed.Load() {
 		return nil, nil, ErrConnectionClosed
 	}
@@ -80,11 +75,6 @@ func (c *Conn) Watch(ctx context.Context, filePath string) (*topo.WatchData, <-c
 
 // WatchRecursive is part of the topo.Conn interface.
 func (c *Conn) WatchRecursive(ctx context.Context, dirpath string) ([]*topo.WatchDataRecursive, <-chan *topo.WatchDataRecursive, error) {
-<<<<<<< HEAD
-=======
-	c.factory.callstats.Add([]string{"WatchRecursive"}, 1)
-
->>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	if c.closed.Load() {
 		return nil, nil, ErrConnectionClosed
 	}