From eaeb2f908f350d2776ecd429e18282bc855a27a3 Mon Sep 17 00:00:00 2001 From: angelamayxie Date: Mon, 9 Feb 2026 13:04:03 -0800 Subject: [PATCH] remove secondary map return variable (never used) --- go/libraries/doltcore/sqle/kvexec/builder.go | 61 ++++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/go/libraries/doltcore/sqle/kvexec/builder.go b/go/libraries/doltcore/sqle/kvexec/builder.go index 41c4a02cb1..76cbe9d6b6 100644 --- a/go/libraries/doltcore/sqle/kvexec/builder.go +++ b/go/libraries/doltcore/sqle/kvexec/builder.go @@ -65,12 +65,12 @@ func (b Builder) Build(ctx *sql.Context, n sql.Node, r sql.Row) (sql.RowIter, er return nil, nil } - _, _, _, dstIter, _, dstTags, dstFilter, err := getSourceKv(ctx, n.Right(), false) + _, _, dstIter, _, dstTags, dstFilter, err := getSourceKv(ctx, n.Right(), false) if err != nil || dstIter == nil { return nil, nil } - srcMap, _, srcIter, _, srcSchema, srcTags, srcFilter, err := getSourceKv(ctx, n.Left(), true) + srcMap, srcIter, _, srcSchema, srcTags, srcFilter, err := getSourceKv(ctx, n.Left(), true) if err != nil || srcSchema == nil { return nil, nil } @@ -125,7 +125,7 @@ func (b Builder) Build(ctx *sql.Context, n sql.Node, r sql.Row) (sql.RowIter, er case *plan.GroupBy: if len(n.GroupByExprs) == 0 && len(n.SelectDeps) == 1 { if cnt, ok := n.SelectDeps[0].(*aggregation.Count); ok { - if _, _, srcIter, _, srcSchema, _, srcFilter, err := getSourceKv(ctx, n.Child, true); err == nil && srcSchema != nil && srcFilter == nil { + if _, srcIter, _, srcSchema, _, srcFilter, err := getSourceKv(ctx, n.Child, true); err == nil && srcSchema != nil && srcFilter == nil { iter, ok, err := newCountAggregationKvIter(srcIter, srcSchema, cnt.Child) if ok && err == nil { // (1) no grouping expressions (returns one row) @@ -339,27 +339,27 @@ func getPhysicalColCount(schemas []schema.Schema, splits []int, projections []ui // getSourceKv extracts prolly table and index specific structures needed // to implement a lookup join. We return either |srcIter| or |dstIter| // depending on whether |isSrc| is true. -func getSourceKv(ctx *sql.Context, n sql.Node, isSrc bool) (prolly.Map, prolly.Map, prolly.MapIter, index.SecondaryLookupIterGen, schema.Schema, []uint64, sql.Expression, error) { +func getSourceKv(ctx *sql.Context, n sql.Node, isSrc bool) (prolly.Map, prolly.MapIter, index.SecondaryLookupIterGen, schema.Schema, []uint64, sql.Expression, error) { var table *doltdb.Table var tags []uint64 var err error var priMap prolly.Map - var secMap prolly.Map var srcIter prolly.MapIter var dstIter index.SecondaryLookupIterGen var priSch schema.Schema switch n := n.(type) { + // TODO: what if the node is a join because we're doing a multi-table join? case *plan.TableAlias: return getSourceKv(ctx, n.Child, isSrc) case *plan.Filter: - m, secM, mIter, destIter, s, t, _, err := getSourceKv(ctx, n.Child, isSrc) + m, mIter, destIter, s, t, _, err := getSourceKv(ctx, n.Child, isSrc) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } - return m, secM, mIter, destIter, s, t, n.Expression, nil + return m, mIter, destIter, s, t, n.Expression, nil case *plan.IndexedTableAccess: if _, ok := plan.FindVirtualColumnTable(n.Table); ok { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, fmt.Errorf("virtual tables unsupported in kvexec") + return prolly.Map{}, nil, nil, nil, nil, nil, fmt.Errorf("virtual tables unsupported in kvexec") } var lb index.IndexScanBuilder @@ -368,38 +368,38 @@ func getSourceKv(ctx *sql.Context, n sql.Node, isSrc bool) (prolly.Map, prolly.M tags = dt.ProjectedTags() table, err = dt.DoltTable.DoltTable(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } lb, err = dt.LookupBuilder(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } case *sqle.IndexedDoltTable: tags = dt.ProjectedTags() table, err = dt.DoltTable.DoltTable(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } lb, err = dt.LookupBuilder(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } // case *dtables.DiffTable: // TODO: add interface to include system tables default: - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, nil + return prolly.Map{}, nil, nil, nil, nil, nil, nil } rowData, err := table.GetRowData(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } if rowData.Format() != types.Format_DOLT { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, nil + return prolly.Map{}, nil, nil, nil, nil, nil, nil } priMap, err = durable.ProllyMapFromIndex(rowData) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } priSch = lb.OutputSchema() @@ -407,17 +407,17 @@ func getSourceKv(ctx *sql.Context, n sql.Node, isSrc bool) (prolly.Map, prolly.M if isSrc { l, _, err := n.GetLookup(ctx, nil) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } prollyRanges, err := index.ProllyRangesForIndex(ctx, l.Index, l.Ranges) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } srcIter, err = index.NewSequenceRangeIter(ctx, lb, prollyRanges, l.IsReverse) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } } else { dstIter, _ = lb.NewSecondaryIter(n.IsStrictLookup(), len(n.Expressions()), n.NullMask()) @@ -435,30 +435,29 @@ func getSourceKv(ctx *sql.Context, n sql.Node, isSrc bool) (prolly.Map, prolly.M tags = dt.ProjectedTags() table, err = dt.DoltTable(ctx) default: - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, nil + return prolly.Map{}, nil, nil, nil, nil, nil, nil } if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } priSch, err = table.GetSchema(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } priIndex, err := table.GetRowData(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } priMap, err = durable.ProllyMapFromIndex(priIndex) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } - secMap = priMap srcIter, err = priMap.IterAll(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } if schema.IsKeyless(priSch) { @@ -466,20 +465,20 @@ func getSourceKv(ctx *sql.Context, n sql.Node, isSrc bool) (prolly.Map, prolly.M } default: - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, nil + return prolly.Map{}, nil, nil, nil, nil, nil, nil } if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } if priSch == nil && table != nil { priSch, err = table.GetSchema(ctx) if err != nil { - return prolly.Map{}, prolly.Map{}, nil, nil, nil, nil, nil, err + return prolly.Map{}, nil, nil, nil, nil, nil, err } } - return priMap, secMap, srcIter, dstIter, priSch, tags, nil, nil + return priMap, srcIter, dstIter, priSch, tags, nil, nil } // coveringNormalizer inputs a secondary index key tuple and outputs a