fix test exepectation to gen4 plans

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

go/vt/vtgate/engine/insert.go

@@ -124,15 +124,6 @@ func NewQueryInsert(opcode InsertOpcode, keyspace *vindexes.Keyspace, query stri
  }
 }
 
-// NewSimpleInsert creates an Insert for a Table.
-func NewSimpleInsert(opcode InsertOpcode, table *vindexes.Table, keyspace *vindexes.Keyspace) *Insert {
- return &Insert{
- Opcode: opcode,
- Table: table,
- Keyspace: keyspace,
- }
-}
-
 // NewInsert creates a new Insert.
 func NewInsert(
  opcode InsertOpcode,

go/vt/vtgate/engine/primitive.go

@@ -54,7 +54,6 @@ type (
  // if the max memory rows override directive is set to true
  ExceedsMaxMemoryRows(numRows int) bool
 
- // V3 functions.
  Execute(ctx context.Context, method string, query string, bindVars map[string]*querypb.BindVariable, rollbackOnError bool, co vtgatepb.CommitOrder) (*sqltypes.Result, error)
  AutocommitApproval() bool
 

go/vt/vtgate/engine/route.go

@@ -89,16 +89,6 @@ type Route struct {
  noTxNeeded
 }
 
-// NewSimpleRoute creates a Route with the bare minimum of parameters.
-func NewSimpleRoute(opcode Opcode, keyspace *vindexes.Keyspace) *Route {
- return &Route{
- RoutingParameters: &RoutingParameters{
- Opcode: opcode,
- Keyspace: keyspace,
- },
- }
-}
-
 // NewRoute creates a Route.
 func NewRoute(opcode Opcode, keyspace *vindexes.Keyspace, query, fieldQuery string) *Route {
  return &Route{
@@ -120,8 +110,6 @@ type OrderByParams struct {
  WeightStringCol int
  Desc bool
  StarColFixedIndex int
- // v3 specific boolean. Used to also add weight strings originating from GroupBys to the Group by clause
- FromGroupBy bool
  // Collation ID for comparison using collation
  CollationID collations.ID
 }

go/vt/vtgate/executor.go

@@ -1307,7 +1307,6 @@ func (e *Executor) prepare(ctx context.Context, safeSession *SafeSession, sql st
 }
 
 func (e *Executor) handlePrepare(ctx context.Context, safeSession *SafeSession, sql string, bindVars map[string]*querypb.BindVariable, logStats *logstats.LogStats) ([]*querypb.Field, error) {
- // V3 mode.
  query, comments := sqlparser.SplitMarginComments(sql)
  vcursor, _ := newVCursorImpl(safeSession, comments, e, logStats, e.vm, e.VSchema(), e.resolver.resolver, e.serv, e.warnShardedOnly, e.pv)