Skip to content

Commit

Permalink
Merge pull request #7757 from momantech/main
Browse files Browse the repository at this point in the history
chore: fix some comments
  • Loading branch information
timsehn authored Apr 17, 2024
2 parents 69a48ae + 73ac859 commit 432c655
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion go/libraries/doltcore/doltdb/durable/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ func (s nomsIndexSet) GetIndex(ctx context.Context, sch schema.Schema, name stri
return indexFromRef(ctx, s.vrw, s.ns, idx.Schema(), v.(types.Ref))
}

// PutIndex implements IndexSet.
// PutNomsIndex implements IndexSet.
func (s nomsIndexSet) PutNomsIndex(ctx context.Context, name string, idx types.Map) (IndexSet, error) {
return s.PutIndex(ctx, name, IndexFromNomsMap(idx, s.vrw, s.ns))
}
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/dtestutils/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func RowsAndSchema() ([]row.Row, schema.Schema, error) {
return rows, sch, err
}

// MustMap contructs a types.Tuple for a slice of types.Values.
// MustTuple contructs a types.Tuple for a slice of types.Values.
func MustTuple(vals ...types.Value) types.Tuple {
tup, err := types.NewTuple(types.Format_Default, vals...)
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ type Query struct {
// |Query|.
Result QueryResult `yaml:"result"`

// If this is non-empty, asserts the the |Query| or the |Exec|
// If this is non-empty, asserts the |Query| or the |Exec|
// generates an error that matches this string.
ErrorMatch string `yaml:"error_match"`

Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/env/actions/remotes.go
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ func FetchRemoteBranch(
return srcDBCommit, nil
}

// ShallFetchRefSpec fetches the remote refSpec from the source database to the destination database. Currently it is only
// ShallowFetchRefSpec fetches the remote refSpec from the source database to the destination database. Currently it is only
// used for shallow clones.
func ShallowFetchRefSpec(
ctx context.Context,
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/env/grpc_dial_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func NewGRPCDialProviderFromDoltEnv(dEnv *DoltEnv) *GRPCDialProvider {
}
}

// GetGRPCDialParms implements dbfactory.GRPCDialProvider
// GetGRPCDialParams implements dbfactory.GRPCDialProvider
func (p GRPCDialProvider) GetGRPCDialParams(config grpcendpoint.Config) (dbfactory.GRPCRemoteConfig, error) {
endpoint := config.Endpoint
if strings.IndexRune(endpoint, ':') == -1 {
Expand Down
4 changes: 2 additions & 2 deletions go/performance/continuous_integration/SysbenchDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ RUN apt -y install sysbench
WORKDIR /postgres
RUN sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
# currently this command fails, but it succeeds on the the stuff we need
# currently this command fails, but it succeeds on the stuff we need
RUN apt-get update -y || true
# currently this command fails, but it succeeds on the the stuff we need
# currently this command fails, but it succeeds on the stuff we need
RUN apt-get -y install postgresql-15 || true

ENV PATH="/usr/lib/postgresql/15/bin:${PATH}"
Expand Down
4 changes: 2 additions & 2 deletions go/serial/workingset.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ table WorkingSet {
}

table MergeState {
// An address for the the working root value before the merge started.
// An address for the working root value before the merge started.
pre_working_root_addr:[ubyte] (required);

// The commit that we are merging.
Expand All @@ -44,7 +44,7 @@ table MergeState {
}

table RebaseState {
// The address of the the working root value before the rebase started.
// The address of the working root value before the rebase started.
pre_working_root_addr:[ubyte] (required);

// The branch being rebased.
Expand Down

0 comments on commit 432c655

Please sign in to comment.