FMWK-521-as-client-interface

- reiview fixes
aerospike · Aug 5, 2024 · fa4a410 · fa4a410
1 parent 87aaba5
commit fa4a410
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/client.go b/client.go
@@ -33,10 +33,10 @@ const (
 	MaxPartitions = 4096
 )
 
-// AsClient describes aerospike client interface for easy mocking.
+// AerospikeClient describes aerospike client interface for easy mocking.
 //
-// go:generate mockery --name AsClient
-type AsClient interface {
+// go:generate mockery --name AerospikeClient
+type AerospikeClient interface {
 	GetDefaultScanPolicy() *a.ScanPolicy
 	GetDefaultInfoPolicy() *a.InfoPolicy
 	GetDefaultWritePolicy() *a.WritePolicy
@@ -88,7 +88,7 @@ type AsClient interface {
 //		// handle error
 //	}
 type Client struct {
-	aerospikeClient AsClient
+	aerospikeClient AerospikeClient
 	logger          *slog.Logger
 	id              string
 }
@@ -97,7 +97,7 @@ type Client struct {
 //   - ac is the aerospike client to use for backup and restore operations.
 //   - id is an identifier for the client.
 //   - logger is the logger that this client will log to.
-func NewClient(ac AsClient, id string, logger *slog.Logger) (*Client, error) {
+func NewClient(ac AerospikeClient, id string, logger *slog.Logger) (*Client, error) {
 	if ac == nil {
 		return nil, errors.New("aerospike client pointer is nil")
 	}

diff --git a/handler_backup.go b/handler_backup.go
@@ -51,7 +51,7 @@ type BackupHandler struct {
 	writer                 Writer
 	encoder                Encoder
 	config                 *BackupConfig
-	aerospikeClient        AsClient
+	aerospikeClient        AerospikeClient
 	logger                 *slog.Logger
 	firstFileHeaderWritten *atomic.Bool
 	limiter                *rate.Limiter
@@ -64,7 +64,7 @@ type BackupHandler struct {
 // newBackupHandler creates a new BackupHandler.
 func newBackupHandler(
 	config *BackupConfig,
-	ac AsClient,
+	ac AerospikeClient,
 	logger *slog.Logger,
 	writer Writer,
 ) *BackupHandler {

diff --git a/handler_backup_records.go b/handler_backup_records.go
@@ -31,13 +31,13 @@ import (
 
 type backupRecordsHandler struct {
 	config          *BackupConfig
-	aerospikeClient AsClient
+	aerospikeClient AerospikeClient
 	logger          *slog.Logger
 }
 
 func newBackupRecordsHandler(
 	config *BackupConfig,
-	ac AsClient,
+	ac AerospikeClient,
 	logger *slog.Logger,
 ) *backupRecordsHandler {
 	logger.Debug("created new backup records handler")
@@ -139,8 +139,6 @@ func (bh *backupRecordsHandler) makeAerospikeReadWorkers(
 
 	readWorkers := make([]pipeline.Worker[*models.Token], n)
 
-	// counter inject
-
 	for i := 0; i < n; i++ {
 		recordReader := aerospike.NewRecordReader(
 			bh.aerospikeClient,

diff --git a/handler_restore.go b/handler_restore.go
@@ -47,7 +47,7 @@ type StreamingReader interface {
 type RestoreHandler struct {
 	reader          StreamingReader
 	config          *RestoreConfig
-	aerospikeClient AsClient
+	aerospikeClient AerospikeClient
 	logger          *slog.Logger
 	limiter         *rate.Limiter
 	errors          chan error
@@ -58,7 +58,7 @@ type RestoreHandler struct {
 // newRestoreHandler creates a new RestoreHandler.
 func newRestoreHandler(
 	config *RestoreConfig,
-	ac AsClient,
+	ac AerospikeClient,
 	logger *slog.Logger,
 	reader StreamingReader,
 ) *RestoreHandler {

diff --git a/internal/asinfo/info_client.go b/internal/asinfo/info_client.go
@@ -75,7 +75,7 @@ type infoGetter interface {
 	RequestInfo(infoPolicy *a.InfoPolicy, commands ...string) (map[string]string, a.Error)
 }
 
-type asClient interface {
+type aerospikeClient interface {
 	Cluster() *a.Cluster
 }
 
@@ -84,7 +84,7 @@ type InfoClient struct {
 	cluster *a.Cluster
 }
 
-func NewInfoClientFromAerospike(aeroClient asClient, policy *a.InfoPolicy) *InfoClient {
+func NewInfoClientFromAerospike(aeroClient aerospikeClient, policy *a.InfoPolicy) *InfoClient {
 	return &InfoClient{
 		cluster: aeroClient.Cluster(),
 		policy:  policy,