Skip to content

crud: support schema opts #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 14, 2023
Merged

crud: support schema opts #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdc8ed6
crud: remove redundant name
DifferentialOrange Nov 8, 2023
9a58dc8
doc: fix crud.SchemaRequest methods
DifferentialOrange Nov 8, 2023
4d804ab
crud: support schema opts
DifferentialOrange Nov 8, 2023
6bfaa86
test: check crud vshard_router option encoding
DifferentialOrange Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
- Support `operation_data` in `crud.Error` (#330)
- Support `fetch_latest_metadata` option for crud requests with metadata (#335)
- Support `noreturn` option for data change crud requests (#335)
- Support `crud.schema` request (#336)
- Support `crud.schema` request (#336, #351)
- Support `IPROTO_WATCH_ONCE` request type for Tarantool
version >= 3.0.0-alpha1 (#337)
- Support `yield_every` option for crud select requests (#350)
Expand Down
2 changes: 1 addition & 1 deletion crud/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const (
batchSizeOptName = "batch_size"
fetchLatestMetadataOptName = "fetch_latest_metadata"
noreturnOptName = "noreturn"
yieldEvery = "yield_every"
cachedOptName = "cached"
)

// OptUint is an optional uint.
Expand Down
300 changes: 300 additions & 0 deletions crud/request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ func TestRequestsCodes(t *testing.T) {
{req: crud.MakeCountRequest(validSpace), rtype: CrudRequestType},
{req: crud.MakeStorageInfoRequest(), rtype: CrudRequestType},
{req: crud.MakeStatsRequest(), rtype: CrudRequestType},
{req: crud.MakeSchemaRequest(), rtype: CrudRequestType},
}

for _, test := range tests {
Expand Down Expand Up @@ -231,6 +232,7 @@ func TestRequestsAsync(t *testing.T) {
{req: crud.MakeCountRequest(validSpace), async: false},
{req: crud.MakeStorageInfoRequest(), async: false},
{req: crud.MakeStatsRequest(), async: false},
{req: crud.MakeSchemaRequest(), async: false},
}

for _, test := range tests {
Expand Down Expand Up @@ -268,6 +270,7 @@ func TestRequestsCtx_default(t *testing.T) {
{req: crud.MakeCountRequest(validSpace), expected: nil},
{req: crud.MakeStorageInfoRequest(), expected: nil},
{req: crud.MakeStatsRequest(), expected: nil},
{req: crud.MakeSchemaRequest(), expected: nil},
}

for _, test := range tests {
Expand Down Expand Up @@ -306,6 +309,7 @@ func TestRequestsCtx_setter(t *testing.T) {
{req: crud.MakeCountRequest(validSpace).Context(ctx), expected: ctx},
{req: crud.MakeStorageInfoRequest().Context(ctx), expected: ctx},
{req: crud.MakeStatsRequest().Context(ctx), expected: ctx},
{req: crud.MakeSchemaRequest().Context(ctx), expected: ctx},
}

for _, test := range tests {
Expand Down Expand Up @@ -462,6 +466,12 @@ func TestRequestsDefaultValues(t *testing.T) {
[]interface{}{}),
target: crud.MakeStatsRequest(),
},
{
name: "SchemaRequest",
ref: tarantool.NewCall17Request("crud.schema").Args(
[]interface{}{nil, map[string]interface{}{}}),
target: crud.MakeSchemaRequest(),
},
}

for _, tc := range testCases {
Expand Down Expand Up @@ -624,6 +634,296 @@ func TestRequestsSetters(t *testing.T) {
[]interface{}{spaceName}),
target: crud.MakeStatsRequest().Space(spaceName),
},
{
name: "SchemaRequest",
ref: tarantool.NewCall17Request("crud.schema").Args(
[]interface{}{nil, schemaOpts},
),
target: crud.MakeSchemaRequest().Opts(schemaOpts),
},
{
name: "SchemaRequestWithSpace",
ref: tarantool.NewCall17Request("crud.schema").Args(
[]interface{}{spaceName, schemaOpts},
),
target: crud.MakeSchemaRequest().Space(spaceName).Opts(schemaOpts),
},
}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assertBodyEqual(t, tc.ref, tc.target)
})
}
}

func TestRequestsVshardRouter(t *testing.T) {
testCases := []struct {
name string
ref tarantool.Request
target tarantool.Request
}{
{
name: "InsertRequest",
ref: tarantool.NewCall17Request("crud.insert").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeInsertRequest(validSpace).Opts(crud.InsertOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "InsertObjectRequest",
ref: tarantool.NewCall17Request("crud.insert_object").Args([]interface{}{
validSpace,
map[string]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeInsertObjectRequest(validSpace).Opts(crud.InsertObjectOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "InsertManyRequest",
ref: tarantool.NewCall17Request("crud.insert_many").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeInsertManyRequest(validSpace).Opts(crud.InsertManyOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "InsertObjectManyRequest",
ref: tarantool.NewCall17Request("crud.insert_object_many").Args([]interface{}{
validSpace,
[]map[string]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeInsertObjectManyRequest(validSpace).Opts(crud.InsertObjectManyOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "GetRequest",
ref: tarantool.NewCall17Request("crud.get").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeGetRequest(validSpace).Opts(crud.GetOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "UpdateRequest",
ref: tarantool.NewCall17Request("crud.update").Args([]interface{}{
validSpace,
[]interface{}{},
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeUpdateRequest(validSpace).Opts(crud.UpdateOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "DeleteRequest",
ref: tarantool.NewCall17Request("crud.delete").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeDeleteRequest(validSpace).Opts(crud.DeleteOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "ReplaceRequest",
ref: tarantool.NewCall17Request("crud.replace").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeReplaceRequest(validSpace).Opts(crud.ReplaceOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "ReplaceObjectRequest",
ref: tarantool.NewCall17Request("crud.replace_object").Args([]interface{}{
validSpace,
map[string]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeReplaceObjectRequest(validSpace).Opts(crud.ReplaceObjectOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "ReplaceManyRequest",
ref: tarantool.NewCall17Request("crud.replace_many").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeReplaceManyRequest(validSpace).Opts(crud.ReplaceManyOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "ReplaceObjectManyRequest",
ref: tarantool.NewCall17Request("crud.replace_object_many").Args([]interface{}{
validSpace,
[]map[string]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeReplaceObjectManyRequest(validSpace).Opts(crud.ReplaceObjectManyOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "UpsertRequest",
ref: tarantool.NewCall17Request("crud.upsert").Args([]interface{}{
validSpace,
[]interface{}{},
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeUpsertRequest(validSpace).Opts(crud.UpsertOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "UpsertObjectRequest",
ref: tarantool.NewCall17Request("crud.upsert_object").Args([]interface{}{
validSpace,
map[string]interface{}{},
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeUpsertObjectRequest(validSpace).Opts(crud.UpsertObjectOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "UpsertManyRequest",
ref: tarantool.NewCall17Request("crud.upsert_many").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeUpsertManyRequest(validSpace).Opts(crud.UpsertManyOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "UpsertObjectManyRequest",
ref: tarantool.NewCall17Request("crud.upsert_object_many").Args([]interface{}{
validSpace,
[]interface{}{},
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeUpsertObjectManyRequest(validSpace).Opts(crud.UpsertObjectManyOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "SelectRequest",
ref: tarantool.NewCall17Request("crud.select").Args([]interface{}{
validSpace,
nil,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeSelectRequest(validSpace).Opts(crud.SelectOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "MinRequest",
ref: tarantool.NewCall17Request("crud.min").Args([]interface{}{
validSpace,
nil,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeMinRequest(validSpace).Opts(crud.MinOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "MaxRequest",
ref: tarantool.NewCall17Request("crud.max").Args([]interface{}{
validSpace,
nil,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeMaxRequest(validSpace).Opts(crud.MaxOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "TruncateRequest",
ref: tarantool.NewCall17Request("crud.truncate").Args([]interface{}{
validSpace,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeTruncateRequest(validSpace).Opts(crud.TruncateOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "LenRequest",
ref: tarantool.NewCall17Request("crud.len").Args([]interface{}{
validSpace,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeLenRequest(validSpace).Opts(crud.LenOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "CountRequest",
ref: tarantool.NewCall17Request("crud.count").Args([]interface{}{
validSpace,
nil,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeCountRequest(validSpace).Opts(crud.CountOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "StorageInfoRequest",
ref: tarantool.NewCall17Request("crud.storage_info").Args([]interface{}{
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeStorageInfoRequest().Opts(crud.StorageInfoOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "SchemaRequest",
ref: tarantool.NewCall17Request("crud.schema").Args([]interface{}{
nil,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeSchemaRequest().Opts(crud.SchemaOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
{
name: "SchemaRequestWithSpace",
ref: tarantool.NewCall17Request("crud.schema").Args([]interface{}{
validSpace,
map[string]interface{}{"vshard_router": "custom_router"},
}),
target: crud.MakeSchemaRequest().Space(validSpace).Opts(crud.SchemaOpts{
VshardRouter: crud.MakeOptString("custom_router"),
}),
},
}

for _, tc := range testCases {
Expand Down
Loading