Skip to content

Commit

Permalink
Merge pull request #4563 from xichengliudui/fix19012905
Browse files Browse the repository at this point in the history
Update comments in functions
  • Loading branch information
sougou authored Jan 29, 2019
2 parents 79a5b2d + 4a5d58e commit f306a24
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions go/vt/binlog/binlogplayertest/player.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ var testBinlogTransaction = &binlogdatapb.BinlogTransaction{
},
}

// StreamKeyRange is part of the the UpdateStream interface
// StreamKeyRange is part of the UpdateStream interface
func (fake *FakeBinlogStreamer) StreamKeyRange(ctx context.Context, position string, keyRange *topodatapb.KeyRange, charset *binlogdatapb.Charset, callback func(reply *binlogdatapb.BinlogTransaction) error) error {
if fake.panics {
panic(fmt.Errorf("test-triggered panic"))
Expand Down Expand Up @@ -162,7 +162,7 @@ var testTablesRequest = &tablesRequest{
},
}

// StreamTables is part of the the UpdateStream interface
// StreamTables is part of the UpdateStream interface
func (fake *FakeBinlogStreamer) StreamTables(ctx context.Context, position string, tables []string, charset *binlogdatapb.Charset, callback func(reply *binlogdatapb.BinlogTransaction) error) error {
if fake.panics {
panic(fmt.Errorf("test-triggered panic"))
Expand Down Expand Up @@ -214,7 +214,7 @@ func testStreamTablesPanics(t *testing.T, bpc binlogplayer.Client) {
}
}

// HandlePanic is part of the the UpdateStream interface
// HandlePanic is part of the UpdateStream interface
func (fake *FakeBinlogStreamer) HandlePanic(err *error) {
if x := recover(); x != nil {
*err = fmt.Errorf("Caught panic: %v", x)
Expand Down
2 changes: 1 addition & 1 deletion go/vt/proto/vtgate/vtgate.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go/vt/schemamanager/schemaswap/schema_swap.go
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ func (schemaSwap *Swap) stopAllHealthWatchers() {
}

// initializeSwap starts the schema swap process. If there is already a schema swap process started
// the the method just picks up that. Otherwise it starts a new one and writes into the database that
// the method just picks up that. Otherwise it starts a new one and writes into the database that
// the process was started.
func (schemaSwap *Swap) initializeSwap() error {
var waitGroup sync.WaitGroup
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/planbuilder/insert.go
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func modifyForAutoinc(ins *sqlparser.Insert, eins *engine.Insert) error {
return nil
}

// swapBindVariables swaps in bind variable names at the the specified
// swapBindVariables swaps in bind variable names at the specified
// column position in the AST values and returns the converted values back.
// Bind variable names are generated using baseName.
func swapBindVariables(rows sqlparser.Values, colNum int, baseName string) (sqltypes.PlanValue, error) {
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/planbuilder/ordered_aggregate.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ func (oa *orderedAggregate) PushFilter(_ *primitiveBuilder, _ sqlparser.Expr, wh
// be performed 'as they come'. In this respect, oa is the originator for
// aggregate expressions like MAX, which will be added to symtab. The underlying
// MAX sent to the route will not be added to symtab and will not be reachable by
// others. This functionality depends on the the PushOrderBy to request that
// others. This functionality depends on the PushOrderBy to request that
// the rows be correctly ordered for a merge sort.
func (oa *orderedAggregate) PushSelect(expr *sqlparser.AliasedExpr, origin builder) (rc *resultColumn, colnum int, err error) {
if inner, ok := expr.Expr.(*sqlparser.FuncExpr); ok {
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/scatter_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ func injectShuffleQueryPartsRandomGenerator(
return oldRandGen
}

// shuffleQueryParts performs an in-place shuffle of the the given array.
// shuffleQueryParts performs an in-place shuffle of the given array.
// The result is a psuedo-random permutation of the array chosen uniformally
// from the space of all permutations.
func shuffleQueryParts(splits []*vtgatepb.SplitQueryResponse_Part) {
Expand Down

0 comments on commit f306a24

Please sign in to comment.