Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/sql/conn_executor_exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ func (ex *connExecutor) execWithLocalEngine(
}
}

// exectWithDistSQLEngine converts a plan to a distributed SQL physical plan and
// execWithDistSQLEngine converts a plan to a distributed SQL physical plan and
// runs it.
// If an error is returned, the connection needs to stop processing queries.
// Query execution errors are written to res; they are not returned.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/distsql_physical_planner.go
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ func (dsp *DistSQLPlanner) addSorters(p *physicalPlan, n *sortNode) {
// - ONLY aggregation functions, with arguments pre-evaluated. So for
// COUNT(k + v), we assume a stream of evaluated 'k + v' values.
// - Expressions that CONTAIN an aggregation function, e.g. 'COUNT(k) + 1'.
// This is evaluated the post aggregation evaluator attached after.
// This is evaluated in the post aggregation evaluator attached after.
// - Expressions that also appear verbatim in the GROUP BY expressions.
// For 'SELECT k GROUP BY k', the aggregation function added is IDENT,
// therefore k just passes through unchanged.
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/distsql_running.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ func (dsp *DistSQLPlanner) initRunners() {
// txn is the transaction in which the plan will run. If nil, the different
// processors are expected to manage their own internal transactions.
//
// All errors encoutered are reported to the distSQLReceiver's resultWriter.
// Additionally, if the error is a "communication error" (an error encoutered
// All errors encountered are reported to the distSQLReceiver's resultWriter.
// Additionally, if the error is a "communication error" (an error encountered
// while using that resultWriter), the error is also stored in
// distSQLReceiver.commErr. That can be tested to see if a client session needs
// to be closed.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/distsqlrun/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ func (ag *aggregatorBase) getAggResults(
// emitRow constructs an output row from an accumulated bucket and returns it.
//
// emitRow() might move to stateDraining. It might also not return a row if the
// ProcOutputHelper filtered a the current row out.
// ProcOutputHelper filtered the current row out.
func (ag *hashAggregator) emitRow() (aggregatorState, sqlbase.EncDatumRow, *ProducerMetadata) {
if len(ag.bucketsIter) == 0 {
// We've exhausted all of the aggregation buckets.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/distsqlrun/flow.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ type FlowCtx struct {
// directly (since some processor mutate the EvalContext they use).
//
// TODO(andrei): Get rid of this field and pass a non-shared EvalContext to
// ctors of the processors that need it.
// cores of the processors that need it.
EvalCtx tree.EvalContext
// rpcCtx is used by the Outboxes that may be present in the flow for
// connecting to other nodes.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/distsqlrun/joinreader.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ func (jr *joinReader) mainLoop(ctx context.Context) error {
}
}

// A joinReader performs a lookup join is lookup columns were specified,
// A joinReader performs a lookup join if lookup columns were specified,
// otherwise it performs an index join.
func (jr *joinReader) isLookupJoin() bool {
return len(jr.lookupCols) > 0
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/distsqlrun/processors.pb.go

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

4 changes: 2 additions & 2 deletions pkg/sql/distsqlrun/processors.proto
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import "gogoproto/gogo.proto";
// each type of core. Column indices in a PostProcessSpec refers to these
// internal columns. Some columns may be unused by the post-processing stage;
// processor implementations are internally optimized to not produce values for
// such unneded columns.
// such unneeded columns.
message ProcessorSpec {
// In most cases, there is one input.
repeated InputSyncSpec input = 1 [(gogoproto.nullable) = false];
Expand Down Expand Up @@ -184,7 +184,7 @@ message TableReaderSpan {
//
// The "internal columns" of a TableReader (see ProcessorSpec) are all the
// columns of the table. Internally, only the values for the columns needed by
// the post-processing stage are be populated. If is_check is set, the
// the post-processing stage are to be populated. If is_check is set, the
// TableReader will run additional data checking procedures and the
// "internal columns" are:
// - Error type (string).
Expand Down