Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Commit

Permalink
Add option to GetSchema to only send the row count and data length ov…
Browse files Browse the repository at this point in the history
…er the wire (vitessio#6985)

* Add option to GetSchema to only send the row count and data length over the wire

Signed-off-by: Andrew Mason <[email protected]>

* Update help text to clarify behavior

Signed-off-by: Andrew Mason <[email protected]>

* Add endtoend test for vtctl GetSchema

Signed-off-by: Andrew Mason <[email protected]>

* Alias the proto imports

Signed-off-by: Andrew Mason <[email protected]>

* Format imports to match vtctl.go

Signed-off-by: Andrew Mason <[email protected]>
  • Loading branch information
ajm188 committed Dec 1, 2020
1 parent 86a5bd9 commit 0e5b756
Show file tree
Hide file tree
Showing 2 changed files with 253 additions and 0 deletions.
235 changes: 235 additions & 0 deletions go/vt/vtctl/endtoend/get_schema_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
package endtoend

import (
"context"
"fmt"
"testing"

"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"vitess.io/vitess/go/json2"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/topo/memorytopo"
"vitess.io/vitess/go/vt/topo/topoproto"
"vitess.io/vitess/go/vt/vtctl"
"vitess.io/vitess/go/vt/vttablet/faketmclient"
"vitess.io/vitess/go/vt/vttablet/tmclient"
"vitess.io/vitess/go/vt/wrangler"

querypb "vitess.io/vitess/go/vt/proto/query"
tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
)

type fakeTabletManagerClient struct {
tmclient.TabletManagerClient
schemas map[string]*tabletmanagerdatapb.SchemaDefinition
}

func newTMClient() *fakeTabletManagerClient {
return &fakeTabletManagerClient{
TabletManagerClient: faketmclient.NewFakeTabletManagerClient(),
schemas: map[string]*tabletmanagerdatapb.SchemaDefinition{},
}
}

func (c *fakeTabletManagerClient) GetSchema(ctx context.Context, tablet *topodatapb.Tablet, tablets []string, excludeTables []string, includeViews bool) (*tabletmanagerdatapb.SchemaDefinition, error) {
key := topoproto.TabletAliasString(tablet.Alias)

schema, ok := c.schemas[key]
if !ok {
return nil, fmt.Errorf("no schemas for %s", key)
}

return schema, nil
}

func TestGetSchema(t *testing.T) {
ctx := context.Background()

topo := memorytopo.NewServer("zone1", "zone2", "zone3")

tablet := &topodatapb.Tablet{
Alias: &topodatapb.TabletAlias{
Cell: "zone1",
Uid: uuid.New().ID(),
},
Hostname: "abcd",
Keyspace: "testkeyspace",
Shard: "-",
Type: topodatapb.TabletType_MASTER,
}
require.NoError(t, topo.CreateTablet(ctx, tablet))

sd := &tabletmanagerdatapb.SchemaDefinition{
TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
{
Name: "foo",
RowCount: 1000,
DataLength: 1000000,
Schema: `CREATE TABLE foo (
id INT(11) NOT NULL,
name VARCHAR(255) NOT NULL,
PRIMARY KEY(id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`,
Columns: []string{
"id",
"name",
},
PrimaryKeyColumns: []string{
"id",
},
Fields: []*querypb.Field{
{
Name: "id",
Type: querypb.Type_INT32,
Table: "foo",
OrgTable: "foo",
Database: "vt_testkeyspace",
OrgName: "id",
ColumnLength: 11,
Charset: 63,
Decimals: 0,
},
{
Name: "name",
Type: querypb.Type_VARCHAR,
Table: "foo",
OrgTable: "foo",
Database: "vt_testkeyspace",
OrgName: "name",
ColumnLength: 1020,
Charset: 45,
Decimals: 0,
},
},
},
{
Name: "bar",
RowCount: 1,
DataLength: 10,
Schema: `CREATE TABLE bar (
id INT(11) NOT NULL
foo_id INT(11) NOT NULL
is_active TINYINT(1) NOT NULL DEFAULT 1
) ENGINE=InnoDB`,
Columns: []string{
"id",
"foo_id",
"is_active",
},
PrimaryKeyColumns: []string{
"id",
},
Fields: []*querypb.Field{
{
Name: "id",
Type: querypb.Type_INT32,
Table: "bar",
OrgTable: "bar",
Database: "vt_testkeyspace",
OrgName: "id",
ColumnLength: 11,
Charset: 63,
Decimals: 0,
},
{
Name: "foo_id",
Type: querypb.Type_INT32,
Table: "bar",
OrgTable: "bar",
Database: "vt_testkeyspace",
OrgName: "foo_id",
ColumnLength: 11,
Charset: 63,
Decimals: 0,
},
{
Name: "is_active",
Type: querypb.Type_INT8,
Table: "bar",
OrgTable: "bar",
Database: "vt_testkeyspace",
OrgName: "is_active",
ColumnLength: 1,
Charset: 63,
Decimals: 0,
},
},
},
},
}

tmc := newTMClient()
tmc.schemas[topoproto.TabletAliasString(tablet.Alias)] = sd

logger := logutil.NewMemoryLogger()

err := vtctl.RunCommand(ctx, wrangler.New(logger, topo, tmc), []string{
"GetSchema",
topoproto.TabletAliasString(tablet.Alias),
})
require.NoError(t, err)

events := logger.Events
assert.Equal(t, 1, len(events), "expected 1 event from GetSchema")
val := events[0].Value

actual := &tabletmanagerdatapb.SchemaDefinition{}
err = json2.Unmarshal([]byte(val), actual)
require.NoError(t, err)

assert.Equal(t, sd, actual)

// reset for the next invocation, where we verify that passing
// -table_sizes_only does not include the create table statement or columns.
logger.Events = nil
sd = &tabletmanagerdatapb.SchemaDefinition{
TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
{
Name: "foo",
RowCount: 1000,
DataLength: 1000000,
Columns: []string{},
PrimaryKeyColumns: []string{},
Fields: []*querypb.Field{},
},
{
Name: "bar",
RowCount: 1,
DataLength: 10,
Columns: []string{},
PrimaryKeyColumns: []string{},
Fields: []*querypb.Field{},
},
},
}

