transport: cluster, store topology using atomic.Pointer[topology]

scylladb · Sep 12, 2022 · 15058fa · 15058fa
1 parent 4c1e97e
commit 15058fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/transport/cluster.go b/transport/cluster.go
@@ -26,7 +26,7 @@ type (
 )
 
 type Cluster struct {
-	topology          atomic.Value // *topology
+	topology          atomic.Pointer[topology]
 	control           *Conn
 	cfg               ConnConfig
 	handledEvents     []frame.EventType // This will probably be moved to config.
@@ -443,7 +443,7 @@ func parseTokensFromRow(n *Node, r frame.Row, ring *Ring) error {
 }
 
 func (c *Cluster) Topology() *topology {
-	return c.topology.Load().(*topology)
+	return c.topology.Load()
 }
 
 func (c *Cluster) setTopology(t *topology) {

diff --git a/transport/cluster_integration_test.go b/transport/cluster_integration_test.go
@@ -80,7 +80,7 @@ func TestClusterIntegration(t *testing.T) {
 	}
 
 	// There should be at least system keyspaces present.
-	if len(c.topology.Load().(*topology).keyspaces) == 0 {
+	if len(c.Topology().keyspaces) == 0 {
 		t.Fatalf("Keyspaces failed to load")
 	}