chore: cleanup from rebase/merge

Author: trevorwhitney

pkg/engine/internal/executor/executor_test.go

@@ -72,8 +72,9 @@ func TestExecutor_Projection(t *testing.T) {
 
 	t.Run("missing column expression results in error", func(t *testing.T) {
 		ctx := t.Context()
+		cols := []physical.Expression{}
 		c := &Context{}
-		pipeline := c.executeProjection(ctx, &physical.Projection{Expressions: []physical.Expression{}}, []Pipeline{emptyPipeline()})
+		pipeline := c.executeProjection(ctx, &physical.Projection{Expressions: cols}, []Pipeline{emptyPipeline()})
 		_, err := pipeline.Read(ctx)
 		require.ErrorContains(t, err, "projection expects at least one column, got 0")
 	})

pkg/engine/internal/executor/sortmerge_test.go

@@ -63,7 +63,7 @@ func (b *Builder) Unwrap(identifier string, operation string) *Builder {
 
 	return &Builder{
 		val: &Projection{
-			Table: b.val,
+			Relation: b.val,
 			Expressions: []Value{
 				&UnaryOp{
 					Op: op,
@@ -75,6 +75,7 @@ func (b *Builder) Unwrap(identifier string, operation string) *Builder {
 					},
 				},
 			},
+			All:    true,
 			Expand: true,
 		},
 	}

pkg/engine/internal/planner/logical/builder.go

@@ -59,8 +59,6 @@ func (b *ssaBuilder) process(value Value) (Value, error) {
 		return b.processLiteral(value)
 	case *LogQLCompat:
 		return b.processCompat(value)
-	case *Projection:
-		return b.processProjection(value)
 
 	default:
 		return nil, fmt.Errorf("unsupported value type %T", value)
@@ -221,19 +219,6 @@ func (b *ssaBuilder) processBinOp(expr *BinOp) (Value, error) {
 	return expr, nil
 }
 
-func (b *ssaBuilder) processProjection(value *Projection) (Value, error) {
-	if _, err := b.process(value.Table); err != nil {
-		return nil, err
-	}
-
-	// Only append the first time we see this.
-	if value.id == "" {
-		value.id = fmt.Sprintf("%%%d", b.getID())
-		b.instructions = append(b.instructions, value)
-	}
-	return value, nil
-}
-
 func (b *ssaBuilder) processColumnRef(value *ColumnRef) (Value, error) {
 	// Nothing to do.
 	return value, nil

pkg/engine/internal/planner/logical/builder_convert.go

@@ -458,33 +458,6 @@ func (p *Planner) Optimize(plan *Plan) (*Plan, error) {
 	return plan, nil
 }
 
-func (p *Planner) processProjection(inst *logical.Projection, ctx *Context) ([]Node, error) {
-	exprs := make([]Expression, len(inst.Expressions))
-	for i, expr := range inst.Expressions {
-		exprs[i] = p.convertPredicate(expr)
-	}
-
-	node := &Projection{
-		Expressions: exprs,
-		Expand:      false,
-	}
-
-	p.plan.graph.Add(node)
-
-	children, err := p.process(inst.Table, ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	for i := range children {
-		if err := p.plan.graph.AddEdge(dag.Edge[Node]{Parent: node, Child: children[i]}); err != nil {
-			return nil, err
-		}
-	}
-
-	return []Node{node}, nil
-}
-
 func convertParserKind(kind logical.ParserKind) ParserKind {
 	switch kind {
 	case logical.ParserLogfmt:

pkg/engine/internal/planner/physical/planner.go

@@ -155,18 +155,11 @@ func TestFullQueryPlanning(t *testing.T) {
 Limit offset=0 limit=1000
 └── TopK sort_by=builtin.timestamp ascending=false nulls_first=false k=1000
     └── Parallelize
-<<<<<<< HEAD
         └── TopK sort_by=builtin.timestamp ascending=false nulls_first=false k=1000
             └── Compat src=metadata dst=metadata collision=label
                 └── ScanSet num_targets=2 predicate[0]=GTE(builtin.timestamp, 2025-01-01T00:00:00Z) predicate[1]=LT(builtin.timestamp, 2025-01-01T01:00:00Z)
                         ├── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=1 projections=()
                         └── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=0 projections=()
-=======
-        └── Compat src=metadata dst=metadata collision=label
-            └── ScanSet num_targets=2 predicate[0]=GTE(builtin.timestamp, 2025-01-01T00:00:00Z) predicate[1]=LT(builtin.timestamp, 2025-01-01T01:00:00Z)
-                    ├── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=1 projections=()
-                    └── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=0 projections=()
->>>>>>> twhitney/thor-unwrap
 				`,
 		},
 		{
@@ -175,7 +168,6 @@ Limit offset=0 limit=1000
 			expected: `
 Limit offset=0 limit=1000
 └── TopK sort_by=builtin.timestamp ascending=false nulls_first=false k=1000
-<<<<<<< HEAD
     └── Parallelize
         └── TopK sort_by=builtin.timestamp ascending=false nulls_first=false k=1000
             └── Filter predicate[0]=EQ(ambiguous.label_foo, "bar")
@@ -184,38 +176,20 @@ Limit offset=0 limit=1000
                             ├── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=1 projections=()
                             └── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=0 projections=()
 	`,
-=======
-    └── Filter predicate[0]=EQ(ambiguous.label_foo, "bar")
-        └── Parallelize
-            └── Compat src=metadata dst=metadata collision=label
-                └── ScanSet num_targets=2 predicate[0]=GTE(builtin.timestamp, 2025-01-01T00:00:00Z) predicate[1]=LT(builtin.timestamp, 2025-01-01T01:00:00Z) predicate[2]=MATCH_STR(builtin.message, "baz")
-                        ├── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=1 projections=()
-                        └── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=0 projections=()
-						`,
->>>>>>> twhitney/thor-unwrap
 		},
 		{
 			comment: "drop columns",
 			query:   `{app="foo"} | drop service_name,__error__`,
 			expected: `
 Limit offset=0 limit=1000
 └── TopK sort_by=builtin.timestamp ascending=false nulls_first=false k=1000
-<<<<<<< HEAD
     └── Parallelize
         └── TopK sort_by=builtin.timestamp ascending=false nulls_first=false k=1000
             └── Projection all=true drop=(ambiguous.service_name, ambiguous.__error__)
                 └── Compat src=metadata dst=metadata collision=label
                     └── ScanSet num_targets=2 predicate[0]=GTE(builtin.timestamp, 2025-01-01T00:00:00Z) predicate[1]=LT(builtin.timestamp, 2025-01-01T01:00:00Z)
                             ├── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=1 projections=()
                             └── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=0 projections=()
-=======
-    └── Projection all=true drop=(ambiguous.service_name, ambiguous.__error__)
-        └── Parallelize
-            └── Compat src=metadata dst=metadata collision=label
-                └── ScanSet num_targets=2 predicate[0]=GTE(builtin.timestamp, 2025-01-01T00:00:00Z) predicate[1]=LT(builtin.timestamp, 2025-01-01T01:00:00Z)
-                        ├── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=1 projections=()
-                        └── @target type=ScanTypeDataObject location=objects/00/0000000000.dataobj streams=5 section_id=0 projections=()
->>>>>>> twhitney/thor-unwrap
 						`,
 		},
 	}