remove identifiablePrimitive

Signed-off-by: Andres Taylor <andres@planetscale.com>

go/vt/vtgate/engine/concatenate.go

@@ -35,7 +35,6 @@ var _ Primitive = (*Concatenate)(nil)
 
 // Concatenate specified the parameter for concatenate primitive
 type Concatenate struct {
- identifiablePrimitive
  Sources []Primitive
 
  // These column offsets do not need to be typed checked - they usually contain weight_string()

go/vt/vtgate/engine/dbddl.go

@@ -60,7 +60,6 @@ const dbDDLDefaultTimeout = 500 * time.Millisecond
 // DBDDL is just a container around custom database provisioning plugins
 // The default behaviour is to just return an error
 type DBDDL struct {
- identifiablePrimitive
  noInputs
  noTxNeeded
 

go/vt/vtgate/engine/ddl.go

@@ -32,7 +32,6 @@ var _ Primitive = (*DDL)(nil)
 
 // DDL represents a DDL statement, either normal or online DDL
 type DDL struct {
- identifiablePrimitive
  noTxNeeded
  noInputs
 

go/vt/vtgate/engine/distinct.go

@@ -35,7 +35,6 @@ var _ Primitive = (*Distinct)(nil)
 type (
  // Distinct Primitive is used to uniqueify results
  Distinct struct {
- identifiablePrimitive
  Source Primitive
  CheckCols []CheckCol
  Truncate int

go/vt/vtgate/engine/dml.go

@@ -36,7 +36,6 @@ import (
 
 // DML contains the common elements between Update and Delete plans
 type DML struct {
- identifiablePrimitive
  txNeeded
 
  // Query specifies the query to be executed.

go/vt/vtgate/engine/dml_with_input.go

@@ -33,7 +33,6 @@ const DmlVals = "dml_vals"
 
 // DMLWithInput represents the instructions to perform a DML operation based on the input result.
 type DMLWithInput struct {
- identifiablePrimitive
  txNeeded
 
  Input Primitive

go/vt/vtgate/engine/exec_prepared_statement.go

@@ -29,7 +29,6 @@ import (
 var _ Primitive = (*ExecStmt)(nil)
 
 type ExecStmt struct {
- identifiablePrimitive
  Params []*sqlparser.Variable
  Input Primitive
 }

go/vt/vtgate/engine/fake_primitive_test.go

@@ -35,7 +35,6 @@ import (
 // returns sendErr. For streaming calls, it sends the field info
 // first and two rows at a time till all rows are sent.
 type fakePrimitive struct {
- identifiablePrimitive
  results []*sqltypes.Result
  curResult int
  // sendErr is sent at the end of the stream if it's set.

go/vt/vtgate/engine/fake_vcursor_test.go

@@ -132,7 +132,7 @@ func (t *noopVCursor) UnresolvedTransactions(ctx context.Context, keyspace strin
  panic("implement me")
 }
 
-func (t *noopVCursor) StartPrimitiveTrace() func() map[int]RowsReceived {
+func (t *noopVCursor) StartPrimitiveTrace() func() map[Primitive]RowsReceived {
  panic("implement me")
 }
 
@@ -878,10 +878,6 @@ func (f *loggingVCursor) UnresolvedTransactions(_ context.Context, _ string) ([]
  return f.transactionStatusOutput, nil
 }
 
-func (f *loggingVCursor) StartPrimitiveTrace() func() map[int]RowsReceived {
- panic("implement me")
-}
-
 // SQLParser implements VCursor
 func (t *loggingVCursor) SQLParser() *sqlparser.Parser {
  if t.parser == nil {

go/vt/vtgate/engine/filter.go

@@ -30,7 +30,6 @@ var _ Primitive = (*Filter)(nil)
 
 // Filter is a primitive that performs the FILTER operation.
 type Filter struct {
- identifiablePrimitive
  noTxNeeded
 
  Predicate evalengine.Expr

go/vt/vtgate/engine/fk_cascade.go

@@ -53,7 +53,6 @@ type NonLiteralUpdateInfo struct {
 // FkCascade is a primitive that implements foreign key cascading using Selection as values required to execute the FkChild Primitives.
 // On success, it executes the Parent Primitive.
 type FkCascade struct {
- identifiablePrimitive
  txNeeded
 
  // Selection is the Primitive that is used to find the rows that are going to be modified in the child tables.

go/vt/vtgate/engine/fk_verify.go

@@ -35,7 +35,6 @@ type Verify struct {
 // FkVerify is a primitive that verifies that the foreign key constraints in parent tables are satisfied.
 // It does this by executing a select distinct query on the parent table with the values that are being inserted/updated.
 type FkVerify struct {
- identifiablePrimitive
  txNeeded
 
  Verify []*Verify

go/vt/vtgate/engine/hash_join.go

@@ -40,7 +40,6 @@ type (
  // Then the RHS is fetched, and we can check if the rows from the RHS matches any from the LHS.
  // When they match by hash code, we double-check that we are not working with a false positive by comparing the values.
  HashJoin struct {
- identifiablePrimitive
  Opcode JoinOpcode
 
  // Left and Right are the LHS and RHS primitives

go/vt/vtgate/engine/insert.go

@@ -38,7 +38,6 @@ var _ Primitive = (*Insert)(nil)
 
 // Insert represents the instructions to perform an insert operation.
 type Insert struct {
- identifiablePrimitive
  noInputs
  InsertCommon
 

go/vt/vtgate/engine/insert_common.go

@@ -37,7 +37,6 @@ import (
 
 type (
  InsertCommon struct {
- identifiablePrimitive
  // Insert needs tx handling
  txNeeded
 

go/vt/vtgate/engine/join.go

@@ -32,7 +32,6 @@ var _ Primitive = (*Join)(nil)
 
 // Join specifies the parameters for a join primitive.
 type Join struct {
- identifiablePrimitive
  Opcode JoinOpcode
  // Left and Right are the LHS and RHS primitives
  // of the Join. They can be any primitive.

go/vt/vtgate/engine/limit.go

@@ -35,7 +35,6 @@ var _ Primitive = (*Limit)(nil)
 
 // Limit is a primitive that performs the LIMIT operation.
 type Limit struct {
- identifiablePrimitive
  Count evalengine.Expr
  Offset evalengine.Expr
  Input Primitive

go/vt/vtgate/engine/lock.go

@@ -38,7 +38,6 @@ var _ Primitive = (*Lock)(nil)
 
 // Lock primitive will execute sql containing lock functions
 type Lock struct {
- identifiablePrimitive
  noInputs
  noTxNeeded
 

go/vt/vtgate/engine/memory_sort.go

@@ -34,7 +34,6 @@ var _ Primitive = (*MemorySort)(nil)
 
 // MemorySort is a primitive that performs in-memory sorting.
 type MemorySort struct {
- identifiablePrimitive
  UpperLimit evalengine.Expr
  OrderBy evalengine.Comparison
  Input Primitive

go/vt/vtgate/engine/merge_sort.go

@@ -48,7 +48,6 @@ var _ Primitive = (*MergeSort)(nil)
 // be used like other Primitives in VTGate. However, it satisfies the Primitive API
 // so that vdiff can use it. In that situation, only StreamExecute is used.
 type MergeSort struct {
- identifiablePrimitive
  noInputs
  noTxNeeded
 

go/vt/vtgate/engine/mirror.go

@@ -30,7 +30,6 @@ type (
  // authoritative primitive and, based on whether a die-roll exceeds a
  // percentage, to also execute a target Primitive.
  percentBasedMirror struct {
- identifiablePrimitive
  percent float32
  primitive Primitive
  target Primitive

go/vt/vtgate/engine/mstream.go

@@ -30,7 +30,6 @@ var _ Primitive = (*MStream)(nil)
 
 // MStream is an operator for message streaming from specific keyspace, destination
 type MStream struct {
- identifiablePrimitive
  noTxNeeded
  noInputs
 

go/vt/vtgate/engine/online_ddl.go

@@ -34,7 +34,6 @@ var _ Primitive = (*OnlineDDL)(nil)
 
 // OnlineDDL represents the instructions to perform an online schema change via vtctld
 type OnlineDDL struct {
- identifiablePrimitive
  noTxNeeded
  noInputs
 

go/vt/vtgate/engine/ordered_aggregate.go

@@ -36,7 +36,6 @@ var _ Primitive = (*OrderedAggregate)(nil)
 // is that the underlying primitive is a scatter select with pre-sorted
 // rows.
 type OrderedAggregate struct {
- identifiablePrimitive
  // Aggregates specifies the aggregation parameters for each
  // aggregation function: function opcode and input column number.
  Aggregates []*AggregateParams

go/vt/vtgate/engine/plan_description.go

@@ -219,10 +219,10 @@ func marshalAdd(prepend string, buf *bytes.Buffer, name string, obj any) error {
 
 // PrimitiveToPlanDescription transforms a primitive tree into a corresponding PlanDescription tree
 // If stats is not nil, it will be used to populate the stats field of the PlanDescription
-func PrimitiveToPlanDescription(in Primitive, stats map[int]RowsReceived) PrimitiveDescription {
+func PrimitiveToPlanDescription(in Primitive, stats map[Primitive]RowsReceived) PrimitiveDescription {
  this := in.description()
- if id := in.GetID(); stats != nil && id > 0 {
- this.Stats = stats[int(id)]
+ if stats != nil {
+ this.Stats = stats[in]
  }
 
  inputs, infos := in.Inputs()

go/vt/vtgate/engine/primitive.go

@@ -143,7 +143,7 @@ type (
 
  // StartPrimitiveTrace starts a trace for the given primitive,
  // and returns a function to get the trace logs after the primitive execution.
- StartPrimitiveTrace() func() map[int]RowsReceived
+ StartPrimitiveTrace() func() map[Primitive]RowsReceived
  }
 
  // SessionActions gives primitives ability to interact with the session state
@@ -254,9 +254,6 @@ type (
  // description is the description, sans the inputs, of this Primitive.
  // to get the plan description with all children, use PrimitiveToPlanDescription()
  description() PrimitiveDescription
-
- GetID() PrimitiveID
- SetID(PrimitiveID)
  }
 
  // noInputs default implementation for Primitives that are leaves
@@ -267,12 +264,6 @@ type (
 
  // txNeeded is a default implementation for Primitives that need transaction handling
  txNeeded struct{}
-
- PrimitiveID int
-
- identifiablePrimitive struct {
- id PrimitiveID
- }
 )
 
 // Find will return the first Primitive that matches the evaluate function. If no match is found, nil will be returned
@@ -290,14 +281,6 @@ func Find(isMatch Match, start Primitive) Primitive {
  return nil
 }
 
-func PreOrderTraverse(p Primitive, f func(Primitive)) {
- f(p)
- inputs, _ := p.Inputs()
- for _, input := range inputs {
- PreOrderTraverse(input, f)
- }
-}
-
 // Exists traverses recursively down the Primitive tree structure, and returns true when Match returns true
 func Exists(m Match, p Primitive) bool {
  return Find(m, p) != nil
@@ -315,11 +298,3 @@ func (noTxNeeded) NeedsTransaction() bool {
 func (txNeeded) NeedsTransaction() bool {
  return true
 }
-
-func (i *identifiablePrimitive) GetID() PrimitiveID {
- return i.id
-}
-
-func (i *identifiablePrimitive) SetID(id PrimitiveID) {
- i.id = id
-}

go/vt/vtgate/engine/projection.go

@@ -32,7 +32,6 @@ var _ Primitive = (*Projection)(nil)
 
 // Projection can evaluate expressions and project the results
 type Projection struct {
- identifiablePrimitive
  noTxNeeded
 
  Cols []string

go/vt/vtgate/engine/recurse_cte.go

@@ -30,7 +30,6 @@ import (
 // The values being sent to the Term side are stored in the Vars map -
 // the key is the bindvar name and the value is the index of the column in the recursive result
 type RecurseCTE struct {
- identifiablePrimitive
  Seed, Term Primitive
 
  Vars map[string]int

go/vt/vtgate/engine/rename_fields.go

@@ -28,7 +28,6 @@ var _ Primitive = (*RenameFields)(nil)
 
 // RenameFields is a primitive that renames the fields
 type RenameFields struct {
- identifiablePrimitive
  noTxNeeded
 
  Cols []string

go/vt/vtgate/engine/replace_variables.go

@@ -27,7 +27,6 @@ var _ Primitive = (*ReplaceVariables)(nil)
 
 // ReplaceVariables is used in SHOW VARIABLES statements so that it replaces the values for vitess-aware variables
 type ReplaceVariables struct {
- identifiablePrimitive
  noTxNeeded
  Input Primitive
 }

go/vt/vtgate/engine/revert_migration.go

@@ -34,7 +34,6 @@ var _ Primitive = (*RevertMigration)(nil)
 
 // RevertMigration represents the instructions to perform an online schema change via vtctld
 type RevertMigration struct {
- identifiablePrimitive
  noTxNeeded
  noInputs
 

go/vt/vtgate/engine/route.go

@@ -52,7 +52,6 @@ var (
 // Route represents the instructions to route a read query to
 // one or many vttablets.
 type Route struct {
- identifiablePrimitive
  // Route does not take inputs
  noInputs
 

go/vt/vtgate/engine/rows.go

@@ -27,7 +27,6 @@ var _ Primitive = (*Rows)(nil)
 
 // Rows simply returns a number or rows
 type Rows struct {
- identifiablePrimitive
  noInputs
  noTxNeeded
 

go/vt/vtgate/engine/scalar_aggregation.go

@@ -28,7 +28,6 @@ var _ Primitive = (*ScalarAggregate)(nil)
 
 // ScalarAggregate is a primitive used to do aggregations without grouping keys
 type ScalarAggregate struct {
- identifiablePrimitive
  // Aggregates specifies the aggregation parameters for each
  // aggregation function: function opcode and input column number.
  Aggregates []*AggregateParams

go/vt/vtgate/engine/semi_join.go

@@ -27,7 +27,6 @@ var _ Primitive = (*SemiJoin)(nil)
 
 // SemiJoin specifies the parameters for a SemiJoin primitive.
 type SemiJoin struct {
- identifiablePrimitive
  // Left and Right are the LHS and RHS primitives
  // of the SemiJoin. They can be any primitive.
  Left, Right Primitive

go/vt/vtgate/engine/send.go

@@ -33,7 +33,6 @@ var _ Primitive = (*Send)(nil)
 
 // Send is an operator to send query to the specific keyspace, tabletType and destination
 type Send struct {
- identifiablePrimitive
  noInputs
 
  // Keyspace specifies the keyspace to send the query to.

go/vt/vtgate/engine/sequential.go

@@ -28,7 +28,6 @@ import (
 // Sequential Primitive is used to execute DML statements in a fixed order.
 // Any failure, stops the execution and returns.
 type Sequential struct {
- identifiablePrimitive
  txNeeded
  Sources []Primitive
 }

go/vt/vtgate/engine/session_primitive.go

@@ -27,7 +27,6 @@ import (
 // SessionPrimitive the session primitive is a very small primitive used
 // when we have simple engine code that needs to interact with the Session
 type SessionPrimitive struct {
- identifiablePrimitive
  noInputs
  noTxNeeded
 

go/vt/vtgate/engine/set.go

@@ -45,7 +45,6 @@ import (
 type (
  // Set contains the instructions to perform set.
  Set struct {
- identifiablePrimitive
  noTxNeeded
 
  Ops []SetOp

go/vt/vtgate/engine/show_exec.go

@@ -28,7 +28,6 @@ var _ Primitive = (*ShowExec)(nil)
 
 // ShowExec is a primitive to call into executor via vcursor.
 type ShowExec struct {
- identifiablePrimitive
  noInputs
  noTxNeeded
 

go/vt/vtgate/engine/simple_projection.go

@@ -33,7 +33,6 @@ var _ Primitive = (*SimpleProjection)(nil)
 
 // SimpleProjection selects which columns to keep from the input
 type SimpleProjection struct {
- identifiablePrimitive
  // Cols defines the column numbers from the underlying primitive
  // to be returned.
  Cols []int