Merge pull request #186 from dkropachev/fix-code-formatting

Fix files formatting

cassandra_only_test.go

@@ -1,3 +1,4 @@
+//go:build (all || cassandra) && !scylla
 // +build all cassandra
 // +build !scylla
 

exec_test.go

@@ -1,3 +1,4 @@
+//go:build all || integration
 // +build all integration
 
 package gocql

host_source.go

@@ -435,10 +435,10 @@ func (h *HostInfo) Hostname() string {
 }
 
 func (h *HostInfo) ConnectAddressAndPort() string {
-        h.mu.Lock()
-        defer h.mu.Unlock()
-        addr, _ := h.connectAddressLocked()
-        return net.JoinHostPort(addr.String(), strconv.Itoa(h.port))
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	addr, _ := h.connectAddressLocked()
+	return net.JoinHostPort(addr.String(), strconv.Itoa(h.port))
 }
 
 func (h *HostInfo) String() string {

integration_cassandra_only_test.go

@@ -1,3 +1,4 @@
+//go:build (all || integration) && !scylla
 // +build all integration
 // +build !scylla
 

internal/murmur/murmur_appengine.go

@@ -1,3 +1,4 @@
+//go:build appengine || s390x
 // +build appengine s390x
 
 package murmur

internal/murmur/murmur_unsafe.go

@@ -1,5 +1,5 @@
-// +build !appengine
-// +build !s390x
+//go:build !appengine && !s390x
+// +build !appengine,!s390x
 
 package murmur
 

metadata_cassandra.go

@@ -1,5 +1,5 @@
-// +build cassandra
-// +build !scylla
+//go:build cassandra && !scylla
+// +build cassandra,!scylla
 
 // Copyright (c) 2015 The gocql Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

metadata_cassandra_test.go

@@ -1,5 +1,5 @@
-// +build cassandra
-// +build !scylla
+//go:build cassandra && !scylla
+// +build cassandra,!scylla
 
 // Copyright (c) 2015 The gocql Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

metadata_scylla.go

@@ -244,7 +244,7 @@ type schemaDescriber struct {
 	session *Session
 	mu      sync.Mutex
 
-	cache        map[string]*KeyspaceMetadata
+	cache map[string]*KeyspaceMetadata
 
 	// Experimental, this interface and use may change
 	tabletsCache *TabletsMetadata

metadata_scylla_test.go

@@ -1,3 +1,4 @@
+//go:build !cassandra
 // +build !cassandra
 
 // Copyright (c) 2015 The gocql Authors. All rights reserved.

recreate.go

@@ -1,4 +1,6 @@
+//go:build !cassandra
 // +build !cassandra
+
 // Copyright (C) 2017 ScyllaDB
 
 package gocql
@@ -494,12 +496,12 @@ type scyllaEncryptionOptions struct {
 
 // UnmarshalBinary deserializes blob into scyllaEncryptionOptions.
 // Format:
-//  * 4 bytes - size of KV map
-//  Size times:
-//  * 4 bytes - length of key
-//  * len_of_key bytes - key
-//  * 4 bytes - length of value
-//  * len_of_value bytes - value
+//   - 4 bytes - size of KV map
+//     Size times:
+//   - 4 bytes - length of key
+//   - len_of_key bytes - key
+//   - 4 bytes - length of value
+//   - len_of_value bytes - value
 func (enc *scyllaEncryptionOptions) UnmarshalBinary(data []byte) error {
 	size := binary.LittleEndian.Uint32(data[0:4])
 

recreate_test.go

@@ -1,5 +1,5 @@
-//+build integration
-//+build scylla
+//go:build integration && scylla
+// +build integration,scylla
 
 // Copyright (C) 2017 ScyllaDB
 

scylla.go

@@ -378,13 +378,13 @@ func (p *scyllaConnPicker) Pick(t Token, keyspace string, table string) *Conn {
 		conn.mu.Lock()
 		if conn.tabletsRoutingV1 {
 			tablets := conn.session.getTablets()
-	
+
 			// Search for tablets with Keyspace and Table from the Query
 			l, r := findTablets(tablets, keyspace, table)
-	
+
 			if l != -1 {
 				tablet := findTabletForToken(tablets, mmt, l, r)
-	
+
 				for _, replica := range tablet.replicas {
 					if replica.hostId.String() == p.hostId {
 						idx = replica.shardId
@@ -396,7 +396,7 @@ func (p *scyllaConnPicker) Pick(t Token, keyspace string, table string) *Conn {
 
 		break
 	}
-	
+
 	if idx == -1 {
 		idx = p.shardOf(mmt)
 	}
@@ -415,15 +415,15 @@ func (p *scyllaConnPicker) maybeReplaceWithLessBusyConnection(c *Conn) *Conn {
 		return c
 	}
 	alternative := p.leastBusyConn()
-	if alternative == nil || alternative.AvailableStreams() * 120 > c.AvailableStreams() * 100 {
+	if alternative == nil || alternative.AvailableStreams()*120 > c.AvailableStreams()*100 {
 		return c
 	} else {
 		return alternative
 	}
 }
 
 func isHeavyLoaded(c *Conn) bool {
-    return c.streams.NumStreams / 2 > c.AvailableStreams();
+	return c.streams.NumStreams/2 > c.AvailableStreams()
 }
 
 func (p *scyllaConnPicker) leastBusyConn() *Conn {

scylla_shard_aware_port_integration_test.go

@@ -1,5 +1,5 @@
-// +build integration
-// +build scylla
+//go:build integration && scylla
+// +build integration,scylla
 
 package gocql
 

scylla_shard_aware_port_mocked_test.go

@@ -1,3 +1,4 @@
+//go:build unit
 // +build unit
 
 package gocql

session.go

@@ -2171,10 +2171,10 @@ type routingKeyInfoLRU struct {
 }
 
 type routingKeyInfo struct {
-	indexes  []int
-	types    []TypeInfo
-	keyspace string
-	table    string
+	indexes     []int
+	types       []TypeInfo
+	keyspace    string
+	table       string
 	lwt         bool
 	partitioner Partitioner
 }