Skip to content
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

Mask database name #6791

Merged
merged 12 commits into from
Oct 5, 2020
+312 −40
Merged

Mask database name #6791

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9004f97
Added argument to specify keyspace name
GuptaManan100 Sep 28, 2020
5a71ac0
Replaced database name in all fields to KeyspaceName in Execute metho…
GuptaManan100 Sep 28, 2020
007ad55
Added test for StreamExecute which is currently failing
GuptaManan100 Sep 28, 2020
2916ce7
StreamExecute now replaces databaseName with keyspaceName
GuptaManan100 Sep 28, 2020
cdd7063
Added Test for ExecuteBatch Method
GuptaManan100 Sep 28, 2020
9d08d8f
Added Test for BeginExecute Method
GuptaManan100 Sep 28, 2020
9c1c054
Added Test for BeginExecuteBatch Method
GuptaManan100 Sep 28, 2020
1017a96
Added Test for ReserveExecute Method
GuptaManan100 Sep 28, 2020
e47c5a5
Added Test for ReserveBeginExecute Method
GuptaManan100 Sep 28, 2020
ff06a02
Change database names only if they are not already stripped
GuptaManan100 Sep 28, 2020
6854987
Split the test into separate tests
GuptaManan100 Sep 28, 2020
b01ea6e
Removed redundant checks
GuptaManan100 Sep 29, 2020
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
190 changes: 164 additions & 26 deletions go/vt/vttablet/tabletserver/tabletserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2154,7 +2154,7 @@ func TestReserveStats(t *testing.T) {
assert.NotEmpty(t, tsv.te.txPool.env.Stats().UserReservedTimesNs.Counts()["test"])
}

