Skip to content

Commit 92aeba7

Browse files
asmyasnikovasmyasnikov
committed
renamed internal/xsql/iface to internal/xsql/conn + moved internal/xsql/{table,query} into internal/xsql/conn
1 parent 354fa07 commit 92aeba7

37 files changed

+130
-132
lines changed

‎dsn.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/ydb-platform/ydb-go-sdk/v3/internal/dsn"
1313
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
15-
tableSql "github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/table/conn"
15+
tableSql "github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/conn/table/conn"
1616
)
1717

1818
const tablePathPrefixTransformer = "table_path_prefix"

‎dsn_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/ydb-platform/ydb-go-sdk/v3/config"
1010
"github.com/ydb-platform/ydb-go-sdk/v3/internal/bind"
1111
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
12-
conn2 "github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/query/conn"
13-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/table/conn"
12+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/conn/query/conn"
13+
conn3 "github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/conn/table/conn"
1414
)
1515

1616
func TestParse(t *testing.T) {
@@ -26,11 +26,11 @@ func TestParse(t *testing.T) {
2626

2727
return c
2828
}
29-
newTableConn := func(opts ...conn.Option) *conn.Conn {
30-
return conn.New(context.Background(), nil, nil, opts...)
29+
newTableConn := func(opts ...conn3.Option) *conn3.Conn {
30+
return conn3.New(context.Background(), nil, nil, opts...)
3131
}
32-
newQueryConn := func(opts ...conn2.Option) *conn2.Conn {
33-
return conn2.New(context.Background(), nil, nil, opts...)
32+
newQueryConn := func(opts ...conn.Option) *conn.Conn {
33+
return conn.New(context.Background(), nil, nil, opts...)
3434
}
3535
compareConfigs := func(t *testing.T, lhs, rhs *config.Config) {
3636
require.Equal(t, lhs.Secure(), rhs.Secure())
@@ -71,7 +71,7 @@ func TestParse(t *testing.T) {
7171
config.WithDatabase("/local"),
7272
},
7373
connectorOpts: []xsql.Option{
74-
xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
74+
xsql.WithDefaultQueryMode(conn3.ScriptingQueryMode),
7575
},
7676
err: nil,
7777
},
@@ -83,7 +83,7 @@ func TestParse(t *testing.T) {
8383
config.WithDatabase("/local"),
8484
},
8585
connectorOpts: []xsql.Option{
86-
xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
86+
xsql.WithDefaultQueryMode(conn3.ScriptingQueryMode),
8787
xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
8888
},
8989
err: nil,
@@ -96,7 +96,7 @@ func TestParse(t *testing.T) {
9696
config.WithDatabase("/local"),
9797
},
9898
connectorOpts: []xsql.Option{
99-
xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
99+
xsql.WithDefaultQueryMode(conn3.ScriptingQueryMode),
100100
xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
101101
xsql.WithQueryBind(bind.NumericArgs{}),
102102
},
@@ -110,7 +110,7 @@ func TestParse(t *testing.T) {
110110
config.WithDatabase("/local"),
111111
},
112112
connectorOpts: []xsql.Option{
113-
xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
113+
xsql.WithDefaultQueryMode(conn3.ScriptingQueryMode),
114114
xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
115115
xsql.WithQueryBind(bind.PositionalArgs{}),
116116
},
@@ -124,7 +124,7 @@ func TestParse(t *testing.T) {
124124
config.WithDatabase("/local"),
125125
},
126126
connectorOpts: []xsql.Option{
127-
xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
127+
xsql.WithDefaultQueryMode(conn3.ScriptingQueryMode),
128128
xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
129129
xsql.WithQueryBind(bind.AutoDeclare{}),
130130
},
@@ -138,7 +138,7 @@ func TestParse(t *testing.T) {
138138
config.WithDatabase("/local"),
139139
},
140140
connectorOpts: []xsql.Option{
141-
xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
141+
xsql.WithDefaultQueryMode(conn3.ScriptingQueryMode),
142142
xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
143143
},
144144
err: nil,
@@ -151,7 +151,7 @@ func TestParse(t *testing.T) {
151151
config.WithDatabase("/local"),
152152
},
153153
connectorOpts: []xsql.Option{
154-
xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
154+
xsql.WithDefaultQueryMode(conn3.ScriptingQueryMode),
155155
xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
156156
xsql.WithQueryBind(bind.PositionalArgs{}),
157157
xsql.WithQueryBind(bind.AutoDeclare{}),
@@ -166,8 +166,8 @@ func TestParse(t *testing.T) {
166166
config.WithDatabase("/local"),
167167
},
168168
connectorOpts: []xsql.Option{
169-
xsql.WithFakeTx(conn.ScriptingQueryMode),
170-
xsql.WithFakeTx(conn.SchemeQueryMode),
169+
xsql.WithFakeTx(conn3.ScriptingQueryMode),
170+
xsql.WithFakeTx(conn3.SchemeQueryMode),
171171
},
172172
err: nil,
173173
},

‎internal/xsql/conn.go

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
1818
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1919
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xslices"
20-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/iface"
20+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/conn"
2121
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
2222
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
2323
"github.com/ydb-platform/ydb-go-sdk/v3/scheme"
@@ -26,14 +26,14 @@ import (
2626
)
2727

2828
var (
29-
_ driver.ConnBeginTx = (*conn)(nil)
30-
_ driver.NamedValueChecker = (*conn)(nil)
31-
_ driver.Pinger = (*conn)(nil)
29+
_ driver.ConnBeginTx = (*connWrapper)(nil)
30+
_ driver.NamedValueChecker = (*connWrapper)(nil)
31+
_ driver.Pinger = (*connWrapper)(nil)
3232
)
3333

3434
type (
35-
conn struct {
36-
cc iface.Conn
35+
connWrapper struct {
36+
cc conn.Conn
3737

3838
connector *Connector
3939
lastUsage xsync.LastUsage
@@ -44,16 +44,16 @@ type (
4444
}
4545
)
4646

47-
func (c *conn) Ping(ctx context.Context) error {
47+
func (c *connWrapper) Ping(ctx context.Context) error {
4848
return c.cc.Ping(ctx)
4949
}
5050

51-
func (c *conn) CheckNamedValue(value *driver.NamedValue) error {
51+
func (c *connWrapper) CheckNamedValue(value *driver.NamedValue) error {
5252
// on this stage allows all values
5353
return nil
5454
}
5555

56-
func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
56+
func (c *connWrapper) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
5757
tx, err := c.cc.BeginTx(ctx, opts)
5858
if err != nil {
5959
return nil, xerrors.WithStackTrace(err)
@@ -66,7 +66,7 @@ func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, e
6666
}, nil
6767
}
6868

69-
func (c *conn) Close() error {
69+
func (c *connWrapper) Close() error {
7070
err := c.cc.Close()
7171
if err != nil {
7272
return xerrors.WithStackTrace(err)
@@ -75,7 +75,7 @@ func (c *conn) Close() error {
7575
return nil
7676
}
7777

78-
func (c *conn) Begin() (driver.Tx, error) {
78+
func (c *connWrapper) Begin() (driver.Tx, error) {
7979
return nil, xerrors.WithStackTrace(errDeprecated)
8080
}
8181

@@ -118,13 +118,13 @@ func (r *singleRow) Next(dst []driver.Value) error {
118118
return nil
119119
}
120120

121-
func (c *conn) Prepare(string) (driver.Stmt, error) {
121+
func (c *connWrapper) Prepare(string) (driver.Stmt, error) {
122122
return nil, errDeprecated
123123
}
124124

125-
func (c *conn) PrepareContext(ctx context.Context, sql string) (_ driver.Stmt, finalErr error) {
125+
func (c *connWrapper) PrepareContext(ctx context.Context, sql string) (_ driver.Stmt, finalErr error) {
126126
onDone := trace.DatabaseSQLOnConnPrepare(c.connector.Trace(), &ctx,
127-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql.(*conn).PrepareContext"),
127+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql.(*connWrapper).PrepareContext"),
128128
sql,
129129
)
130130
defer func() {
@@ -143,11 +143,11 @@ func (c *conn) PrepareContext(ctx context.Context, sql string) (_ driver.Stmt, f
143143
}, nil
144144
}
145145

146-
func (c *conn) LastUsage() time.Time {
146+
func (c *connWrapper) LastUsage() time.Time {
147147
return c.lastUsage.Get()
148148
}
149149

150-
func (c *conn) normalize(q string, args ...driver.NamedValue) (query string, _ *params.Params, _ error) {
150+
func (c *connWrapper) normalize(q string, args ...driver.NamedValue) (query string, _ *params.Params, _ error) {
151151
queryArgs := make([]any, len(args))
152152
for i := range args {
153153
queryArgs[i] = args[i]
@@ -163,7 +163,7 @@ func (c *conn) normalize(q string, args ...driver.NamedValue) (query string, _ *
163163
return sql, &params, nil
164164
}
165165

166-
func (c *conn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
166+
func (c *connWrapper) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
167167
done := c.lastUsage.Start()
168168
defer done()
169169

@@ -184,7 +184,7 @@ func (c *conn) QueryContext(ctx context.Context, query string, args []driver.Nam
184184
return c.cc.Query(ctx, query, params)
185185
}
186186

187-
func (c *conn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
187+
func (c *connWrapper) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
188188
done := c.lastUsage.Start()
189189
defer done()
190190

@@ -196,15 +196,15 @@ func (c *conn) ExecContext(ctx context.Context, query string, args []driver.Name
196196
return c.cc.Exec(ctx, query, params)
197197
}
198198

199-
func (c *conn) GetDatabaseName() string {
199+
func (c *connWrapper) GetDatabaseName() string {
200200
return c.connector.Name()
201201
}
202202

203-
func (c *conn) normalizePath(tableName string) string {
203+
func (c *connWrapper) normalizePath(tableName string) string {
204204
return c.connector.pathNormalizer.NormalizePath(tableName)
205205
}
206206

207-
func (c *conn) tableDescription(ctx context.Context, tableName string) (d options.Description, _ error) {
207+
func (c *connWrapper) tableDescription(ctx context.Context, tableName string) (d options.Description, _ error) {
208208
d, err := retry.RetryWithResult(ctx, func(ctx context.Context) (options.Description, error) {
209209
return internalTable.Session(c.cc.ID(), c.connector.balancer, config.New()).DescribeTable(ctx, tableName)
210210
}, retry.WithIdempotent(true), retry.WithBudget(c.connector.retryBudget), retry.WithTrace(c.connector.traceRetry))
@@ -215,7 +215,7 @@ func (c *conn) tableDescription(ctx context.Context, tableName string) (d option
215215
return d, nil
216216
}
217217

218-
func (c *conn) GetColumns(ctx context.Context, tableName string) (columns []string, _ error) {
218+
func (c *connWrapper) GetColumns(ctx context.Context, tableName string) (columns []string, _ error) {
219219
d, err := c.tableDescription(ctx, c.normalizePath(tableName))
220220
if err != nil {
221221
return nil, xerrors.WithStackTrace(err)
@@ -228,7 +228,7 @@ func (c *conn) GetColumns(ctx context.Context, tableName string) (columns []stri
228228
return columns, nil
229229
}
230230

231-
func (c *conn) GetColumnType(ctx context.Context, tableName, columnName string) (dataType string, _ error) {
231+
func (c *connWrapper) GetColumnType(ctx context.Context, tableName, columnName string) (dataType string, _ error) {
232232
d, err := c.tableDescription(ctx, c.normalizePath(tableName))
233233
if err != nil {
234234
return "", xerrors.WithStackTrace(err)
@@ -243,7 +243,7 @@ func (c *conn) GetColumnType(ctx context.Context, tableName, columnName string)
243243
return "", xerrors.WithStackTrace(fmt.Errorf("column '%s' not exist in table '%s'", columnName, tableName))
244244
}
245245

246-
func (c *conn) GetPrimaryKeys(ctx context.Context, tableName string) ([]string, error) {
246+
func (c *connWrapper) GetPrimaryKeys(ctx context.Context, tableName string) ([]string, error) {
247247
d, err := c.tableDescription(ctx, c.normalizePath(tableName))
248248
if err != nil {
249249
return nil, xerrors.WithStackTrace(err)
@@ -252,7 +252,7 @@ func (c *conn) GetPrimaryKeys(ctx context.Context, tableName string) ([]string,
252252
return d.PrimaryKey, nil
253253
}
254254

255-
func (c *conn) IsPrimaryKey(ctx context.Context, tableName, columnName string) (ok bool, _ error) {
255+
func (c *connWrapper) IsPrimaryKey(ctx context.Context, tableName, columnName string) (ok bool, _ error) {
256256
d, err := c.tableDescription(ctx, c.normalizePath(tableName))
257257
if err != nil {
258258
return false, xerrors.WithStackTrace(err)
@@ -267,7 +267,7 @@ func (c *conn) IsPrimaryKey(ctx context.Context, tableName, columnName string) (
267267
return false, nil
268268
}
269269

270-
func (c *conn) Version(_ context.Context) (_ string, _ error) {
270+
func (c *connWrapper) Version(_ context.Context) (_ string, _ error) {
271271
const version = "default"
272272

273273
return version, nil
@@ -286,7 +286,7 @@ func isSysDir(databaseName, dirAbsPath string) bool {
286286
return false
287287
}
288288

289-
func (c *conn) getTables(ctx context.Context, absPath string, recursive, excludeSysDirs bool) (
289+
func (c *connWrapper) getTables(ctx context.Context, absPath string, recursive, excludeSysDirs bool) (
290290
tables []string, _ error,
291291
) {
292292
if excludeSysDirs && isSysDir(c.connector.Name(), absPath) {
@@ -320,7 +320,7 @@ func (c *conn) getTables(ctx context.Context, absPath string, recursive, exclude
320320
return tables, nil
321321
}
322322

323-
func (c *conn) GetTables(ctx context.Context, folder string, recursive, excludeSysDirs bool) (
323+
func (c *connWrapper) GetTables(ctx context.Context, folder string, recursive, excludeSysDirs bool) (
324324
tables []string, _ error,
325325
) {
326326
absPath := c.normalizePath(folder)
@@ -349,7 +349,7 @@ func (c *conn) GetTables(ctx context.Context, folder string, recursive, excludeS
349349
}
350350
}
351351

352-
func (c *conn) GetIndexes(ctx context.Context, tableName string) (indexes []string, _ error) {
352+
func (c *connWrapper) GetIndexes(ctx context.Context, tableName string) (indexes []string, _ error) {
353353
d, err := c.tableDescription(ctx, c.normalizePath(tableName))
354354
if err != nil {
355355
return nil, xerrors.WithStackTrace(err)
@@ -360,7 +360,7 @@ func (c *conn) GetIndexes(ctx context.Context, tableName string) (indexes []stri
360360
}), nil
361361
}
362362

363-
func (c *conn) GetIndexColumns(ctx context.Context, tableName, indexName string) (columns []string, _ error) {
363+
func (c *connWrapper) GetIndexColumns(ctx context.Context, tableName, indexName string) (columns []string, _ error) {
364364
d, err := c.tableDescription(ctx, c.normalizePath(tableName))
365365
if err != nil {
366366
return nil, xerrors.WithStackTrace(err)
@@ -375,7 +375,7 @@ func (c *conn) GetIndexColumns(ctx context.Context, tableName, indexName string)
375375
return xslices.Uniq(columns), nil
376376
}
377377

378-
func (c *conn) IsColumnExists(ctx context.Context, tableName, columnName string) (columnExists bool, _ error) {
378+
func (c *connWrapper) IsColumnExists(ctx context.Context, tableName, columnName string) (columnExists bool, _ error) {
379379
d, err := c.tableDescription(ctx, c.normalizePath(tableName))
380380
if err != nil {
381381
return false, xerrors.WithStackTrace(err)
@@ -390,10 +390,10 @@ func (c *conn) IsColumnExists(ctx context.Context, tableName, columnName string)
390390
return false, nil
391391
}
392392

393-
func (c *conn) IsTableExists(ctx context.Context, tableName string) (tableExists bool, finalErr error) {
393+
func (c *connWrapper) IsTableExists(ctx context.Context, tableName string) (tableExists bool, finalErr error) {
394394
tableName = c.normalizePath(tableName)
395395
onDone := trace.DatabaseSQLOnConnIsTableExists(c.connector.trace, &ctx,
396-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql.(*conn).IsTableExists"),
396+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql.(*connWrapper).IsTableExists"),
397397
tableName,
398398
)
399399
defer func() {

‎internal/xsql/iface/conn.go renamed to ‎internal/xsql/conn/conn.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package iface
1+
package conn
22

33
import (
44
"context"

‎internal/xsql/query/conn/conn.go renamed to ‎internal/xsql/conn/query/conn/conn.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/ydb-platform/ydb-go-sdk/v3/internal/stats"
1313
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
15-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/iface"
15+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/conn"
1616
)
1717

1818
type resultNoRows struct{}
@@ -113,7 +113,7 @@ func (c *Conn) isReady() bool {
113113
return c.session.Status() == session.StatusIdle.String()
114114
}
115115

116-
func (c *Conn) beginTx(ctx context.Context, txOptions driver.TxOptions) (tx iface.Tx, finalErr error) {
116+
func (c *Conn) beginTx(ctx context.Context, txOptions driver.TxOptions) (tx conn.Tx, finalErr error) {
117117
tx, err := beginTx(ctx, c, txOptions)
118118
if err != nil {
119119
return nil, xerrors.WithStackTrace(err)
@@ -144,7 +144,7 @@ func (c *Conn) Ping(ctx context.Context) (finalErr error) {
144144
return err
145145
}
146146

147-
func (c *Conn) BeginTx(ctx context.Context, txOptions driver.TxOptions) (iface.Tx, error) {
147+
func (c *Conn) BeginTx(ctx context.Context, txOptions driver.TxOptions) (conn.Tx, error) {
148148
tx, err := c.beginTx(ctx, txOptions)
149149
if err != nil {
150150
return nil, xerrors.WithStackTrace(err)

‎internal/xsql/query/conn/errors.go renamed to ‎internal/xsql/conn/query/conn/errors.go

File renamed without changes.

‎internal/xsql/query/conn/isolation/isolation.go renamed to ‎internal/xsql/conn/query/conn/isolation/isolation.go

File renamed without changes.

‎internal/xsql/query/conn/options.go renamed to ‎internal/xsql/conn/query/conn/options.go

File renamed without changes.

‎internal/xsql/query/conn/rows.go renamed to ‎internal/xsql/conn/query/conn/rows.go

File renamed without changes.

0 commit comments

Comments
 (0)