err = vtctl.RunCommand(ctx, wrangler.New(logger, topo, tmc), []string{
"GetSchema",
"-table_sizes_only",
topoproto.TabletAliasString(tablet.Alias),
})
require.NoError(t, err)

events = logger.Events
assert.Equal(t, 1, len(events), "expected 1 event from GetSchema")
val = events[0].Value

actual = &tabletmanagerdatapb.SchemaDefinition{}
err = json2.Unmarshal([]byte(val), actual)
require.NoError(t, err)

assert.Equal(t, sd, actual)
}

func init() {
// enforce we will use the right protocol (gRPC) (note the
// client is unused, but it is initialized, so it needs to exist)
*tmclient.TabletManagerProtocol = "grpc"
tmclient.RegisterTabletManagerClientFactory("grpc", func() tmclient.TabletManagerClient {
return nil
})
}
18 changes: 18 additions & 0 deletions go/vt/vtctl/vtctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ import (
"vitess.io/vitess/go/vt/wrangler"

replicationdatapb "vitess.io/vitess/go/vt/proto/replicationdata"
tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
vschemapb "vitess.io/vitess/go/vt/proto/vschema"
vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
Expand Down Expand Up @@ -2275,6 +2276,8 @@ func commandGetSchema(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag
excludeTables := subFlags.String("exclude_tables", "", "Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/")
includeViews := subFlags.Bool("include-views", false, "Includes views in the output")
tableNamesOnly := subFlags.Bool("table_names_only", false, "Only displays table names that match")
tableSizesOnly := subFlags.Bool("table_sizes_only", false, "Only displays size information for tables. Ignored if -table_names_only is passed.")

if err := subFlags.Parse(args); err != nil {
return err
}
Expand Down Expand Up @@ -2304,6 +2307,21 @@ func commandGetSchema(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag
}
return nil
}

if *tableSizesOnly {
sizeTds := make([]*tabletmanagerdatapb.TableDefinition, len(sd.TableDefinitions))
for i, td := range sd.TableDefinitions {
sizeTds[i] = &tabletmanagerdatapb.TableDefinition{
Name: td.Name,
Type: td.Type,
RowCount: td.RowCount,
DataLength: td.DataLength,
}
}

sd.TableDefinitions = sizeTds
}

return printJSON(wr.Logger(), sd)
}

Expand Down

0 comments on commit 0e5b756

Please sign in to comment.