-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1521 from ydb-platform/pool-id
* Added `query.WithPoolID()` execute option
- Loading branch information
Showing
13 changed files
with
246 additions
and
244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| * Added `query.WithPoolID()` execute option | ||
|
|
||
| ## v3.85.1 | ||
| * Added `spans.Retry` constructor of `trace.Retry` | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| package options | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "google.golang.org/grpc" | ||
|
|
||
| "github.com/ydb-platform/ydb-go-sdk/v3/internal/allocator" | ||
| "github.com/ydb-platform/ydb-go-sdk/v3/internal/params" | ||
| internal "github.com/ydb-platform/ydb-go-sdk/v3/internal/query/tx" | ||
| ) | ||
|
|
||
| type txMock func() *internal.Control | ||
|
|
||
| func (tx txMock) txControl() *internal.Control { | ||
| if tx == nil { | ||
| return internal.NewControl(internal.WithTxID("")) | ||
| } | ||
|
|
||
| return tx() | ||
| } | ||
|
|
||
| func TestExecuteSettings(t *testing.T) { | ||
| for _, tt := range []struct { | ||
| name string | ||
| tx txMock | ||
| txOpts []Execute | ||
| settings executeSettings | ||
| }{ | ||
| { | ||
| name: "WithTxID", | ||
| tx: func() *internal.Control { | ||
| return internal.NewControl(internal.WithTxID("test")) | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExecute, | ||
| statsMode: StatsModeNone, | ||
| txControl: internal.NewControl(internal.WithTxID("test")), | ||
| syntax: SyntaxYQL, | ||
| }, | ||
| }, | ||
| { | ||
| name: "WithStats", | ||
| txOpts: []Execute{ | ||
| WithStatsMode(StatsModeFull, nil), | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExecute, | ||
| statsMode: StatsModeFull, | ||
| txControl: internal.NewControl(internal.WithTxID("")), | ||
| syntax: SyntaxYQL, | ||
| }, | ||
| }, | ||
| { | ||
| name: "WithExecMode", | ||
| txOpts: []Execute{ | ||
| WithExecMode(ExecModeExplain), | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExplain, | ||
| statsMode: StatsModeNone, | ||
| txControl: internal.NewControl(internal.WithTxID("")), | ||
| syntax: SyntaxYQL, | ||
| }, | ||
| }, | ||
| { | ||
| name: "WithSyntax", | ||
| txOpts: []Execute{ | ||
| WithSyntax(SyntaxPostgreSQL), | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExecute, | ||
| statsMode: StatsModeNone, | ||
| txControl: internal.NewControl(internal.WithTxID("")), | ||
| syntax: SyntaxPostgreSQL, | ||
| }, | ||
| }, | ||
| { | ||
| name: "WithGrpcOptions", | ||
| txOpts: []Execute{ | ||
| WithCallOptions(grpc.CallContentSubtype("test")), | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExecute, | ||
| statsMode: StatsModeNone, | ||
| txControl: internal.NewControl(internal.WithTxID("")), | ||
| syntax: SyntaxYQL, | ||
| callOptions: []grpc.CallOption{ | ||
| grpc.CallContentSubtype("test"), | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "WithParams", | ||
| txOpts: []Execute{ | ||
| WithParameters( | ||
| params.Builder{}.Param("$a").Text("A").Build(), | ||
| ), | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExecute, | ||
| statsMode: StatsModeNone, | ||
| txControl: internal.NewControl(internal.WithTxID("")), | ||
| syntax: SyntaxYQL, | ||
| params: *params.Builder{}.Param("$a").Text("A").Build(), | ||
| }, | ||
| }, | ||
| { | ||
| name: "WithCommitTx", | ||
| txOpts: []Execute{ | ||
| WithCommit(), | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExecute, | ||
| statsMode: StatsModeNone, | ||
| txControl: internal.NewControl(internal.WithTxID(""), internal.CommitTx()), | ||
| syntax: SyntaxYQL, | ||
| params: nil, | ||
| }, | ||
| }, | ||
| { | ||
| name: "WithPoolID", | ||
| txOpts: []Execute{ | ||
| WithPoolID("test-pool-id"), | ||
| }, | ||
| settings: executeSettings{ | ||
| execMode: ExecModeExecute, | ||
| statsMode: StatsModeNone, | ||
| txControl: internal.NewControl(internal.WithTxID("")), | ||
| syntax: SyntaxYQL, | ||
| poolID: "test-pool-id", | ||
| }, | ||
| }, | ||
| } { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| a := allocator.New() | ||
| settings := ExecuteSettings( | ||
| append( | ||
| []Execute{WithTxControl(tt.tx.txControl())}, | ||
| tt.txOpts..., | ||
| )..., | ||
| ) | ||
| require.Equal(t, tt.settings.Syntax(), settings.Syntax()) | ||
| require.Equal(t, tt.settings.ExecMode(), settings.ExecMode()) | ||
| require.Equal(t, tt.settings.StatsMode(), settings.StatsMode()) | ||
| require.Equal(t, tt.settings.PoolID(), settings.PoolID()) | ||
| require.Equal(t, tt.settings.TxControl().ToYDB(a).String(), settings.TxControl().ToYDB(a).String()) | ||
| require.Equal(t, tt.settings.Params().ToYDB(a), settings.Params().ToYDB(a)) | ||
| require.Equal(t, tt.settings.CallOptions(), settings.CallOptions()) | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.