Enable fieldalignment linter

1. Enable it
2. Run `make fix`
3. Bring back comments

Author: dkropachev

.golangci.yml

@@ -1,8 +1,5 @@
 version: "2"
 
-issues:
-  max-same-issues: 50
-
 formatters:
   enable:
     - goimports
@@ -17,6 +14,13 @@ formatters:
       max-len: 120
 
 linters:
+  exclusions:
+    rules:
+      - path: '(.+)_test\.go'
+        text: "fieldalignment"
+        linters:
+          - govet
+
   default: none
   enable:
     - nolintlint
@@ -26,7 +30,6 @@ linters:
       enable-all: true
       disable:
         - shadow
-        - fieldalignment
 
     nolintlint:
       allow-no-explanation: [ golines ]

Makefile

@@ -5,7 +5,7 @@ BIN_DIR := "${MAKEFILE_PATH}/bin"
 
 CASSANDRA_VERSION ?= 4.1.6
 SCYLLA_VERSION ?= release:6.1.1
-GOLANGCI_VERSION = 2.1.6
+GOLANGCI_VERSION = 2.4.0
 
 TEST_CQL_PROTOCOL ?= 4
 TEST_COMPRESSOR ?= snappy

cluster.go

@@ -75,8 +75,8 @@ func addSslOptions(cluster *ClusterConfig) *ClusterConfig {
 }
 
 type OnceManager struct {
-	mu        sync.Mutex
 	keyspaces map[string]*sync.Once
+	mu        sync.Mutex
 }
 
 func NewOnceManager() *OnceManager {

common_test.go

@@ -140,20 +140,19 @@ type SslOptions struct {
 }
 
 type ConnConfig struct {
-	ProtoVersion   int
-	CQLVersion     string
-	WriteTimeout   time.Duration
-	ReadTimeout    time.Duration
-	ConnectTimeout time.Duration
-	Dialer         Dialer
-	HostDialer     HostDialer
-	Compressor     Compressor
-	Authenticator  Authenticator
-	AuthProvider   func(h *HostInfo) (Authenticator, error)
-	Keepalive      time.Duration
-	Logger         StdLogger
-
+	Dialer          Dialer
+	Logger          StdLogger
+	Authenticator   Authenticator
+	Compressor      Compressor
+	HostDialer      HostDialer
+	AuthProvider    func(h *HostInfo) (Authenticator, error)
 	tlsConfig       *tls.Config
+	CQLVersion      string
+	ConnectTimeout  time.Duration
+	ReadTimeout     time.Duration
+	WriteTimeout    time.Duration
+	ProtoVersion    int
+	Keepalive       time.Duration
 	disableCoalesce bool
 }
 
@@ -189,52 +188,43 @@ type ConnInterface interface {
 // queries, but users are usually advised to use a more reliable, higher
 // level API.
 type Conn struct {
-	conn net.Conn
-	r    *bufio.Reader
-	w    contextWriter
-
-	systemRequestTimeout time.Duration
-	usingTimeoutClause   string
-	readTimeout          atomic.Int64
-	writeTimeout         atomic.Int64
-	cfg                  *ConnConfig
-	frameObserver        FrameHeaderObserver
-	streamObserver       StreamObserver
-
-	headerBuf [headSize]byte
-
-	streams *streams.IDGenerator
-	mu      sync.Mutex
+	auth           Authenticator
+	streamObserver StreamObserver
+	w              contextWriter
+	logger         StdLogger
+	frameObserver  FrameHeaderObserver
+	ctx            context.Context
+	errorHandler   ConnErrorHandler
+	compressor     Compressor
+	conn           net.Conn
+	cfg            *ConnConfig
+	supported      map[string][]string
+	streams        *streams.IDGenerator
+	host           *HostInfo
 	// calls stores a map from stream ID to callReq.
 	// This map is protected by mu.
 	// calls should not be used when closed is true, calls is set to nil when closed=true.
-	calls map[int]*callReq
-
-	errorHandler ConnErrorHandler
-	compressor   Compressor
-	auth         Authenticator
-	addr         string
-
-	version         uint8
-	currentKeyspace string
-	host            *HostInfo
-	supported       map[string][]string
-	scyllaSupported scyllaSupported
-	cqlProtoExts    []cqlProtocolExtension
-	isSchemaV2      bool
-
-	session *Session
-
+	calls                map[int]*callReq
+	r                    *bufio.Reader
+	session              *Session
+	cancel               context.CancelFunc
+	addr                 string
+	usingTimeoutClause   string
+	currentKeyspace      string
+	cqlProtoExts         []cqlProtocolExtension
+	scyllaSupported      scyllaSupported
+	systemRequestTimeout time.Duration
+	writeTimeout         atomic.Int64
+	timeouts             int64
+	readTimeout          atomic.Int64
+	mu                   sync.Mutex
+	tabletsRoutingV1     int32
+	headerBuf            [headSize]byte
 	// true if connection close process for the connection started.
 	// closed is protected by mu.
-	closed bool
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	timeouts int64
-
-	logger           StdLogger
-	tabletsRoutingV1 int32
+	closed     bool
+	isSchemaV2 bool
+	version    uint8
 }
 
 func (c *Conn) getIsSchemaV2() bool {
@@ -887,16 +877,13 @@ func (c *Conn) releaseStream(call *callReq) {
 }
 
 type callReq struct {
+	// streamObserverContext is notified about events regarding this stream
+	streamObserverContext StreamObserverContext
 	// resp will receive the frame that was sent as a response to this stream.
 	resp     chan callResp
 	timeout  chan struct{} // indicates to recv() that a call has timed out
-	streamID int           // current stream in use
-
-	timer *time.Timer
-
-	// streamObserverContext is notified about events regarding this stream
-	streamObserverContext StreamObserverContext
-
+	timer    *time.Timer
+	streamID int // current stream in use
 	// streamObserverEndOnce ensures that either StreamAbandoned or StreamFinished is called,
 	// but not both.
 	streamObserverEndOnce sync.Once
@@ -932,14 +919,13 @@ type deadlineWriter interface {
 }
 
 type deadlineContextWriter struct {
-	w       deadlineWriter
-	timeout atomic.Int64
+	w deadlineWriter
 	// semaphore protects critical section for SetWriteDeadline/Write.
 	// It is a channel with capacity 1.
 	semaphore chan struct{}
-
 	// quit closed once the connection is closed.
-	quit chan struct{}
+	quit    chan struct{}
+	timeout atomic.Int64
 }
 
 func (c *deadlineContextWriter) setWriteTimeout(timeout time.Duration) {
@@ -985,17 +971,13 @@ func newWriteCoalescer(conn deadlineWriter, writeTimeout, coalesceDuration time.
 }
 
 type writeCoalescer struct {
-	c deadlineWriter
-
-	mu sync.Mutex
-
-	quit    <-chan struct{}
-	writeCh chan writeRequest
-
-	timeout atomic.Int64
-
+	c                deadlineWriter
+	quit             <-chan struct{}
+	writeCh          chan writeRequest
 	testEnqueuedHook func()
 	testFlushedHook  func()
+	timeout          atomic.Int64
+	mu               sync.Mutex
 }
 
 func (w *writeCoalescer) setWriteTimeout(timeout time.Duration) {
@@ -1010,8 +992,8 @@ type writeRequest struct {
 }
 
 type writeResult struct {
-	n   int
 	err error
+	n   int
 }
 
 // writeContext implements contextWriter.
@@ -1345,8 +1327,8 @@ type StreamObserverContext interface {
 
 type preparedStatment struct {
 	id       []byte
-	request  preparedMetadata
 	response resultMetadata
+	request  preparedMetadata
 }
 
 type inflightPrepare struct {
@@ -1869,9 +1851,9 @@ func getSchemaAgreement(queryLocalSchemasRows []string, querySystemPeersRows []s
 type schemaAgreementHost struct {
 	DataCenter    string
 	Rack          string
+	RPCAddress    string
 	HostID        UUID
 	SchemaVersion UUID
-	RPCAddress    string
 }
 
 func (h *schemaAgreementHost) IsValid() bool {

conn.go

@@ -52,14 +52,12 @@ type SetTablets interface {
 }
 
 type policyConnPool struct {
-	session *Session
-
-	port     int
-	numConns int
-	keyspace string
-
-	mu            sync.RWMutex
+	session       *Session
 	hostConnPools map[string]*hostConnPool
+	keyspace      string
+	port          int
+	numConns      int
+	mu            sync.RWMutex
 }
 
 func connConfig(cfg *ClusterConfig) (*ConnConfig, error) {
@@ -253,18 +251,17 @@ func (p *policyConnPool) removeHost(hostID string) {
 // hostConnPool is a connection pool for a single host.
 // Connection selection is based on a provided ConnSelectionPolicy
 type hostConnPool struct {
-	session  *Session
-	host     *HostInfo
-	size     int
-	keyspace string
-	// protection for connPicker, closed, filling
-	mu         sync.RWMutex
 	connPicker ConnPicker
-	closed     bool
-	filling    bool
+	logger     StdLogger
+	session    *Session
+	host       *HostInfo
 	debouncer  *debounce.SimpleDebouncer
-
-	logger StdLogger
+	keyspace   string
+	size       int
+	// protection for connPicker, closed, filling
+	mu      sync.RWMutex
+	closed  bool
+	filling bool
 }
 
 func (h *hostConnPool) String() string {

connectionpool.go

@@ -73,15 +73,12 @@ type controlConnection interface {
 // Ensure that the atomic variable is aligned to a 64bit boundary
 // so that atomic operations can be applied on 32bit architectures.
 type controlConn struct {
+	conn         atomic.Value
+	retry        RetryPolicy
+	session      *Session
+	quit         chan struct{}
 	state        int32
 	reconnecting int32
-
-	session *Session
-	conn    atomic.Value
-
-	retry RetryPolicy
-
-	quit chan struct{}
 }
 
 func (c *controlConn) getSession() *Session {

control.go

@@ -11,14 +11,14 @@ const (
 
 // debounces requests to call a refresh function (currently used for ring refresh). It also supports triggering a refresh immediately.
 type RefreshDebouncer struct {
-	mu           sync.Mutex
-	stopped      bool
 	broadcaster  *errorBroadcaster
-	interval     time.Duration
 	timer        *time.Timer
 	refreshNowCh chan struct{}
 	quit         chan struct{}
 	refreshFn    func() error
+	interval     time.Duration
+	mu           sync.Mutex
+	stopped      bool
 }
 
 func NewRefreshDebouncer(interval time.Duration, refreshFn func() error) *RefreshDebouncer {

debounce/refresh_deboucer.go

@@ -57,9 +57,9 @@ func NewConnectionRecorder(fname string, conn net.Conn) (net.Conn, error) {
 }
 
 type FrameWriter struct {
-	new       bool
-	to_record int
 	record    dialer.Record
+	to_record int
+	new       bool
 }
 
 func (f *FrameWriter) Write(b []byte, n int, file *os.File) (err error) {

dialer/recorder/recorder.go

@@ -40,12 +40,12 @@ func NewConnectionReplayer(fname string) (net.Conn, error) {
 }
 
 type ConnectionReplayer struct {
+	gotRequest            chan struct{}
 	frames                []*FrameRecorded
 	frameIdsToReplay      []int
 	streamIdsToReplay     []int
 	frameIdx              int
 	frameResponsePosition int
-	gotRequest            chan struct{}
 	closed                bool
 }
 
@@ -220,6 +220,6 @@ func loadResponseFramesFromFiles(read_file, write_file string) ([]*FrameRecorded
 }
 
 type FrameRecorded struct {
-	Hash     int64
 	Response []byte
+	Hash     int64
 }