Merge pull request #1232 from brojeg/master

Enable funlen linter (part 5)
ydb-platform · May 29, 2024 · 56a634a · 56a634a
2 parents a9fd2f7 + 71ed802
commit 56a634a
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 67 deletions.
diff --git a/internal/grpcwrapper/rawtopic/rawtopicreader/rawtopicreader.go b/internal/grpcwrapper/rawtopic/rawtopicreader/rawtopicreader.go
@@ -29,6 +29,7 @@ func (s StreamReader) CloseSend() error {
 	return s.Stream.CloseSend()
 }
 
+//nolint:funlen
 func (s StreamReader) Recv() (ServerMessage, error) {
 	grpcMess, err := s.Stream.Recv()
 	if xerrors.Is(err, io.EOF) {

diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -147,14 +147,10 @@ func New[PT Item[T], T any](
 	opts ...option[PT, T],
 ) *Pool[PT, T] {
 	p := &Pool[PT, T]{
-		trace: defaultTrace,
-		limit: DefaultLimit,
-		createItem: func(ctx context.Context) (PT, error) {
-			var item T
-
-			return &item, nil
-		},
-		done: make(chan struct{}),
+		trace:      defaultTrace,
+		limit:      DefaultLimit,
+		createItem: defaultCreateItem[T, PT],
+		done:       make(chan struct{}),
 	}
 
 	for _, opt := range opts {
@@ -174,62 +170,38 @@ func New[PT Item[T], T any](
 		})
 	}()
 
-	createItem := p.createItem
+	p.createItem = createItemWithTimeoutHandling(p.createItem, p)
+
+	p.idle = make([]PT, 0, p.limit)
+	p.index = make(map[PT]struct{}, p.limit)
+	p.stats = &safeStats{
+		v:        stats.Stats{Limit: p.limit},
+		onChange: p.trace.OnChange,
+	}
+
+	return p
+}
+
+// defaultCreateItem returns a new item
+func defaultCreateItem[T any, PT Item[T]](ctx context.Context) (PT, error) {
+	var item T
+
+	return &item, nil
+}
 
-	p.createItem = func(ctx context.Context) (PT, error) {
+// createItemWithTimeoutHandling wraps the createItem function with timeout handling
+func createItemWithTimeoutHandling[PT Item[T], T any](
+	createItem func(ctx context.Context) (PT, error),
+	p *Pool[PT, T],
+) func(ctx context.Context) (PT, error) {
+	return func(ctx context.Context) (PT, error) {
 		var (
 			ch        = make(chan PT)
 			createErr error
 		)
 		go func() {
 			defer close(ch)
-			createErr = func() error {
-				var (
-					createCtx    = xcontext.ValueOnly(ctx)
-					cancelCreate context.CancelFunc
-				)
-				if d := p.createTimeout; d > 0 {
-					createCtx, cancelCreate = xcontext.WithTimeout(createCtx, d)
-				} else {
-					createCtx, cancelCreate = xcontext.WithCancel(createCtx)
-				}
-				defer cancelCreate()
-
-				newItem, err := createItem(createCtx)
-				if err != nil {
-					return xerrors.WithStackTrace(err)
-				}
-
-				needCloseItem := true
-				defer func() {
-					if needCloseItem {
-						_ = p.closeItem(ctx, newItem)
-					}
-				}()
-
-				select {
-				case <-p.done:
-					return xerrors.WithStackTrace(errClosedPool)
-
-				case <-ctx.Done():
-					p.mu.Lock()
-					defer p.mu.Unlock()
-
-					if len(p.index) < p.limit {
-						p.idle = append(p.idle, newItem)
-						p.index[newItem] = struct{}{}
-						p.stats.Index().Inc()
-						needCloseItem = false
-					}
-
-					return xerrors.WithStackTrace(ctx.Err())
-
-				case ch <- newItem:
-					needCloseItem = false
-
-					return nil
-				}
-			}()
+			createErr = createItemWithContext(ctx, p, createItem, ch)
 		}()
 
 		select {
@@ -249,14 +221,59 @@ func New[PT Item[T], T any](
 			return item, nil
 		}
 	}
-	p.idle = make([]PT, 0, p.limit)
-	p.index = make(map[PT]struct{}, p.limit)
-	p.stats = &safeStats{
-		v:        stats.Stats{Limit: p.limit},
-		onChange: p.trace.OnChange,
+}
+
+// createItemWithContext handles the creation of an item with context handling
+func createItemWithContext[PT Item[T], T any](
+	ctx context.Context,
+	p *Pool[PT, T],
+	createItem func(ctx context.Context) (PT, error),
+	ch chan PT,
+) error {
+	var (
+		createCtx    = xcontext.ValueOnly(ctx)
+		cancelCreate context.CancelFunc
+	)
+
+	if d := p.createTimeout; d > 0 {
+		createCtx, cancelCreate = xcontext.WithTimeout(createCtx, d)
+	} else {
+		createCtx, cancelCreate = xcontext.WithCancel(createCtx)
 	}
+	defer cancelCreate()
 
-	return p
+	newItem, err := createItem(createCtx)
+	if err != nil {
+		return xerrors.WithStackTrace(err)
+	}
+
+	needCloseItem := true
+	defer func() {
+		if needCloseItem {
+			_ = p.closeItem(ctx, newItem)
+		}
+	}()
+
+	select {
+	case <-p.done:
+		return xerrors.WithStackTrace(errClosedPool)
+	case <-ctx.Done():
+		p.mu.Lock()
+		defer p.mu.Unlock()
+
+		if len(p.index) < p.limit {
+			p.idle = append(p.idle, newItem)
+			p.index[newItem] = struct{}{}
+			p.stats.Index().Inc()
+			needCloseItem = false
+		}
+
+		return xerrors.WithStackTrace(ctx.Err())
+	case ch <- newItem:
+		needCloseItem = false
+
+		return nil
+	}
 }
 
 func (p *Pool[PT, T]) Stats() stats.Stats {

diff --git a/internal/scripting/client.go b/internal/scripting/client.go
@@ -221,6 +221,7 @@ func (c *Client) StreamExecute(
 	return r, xerrors.WithStackTrace(err)
 }
 
+//nolint:funlen
 func (c *Client) streamExecute(
 	ctx context.Context,
 	query string,

diff --git a/log/coordination.go b/log/coordination.go
@@ -13,6 +13,7 @@ func Coordination(l Logger, d trace.Detailer, opts ...Option) (t trace.Coordinat
 	return internalCoordination(wrapLogger(l, opts...), d)
 }
 
+//nolint:funlen
 func internalCoordination(
 	l *wrapper, //nolint:interfacer
 	d trace.Detailer,

diff --git a/log/driver.go b/log/driver.go
@@ -13,7 +13,8 @@ func Driver(l Logger, d trace.Detailer, opts ...Option) (t trace.Driver) {
 	return internalDriver(wrapLogger(l, opts...), d)
 }
 
-func internalDriver(l Logger, d trace.Detailer) trace.Driver { //nolint:gocyclo
+//nolint:gocyclo,funlen
+func internalDriver(l Logger, d trace.Detailer) trace.Driver {
 	return trace.Driver{
 		OnResolve: func(
 			info trace.DriverResolveStartInfo,

diff --git a/log/query.go b/log/query.go
@@ -12,7 +12,7 @@ func Query(l Logger, d trace.Detailer, opts ...Option) (t trace.Query) {
 	return internalQuery(wrapLogger(l, opts...), d)
 }
 
-//nolint:gocyclo
+//nolint:gocyclo,funlen
 func internalQuery(
 	l *wrapper, //nolint:interfacer
 	d trace.Detailer,

diff --git a/log/scripting.go b/log/scripting.go
@@ -11,6 +11,7 @@ func Scripting(l Logger, d trace.Detailer, opts ...Option) (t trace.Scripting) {
 	return internalScripting(wrapLogger(l, opts...), d)
 }
 
+//nolint:funlen
 func internalScripting(l *wrapper, d trace.Detailer) (t trace.Scripting) {
 	t.OnExecute = func(info trace.ScriptingExecuteStartInfo) func(trace.ScriptingExecuteDoneInfo) {
 		if d.Details()&trace.ScriptingEvents == 0 {

diff --git a/log/sql.go b/log/sql.go
@@ -13,6 +13,7 @@ func DatabaseSQL(l Logger, d trace.Detailer, opts ...Option) (t trace.DatabaseSQ
 	return internalDatabaseSQL(wrapLogger(l, opts...), d)
 }
 
+//nolint:funlen
 func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 	t.OnConnectorConnect = func(
 		info trace.DatabaseSQLConnectorConnectStartInfo,

diff --git a/log/table.go b/log/table.go
@@ -14,7 +14,7 @@ func Table(l Logger, d trace.Detailer, opts ...Option) (t trace.Table) {
 	return internalTable(wrapLogger(l, opts...), d)
 }
 
-//nolint:gocyclo
+//nolint:gocyclo,funlen
 func internalTable(l *wrapper, d trace.Detailer) (t trace.Table) {
 	t.OnDo = func(
 		info trace.TableDoStartInfo,

diff --git a/log/topic.go b/log/topic.go
@@ -12,7 +12,8 @@ func Topic(l Logger, d trace.Detailer, opts ...Option) (t trace.Topic) {
 	return internalTopic(wrapLogger(l, opts...), d)
 }
 
-func internalTopic(l Logger, d trace.Detailer) (t trace.Topic) { //nolint:gocyclo
+//nolint:gocyclo,funlen
+func internalTopic(l Logger, d trace.Detailer) (t trace.Topic) {
 	t.OnReaderReconnect = func(
 		info trace.TopicReaderReconnectStartInfo,
 	) func(doneInfo trace.TopicReaderReconnectDoneInfo) {