func TestDatabaseNameReplaceByKeyspaceName(t *testing.T) {
func TestDatabaseNameReplaceByKeyspaceNameExecuteMethod(t *testing.T) {
db, tsv := setupTabletServerTest(t, "keyspaceName")
db.SetName("databaseInMysql")
defer tsv.StopService()
Expand All @@ -2180,13 +2180,37 @@ func TestDatabaseNameReplaceByKeyspaceName(t *testing.T) {
// Testing Execute Method
transactionID, _, err := tsv.Begin(ctx, &target, nil)
require.NoError(t, err)
res, err2 := tsv.Execute(ctx, &target, executeSQL, nil, transactionID, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
require.NoError(t, err2)
res, err := tsv.Execute(ctx, &target, executeSQL, nil, transactionID, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
require.NoError(t, err)
for _, field := range res.Fields {
require.Equal(t, "keyspaceName", field.Database)
}
_, err = tsv.Commit(ctx, &target, transactionID)
require.NoError(t, err)
}

func TestDatabaseNameReplaceByKeyspaceNameStreamExecuteMethod(t *testing.T) {
db, tsv := setupTabletServerTest(t, "keyspaceName")
db.SetName("databaseInMysql")
defer tsv.StopService()
defer db.Close()

executeSQL := "select * from test_table limit 1000"
executeSQLResult := &sqltypes.Result{
Fields: []*querypb.Field{
{
Type: sqltypes.VarBinary,
Database: "databaseInMysql",
},
},
RowsAffected: 1,
Rows: [][]sqltypes.Value{
{sqltypes.NewVarBinary("row01")},
},
}
r := db.AddQuery(executeSQL, executeSQLResult)
require.NotNil(t, r)
target := tsv.sm.target

// Testing StreamExecute Method
GuptaManan100 marked this conversation as resolved.
Show resolved Hide resolved
callback := func(res *sqltypes.Result) error {
Expand All @@ -2197,13 +2221,35 @@ func TestDatabaseNameReplaceByKeyspaceName(t *testing.T) {
}
return nil
}
if err := tsv.StreamExecute(ctx, &target, executeSQL, nil, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL}, callback); err != nil {
t.Fatalf("TabletServer.StreamExecute should success: %s, but get error: %v",
executeSQL, err)
err := tsv.StreamExecute(ctx, &target, executeSQL, nil, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL}, callback)
require.NoError(t, err)
}

func TestDatabaseNameReplaceByKeyspaceNameExecuteBatchMethod(t *testing.T) {
db, tsv := setupTabletServerTest(t, "keyspaceName")
db.SetName("databaseInMysql")
defer tsv.StopService()
defer db.Close()

executeSQL := "select * from test_table limit 1000"
executeSQLResult := &sqltypes.Result{
Fields: []*querypb.Field{
{
Type: sqltypes.VarBinary,
Database: "databaseInMysql",
},
},
RowsAffected: 1,
Rows: [][]sqltypes.Value{
{sqltypes.NewVarBinary("row01")},
},
}
r := db.AddQuery(executeSQL, executeSQLResult)
require.NotNil(t, r)
target := tsv.sm.target

// Testing ExecuteBatch Method
if results, err := tsv.ExecuteBatch(ctx, &target, []*querypb.BoundQuery{
results, err := tsv.ExecuteBatch(ctx, &target, []*querypb.BoundQuery{
{
Sql: executeSQL,
BindVariables: nil,
Expand All @@ -2212,27 +2258,73 @@ func TestDatabaseNameReplaceByKeyspaceName(t *testing.T) {
Sql: executeSQL,
BindVariables: nil,
},
}, true, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL}); err != nil {
t.Fatal(err)
} else {
for _, res := range results {
for _, field := range res.Fields {
require.Equal(t, "keyspaceName", field.Database)
}
}, true, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
require.NoError(t, err)
for _, res := range results {
for _, field := range res.Fields {
require.Equal(t, "keyspaceName", field.Database)
}
}
}

func TestDatabaseNameReplaceByKeyspaceNameBeginExecuteMethod(t *testing.T) {
db, tsv := setupTabletServerTest(t, "keyspaceName")
db.SetName("databaseInMysql")
defer tsv.StopService()
defer db.Close()

executeSQL := "select * from test_table limit 1000"
executeSQLResult := &sqltypes.Result{
Fields: []*querypb.Field{
{
Type: sqltypes.VarBinary,
Database: "databaseInMysql",
},
},
RowsAffected: 1,
Rows: [][]sqltypes.Value{
{sqltypes.NewVarBinary("row01")},
},
}
r := db.AddQuery(executeSQL, executeSQLResult)
require.NotNil(t, r)
target := tsv.sm.target

// Test BeginExecute Method
res, transactionID, _, err = tsv.BeginExecute(ctx, &target, nil, executeSQL, nil, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
res, transactionID, _, err := tsv.BeginExecute(ctx, &target, nil, executeSQL, nil, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
require.NoError(t, err)
for _, field := range res.Fields {
require.Equal(t, "keyspaceName", field.Database)
}
_, err = tsv.Commit(ctx, &target, transactionID)
require.NoError(t, err)
}

// Test BeginExecute Method
if results, transactionID, _, err := tsv.BeginExecuteBatch(ctx, &target, []*querypb.BoundQuery{
func TestDatabaseNameReplaceByKeyspaceNameBeginExecuteBatchMethod(t *testing.T) {
db, tsv := setupTabletServerTest(t, "keyspaceName")
db.SetName("databaseInMysql")
defer tsv.StopService()
defer db.Close()

executeSQL := "select * from test_table limit 1000"
executeSQLResult := &sqltypes.Result{
Fields: []*querypb.Field{
{
Type: sqltypes.VarBinary,
Database: "databaseInMysql",
},
},
RowsAffected: 1,
Rows: [][]sqltypes.Value{
{sqltypes.NewVarBinary("row01")},
},
}
r := db.AddQuery(executeSQL, executeSQLResult)
require.NotNil(t, r)
target := tsv.sm.target

// Test BeginExecuteBatch Method
results, transactionID, _, err := tsv.BeginExecuteBatch(ctx, &target, []*querypb.BoundQuery{
{
Sql: executeSQL,
BindVariables: nil,
Expand All @@ -2241,17 +2333,39 @@ func TestDatabaseNameReplaceByKeyspaceName(t *testing.T) {
Sql: executeSQL,
BindVariables: nil,
},
}, false, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL}); err != nil {
t.Fatal(err)
} else {
for _, res := range results {
for _, field := range res.Fields {
require.Equal(t, "keyspaceName", field.Database)
}
}, false, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
require.NoError(t, err)
for _, res := range results {
for _, field := range res.Fields {
require.Equal(t, "keyspaceName", field.Database)
}
_, err = tsv.Commit(ctx, &target, transactionID)
require.NoError(t, err)
}
_, err = tsv.Commit(ctx, &target, transactionID)
require.NoError(t, err)
}

func TestDatabaseNameReplaceByKeyspaceNameReserveExecuteMethod(t *testing.T) {
db, tsv := setupTabletServerTest(t, "keyspaceName")
db.SetName("databaseInMysql")
defer tsv.StopService()
defer db.Close()

executeSQL := "select * from test_table limit 1000"
executeSQLResult := &sqltypes.Result{
Fields: []*querypb.Field{
{
Type: sqltypes.VarBinary,
Database: "databaseInMysql",
},
},
RowsAffected: 1,
Rows: [][]sqltypes.Value{
{sqltypes.NewVarBinary("row01")},
},
}
r := db.AddQuery(executeSQL, executeSQLResult)
require.NotNil(t, r)
target := tsv.sm.target

// Test ReserveExecute
res, rID, _, err := tsv.ReserveExecute(ctx, &target, nil, executeSQL, nil, 0, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
Expand All @@ -2261,6 +2375,30 @@ func TestDatabaseNameReplaceByKeyspaceName(t *testing.T) {
}
err = tsv.Release(ctx, &target, 0, rID)
require.NoError(t, err)
}

func TestDatabaseNameReplaceByKeyspaceNameReserveBeginExecuteMethod(t *testing.T) {
db, tsv := setupTabletServerTest(t, "keyspaceName")
db.SetName("databaseInMysql")
defer tsv.StopService()
defer db.Close()

executeSQL := "select * from test_table limit 1000"
executeSQLResult := &sqltypes.Result{
Fields: []*querypb.Field{
{
Type: sqltypes.VarBinary,
Database: "databaseInMysql",
},
},
RowsAffected: 1,
Rows: [][]sqltypes.Value{
{sqltypes.NewVarBinary("row01")},
},
}
r := db.AddQuery(executeSQL, executeSQLResult)
GuptaManan100 marked this conversation as resolved.
Show resolved Hide resolved
require.NotNil(t, r)
target := tsv.sm.target

// Test for ReserveBeginExecute
res, transactionID, reservedID, _, err := tsv.ReserveBeginExecute(ctx, &target, nil, executeSQL, nil, &querypb.ExecuteOptions{IncludedFields: querypb.ExecuteOptions_ALL})
Expand Down