Skip to content

Commit 94524bf

Browse files
craig[bot]yuzefovich
andcommitted
Merge #27093
27093: sql: Fix several typos. r=yuzefovich a=yuzefovich Release note: None Co-authored-by: yuzefovich <yahor@cockroachlabs.com>
2 parents 5845a15 + 9776460 commit 94524bf

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

pkg/sql/conn_executor_exec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ func (ex *connExecutor) execWithLocalEngine(
855855
}
856856
}
857857

858-
// exectWithDistSQLEngine converts a plan to a distributed SQL physical plan and
858+
// execWithDistSQLEngine converts a plan to a distributed SQL physical plan and
859859
// runs it.
860860
// If an error is returned, the connection needs to stop processing queries.
861861
// Query execution errors are written to res; they are not returned.

pkg/sql/distsql_physical_planner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ func (dsp *DistSQLPlanner) addSorters(p *physicalPlan, n *sortNode) {
11351135
// - ONLY aggregation functions, with arguments pre-evaluated. So for
11361136
// COUNT(k + v), we assume a stream of evaluated 'k + v' values.
11371137
// - Expressions that CONTAIN an aggregation function, e.g. 'COUNT(k) + 1'.
1138-
// This is evaluated the post aggregation evaluator attached after.
1138+
// This is evaluated in the post aggregation evaluator attached after.
11391139
// - Expressions that also appear verbatim in the GROUP BY expressions.
11401140
// For 'SELECT k GROUP BY k', the aggregation function added is IDENT,
11411141
// therefore k just passes through unchanged.

pkg/sql/distsql_running.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ func (dsp *DistSQLPlanner) initRunners() {
101101
// txn is the transaction in which the plan will run. If nil, the different
102102
// processors are expected to manage their own internal transactions.
103103
//
104-
// All errors encoutered are reported to the distSQLReceiver's resultWriter.
105-
// Additionally, if the error is a "communication error" (an error encoutered
104+
// All errors encountered are reported to the distSQLReceiver's resultWriter.
105+
// Additionally, if the error is a "communication error" (an error encountered
106106
// while using that resultWriter), the error is also stored in
107107
// distSQLReceiver.commErr. That can be tested to see if a client session needs
108108
// to be closed.

pkg/sql/distsqlrun/aggregator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ func (ag *aggregatorBase) getAggResults(
557557
// emitRow constructs an output row from an accumulated bucket and returns it.
558558
//
559559
// emitRow() might move to stateDraining. It might also not return a row if the
560-
// ProcOutputHelper filtered a the current row out.
560+
// ProcOutputHelper filtered the current row out.
561561
func (ag *hashAggregator) emitRow() (aggregatorState, sqlbase.EncDatumRow, *ProducerMetadata) {
562562
if len(ag.bucketsIter) == 0 {
563563
// We've exhausted all of the aggregation buckets.

pkg/sql/distsqlrun/flow.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ type FlowCtx struct {
6565
// directly (since some processor mutate the EvalContext they use).
6666
//
6767
// TODO(andrei): Get rid of this field and pass a non-shared EvalContext to
68-
// ctors of the processors that need it.
68+
// cores of the processors that need it.
6969
EvalCtx tree.EvalContext
7070
// rpcCtx is used by the Outboxes that may be present in the flow for
7171
// connecting to other nodes.

pkg/sql/distsqlrun/joinreader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ func (jr *joinReader) mainLoop(ctx context.Context) error {
402402
}
403403
}
404404

405-
// A joinReader performs a lookup join is lookup columns were specified,
405+
// A joinReader performs a lookup join if lookup columns were specified,
406406
// otherwise it performs an index join.
407407
func (jr *joinReader) isLookupJoin() bool {
408408
return len(jr.lookupCols) > 0

pkg/sql/distsqlrun/processors.pb.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/sql/distsqlrun/processors.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import "gogoproto/gogo.proto";
5252
// each type of core. Column indices in a PostProcessSpec refers to these
5353
// internal columns. Some columns may be unused by the post-processing stage;
5454
// processor implementations are internally optimized to not produce values for
55-
// such unneded columns.
55+
// such unneeded columns.
5656
message ProcessorSpec {
5757
// In most cases, there is one input.
5858
repeated InputSyncSpec input = 1 [(gogoproto.nullable) = false];
@@ -184,7 +184,7 @@ message TableReaderSpan {
184184
//
185185
// The "internal columns" of a TableReader (see ProcessorSpec) are all the
186186
// columns of the table. Internally, only the values for the columns needed by
187-
// the post-processing stage are be populated. If is_check is set, the
187+
// the post-processing stage are to be populated. If is_check is set, the
188188
// TableReader will run additional data checking procedures and the
189189
// "internal columns" are:
190190
// - Error type (string).

0 commit comments

Comments
 (0)