UnifiedStorage: Rename Batch processing to Bulk (#101413)

pkg/storage/unified/sql/notifier_sql.go

@@ -5,17 +5,18 @@ import (
 	"fmt"
 	"time"
 
+	"go.opentelemetry.io/otel/trace"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
 	"github.com/grafana/grafana/pkg/storage/unified/sql/sqltemplate"
-	"go.opentelemetry.io/otel/trace"
 )
 
 var (
 	// Validation errors.
 	errHistoryPollRequired    = fmt.Errorf("historyPoll is required")
 	errListLatestRVsRequired  = fmt.Errorf("listLatestRVs is required")
-	errBatchLockRequired      = fmt.Errorf("batchLock is required")
+	errBulkLockRequired       = fmt.Errorf("bulkLock is required")
 	errTracerRequired         = fmt.Errorf("tracer is required")
 	errLogRequired            = fmt.Errorf("log is required")
 	errInvalidWatchBufferSize = fmt.Errorf("watchBufferSize must be greater than 0")
@@ -33,7 +34,7 @@ type pollingNotifier struct {
 	log    log.Logger
 	tracer trace.Tracer
 
-	batchLock     *batchLock
+	bulkLock      *bulkLock
 	listLatestRVs func(ctx context.Context) (groupResourceRV, error)
 	historyPoll   func(ctx context.Context, grp string, res string, since int64) ([]*historyPollResponse, error)
 
@@ -48,7 +49,7 @@ type pollingNotifierConfig struct {
 	log    log.Logger
 	tracer trace.Tracer
 
-	batchLock     *batchLock
+	bulkLock      *bulkLock
 	listLatestRVs func(ctx context.Context) (groupResourceRV, error)
 	historyPoll   func(ctx context.Context, grp string, res string, since int64) ([]*historyPollResponse, error)
 
@@ -62,8 +63,8 @@ func (cfg *pollingNotifierConfig) validate() error {
 	if cfg.listLatestRVs == nil {
 		return errListLatestRVsRequired
 	}
-	if cfg.batchLock == nil {
-		return errBatchLockRequired
+	if cfg.bulkLock == nil {
+		return errBulkLockRequired
 	}
 	if cfg.tracer == nil {
 		return errTracerRequired
@@ -96,7 +97,7 @@ func newPollingNotifier(cfg *pollingNotifierConfig) (*pollingNotifier, error) {
 		watchBufferSize: cfg.watchBufferSize,
 		log:             cfg.log,
 		tracer:          cfg.tracer,
-		batchLock:       cfg.batchLock,
+		bulkLock:        cfg.bulkLock,
 		listLatestRVs:   cfg.listLatestRVs,
 		historyPoll:     cfg.historyPoll,
 		done:            cfg.done,