From 01245a19250a6f375870d9ef753473aa2da1086f Mon Sep 17 00:00:00 2001 From: Denis Mulin Date: Mon, 11 Dec 2023 15:32:40 +0300 Subject: [PATCH] fix linter fix linter --- examples/.golangci.yml | 3 +++ internal/balancer/connections_state_test.go | 1 + internal/version/parse_test.go | 1 + internal/xsql/conn.go | 30 --------------------- log/sql.go | 1 + log/table.go | 2 +- tests/slo/.golangci.yml | 3 +++ 7 files changed, 10 insertions(+), 31 deletions(-) create mode 100644 examples/.golangci.yml create mode 100644 tests/slo/.golangci.yml diff --git a/examples/.golangci.yml b/examples/.golangci.yml new file mode 100644 index 000000000..b24f3e612 --- /dev/null +++ b/examples/.golangci.yml @@ -0,0 +1,3 @@ +linters: + disable: + - forbidgo \ No newline at end of file diff --git a/internal/balancer/connections_state_test.go b/internal/balancer/connections_state_test.go index b052b3933..53e59df56 100644 --- a/internal/balancer/connections_state_test.go +++ b/internal/balancer/connections_state_test.go @@ -241,6 +241,7 @@ func TestSelectRandomConnection(t *testing.T) { }) } +//nolint:dupl func TestNewState(t *testing.T) { table := []struct { name string diff --git a/internal/version/parse_test.go b/internal/version/parse_test.go index eade4b7ad..cc1f480ec 100644 --- a/internal/version/parse_test.go +++ b/internal/version/parse_test.go @@ -65,6 +65,7 @@ func TestParse(t *testing.T) { } } +//nolint:dupl func TestLt(t *testing.T) { for _, tt := range []struct { lhs string diff --git a/internal/xsql/conn.go b/internal/xsql/conn.go index b5a52fd71..d3b9ee887 100644 --- a/internal/xsql/conn.go +++ b/internal/xsql/conn.go @@ -759,36 +759,6 @@ func (c *conn) GetTables(ctx context.Context, folder string, recursive, excludeS } } -func (c *conn) GetIndexes(ctx context.Context, tableName string) (indexes []string, _ error) { - tableName = c.normalizePath(tableName) - tableExists, err := helpers.IsEntryExists(ctx, - c.connector.parent.Scheme(), tableName, - scheme.EntryTable, scheme.EntryColumnTable, - ) - if err != nil { - return nil, xerrors.WithStackTrace(err) - } - if !tableExists { - return nil, xerrors.WithStackTrace(fmt.Errorf("table '%s' not exist", tableName)) - } - - err = retry.Retry(ctx, func(ctx context.Context) (err error) { - desc, err := c.session.DescribeTable(ctx, tableName) - if err != nil { - return err - } - for i := range desc.Indexes { - indexes = append(indexes, desc.Indexes[i].Name) - } - return nil - }, retry.WithIdempotent(true)) - if err != nil { - return nil, xerrors.WithStackTrace(err) - } - - return indexes, nil -} - func (c *conn) GetIndexColumns(ctx context.Context, tableName, indexName string) (columns []string, _ error) { tableName = c.normalizePath(tableName) tableExists, err := helpers.IsEntryExists(ctx, diff --git a/log/sql.go b/log/sql.go index a89994b37..cc8983253 100644 --- 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:dupl 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 index 0570dcbf1..92121fdd9 100644 --- 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, dupl func internalTable(l *wrapper, d trace.Detailer) (t trace.Table) { t.OnDo = func( info trace.TableDoStartInfo, diff --git a/tests/slo/.golangci.yml b/tests/slo/.golangci.yml new file mode 100644 index 000000000..b24f3e612 --- /dev/null +++ b/tests/slo/.golangci.yml @@ -0,0 +1,3 @@ +linters: + disable: + - forbidgo \ No newline at end of file