Using ExecutionPlan constructor

Author: pdelewski

platform/frontend_connectors/schema_transformer_test.go

@@ -499,9 +499,7 @@ func Test_ipRangeTransform(t *testing.T) {
 				q.Schema = currentSchema
 				q.Indexes = []string{q.TableName}
 			}
-			plan := &model.ExecutionPlan{
-				Queries: queries[k],
-			}
+			plan := model.NewExecutionPlan(queries[k], nil)
 
 			resultPlan, err := transform.Transform(plan)
 			assert.NoError(t, err)
@@ -742,9 +740,10 @@ func Test_arrayType(t *testing.T) {
 		t.Run(util.PrettyTestName(tt.name, i), func(t *testing.T) {
 			tt.query.Schema = indexSchema
 			tt.query.Indexes = []string{tt.query.TableName}
-			plan := &model.ExecutionPlan{
-				Queries: []*model.Query{tt.query},
-			}
+			plan := model.NewExecutionPlan(
+				[]*model.Query{tt.query},
+				nil,
+			)
 			actual, err := transform.Transform(plan)
 			assert.NoError(t, err)
 
@@ -1810,9 +1809,10 @@ func Test_mapKeys(t *testing.T) {
 			tt.query.Indexes = []string{tt.query.TableName}
 			var actual *model.ExecutionPlan
 			var err error
-			plan := &model.ExecutionPlan{
-				Queries: []*model.Query{tt.query},
-			}
+			plan := model.NewExecutionPlan(
+				[]*model.Query{tt.query},
+				nil,
+			)
 			if indexConfig[tt.query.TableName].EnableFieldMapSyntax {
 				actual, err = transformPass.Transform(plan)
 			} else {
@@ -1905,9 +1905,10 @@ func Test_cluster(t *testing.T) {
 			tt.query.Schema = indexSchema
 			tt.query.Indexes = []string{tt.query.TableName}
 
-			plan := &model.ExecutionPlan{
-				Queries: []*model.Query{tt.query},
-			}
+			plan := model.NewExecutionPlan(
+				[]*model.Query{tt.query},
+				nil,
+			)
 			actual, err := transform.Transform(plan)
 			assert.NoError(t, err)
 

platform/frontend_connectors/search_ab_testing.go

@@ -134,13 +134,11 @@ func (q *QueryRunner) executeABTesting(ctx context.Context, plan *model.Executio
 
 		case *quesma_api.ConnectorDecisionElastic:
 			planExecutor = func(ctx context.Context) ([]byte, error) {
-				elasticPlan := &model.ExecutionPlan{
-					IndexPattern:          plan.IndexPattern,
-					QueryRowsTransformers: []model.QueryRowsTransformer{},
-					Queries:               []*model.Query{},
-					StartTime:             plan.StartTime,
-					Name:                  config.ElasticsearchTarget,
-				}
+				elasticPlan := model.NewExecutionPlan(
+					[]*model.Query{}, []model.QueryRowsTransformer{})
+				elasticPlan.Name = config.ElasticsearchTarget
+				elasticPlan.IndexPattern = plan.IndexPattern
+				elasticPlan.StartTime = plan.StartTime
 				return q.executePlanElastic(ctx, elasticPlan, body, optAsync, optComparePlansCh, isMainPlan)
 			}
 

platform/optimize/pipeline_test.go

@@ -58,9 +58,7 @@ func Test_cacheQueries(t *testing.T) {
 					TableName:     tt.tableName,
 				},
 			}
-			plan := &model.ExecutionPlan{
-				Queries: queries,
-			}
+			plan := model.NewExecutionPlan(queries, nil)
 			pipeline := NewOptimizePipeline(&cfg)
 			optimized, err := pipeline.Transform(plan)
 			if err != nil {
@@ -214,9 +212,7 @@ func Test_dateTrunc(t *testing.T) {
 					SelectCommand: tt.query,
 				},
 			}
-			plan := &model.ExecutionPlan{
-				Queries: queries,
-			}
+			plan := model.NewExecutionPlan(queries, nil)
 			pipeline := NewOptimizePipeline(&cfg)
 			optimized, err := pipeline.Transform(plan)
 
@@ -453,9 +449,7 @@ func Test_materialized_view_replace(t *testing.T) {
 					SelectCommand: tt.query,
 				},
 			}
-			plan := &model.ExecutionPlan{
-				Queries: queries,
-			}
+			plan := model.NewExecutionPlan(queries, nil)
 			pipeline := NewOptimizePipeline(&cfg)
 			optimized, err := pipeline.Transform(plan)
 

platform/parsers/elastic_query_dsl/query_parser.go

@@ -43,7 +43,7 @@ func (cw *ClickhouseQueryTranslator) ParseQuery(body types.JSON) (*model.Executi
 	simpleQuery, hitsInfo, highlighter, err := cw.parseQueryInternal(body)
 	if err != nil || !simpleQuery.CanParse {
 		logger.WarnWithCtx(cw.Ctx).Msgf("error parsing query: %v", err)
-		return &model.ExecutionPlan{}, err
+		return model.NewExecutionPlan(nil, nil), err
 	}
 
 	var queries []*model.Query
@@ -74,7 +74,7 @@ func (cw *ClickhouseQueryTranslator) ParseQuery(body types.JSON) (*model.Executi
 
 	runtimeMappings, err := ParseRuntimeMappings(body) // we apply post query transformer for certain aggregation types
 	if err != nil {
-		return &model.ExecutionPlan{}, err
+		return model.NewExecutionPlan(nil, nil), err
 	}
 
 	// we apply post query transformer for certain aggregation types