refactor: revise project operator field name

internal/topo/operator/project_operator.go

@@ -26,11 +26,12 @@ import (
 )
 
 type ProjectOp struct {
-	ColNames         [][]string // list of [col, table]
-	AliasNames       []string   // list of alias name
-	ExprNames        []string   // list of expr name
-	ExceptNames      []string   // list of except name
-	WindowFuncNames  map[string]ast.Field
+	ColNames    [][]string // list of [col, table]
+	AliasNames  []string   // list of alias name
+	ExprNames   []string   // list of expr name
+	ExceptNames []string   // list of except name
+	// OtherFieldNames store the field calculated by other operators, eg: window function
+	OtherFieldNames  map[string]ast.Field
 	AllWildcard      bool
 	WildcardEmitters map[string]bool
 	AliasFields      ast.Fields
@@ -138,7 +139,7 @@ func (pp *ProjectOp) project(row xsql.RawRow, ve *xsql.ValuerEval) error {
 	// Do not set value during calculations
 
 	for _, f := range pp.ExprFields {
-		if _, ok := pp.WindowFuncNames[f.Name]; ok {
+		if _, ok := pp.OtherFieldNames[f.Name]; ok {
 			vi, _ := row.Value(f.Name, "")
 			pp.kvs = append(pp.kvs, f.Name, vi)
 			continue
@@ -159,7 +160,7 @@ func (pp *ProjectOp) project(row xsql.RawRow, ve *xsql.ValuerEval) error {
 		}
 	}
 	for _, f := range pp.AliasFields {
-		if _, ok := pp.WindowFuncNames[f.AName]; ok {
+		if _, ok := pp.OtherFieldNames[f.AName]; ok {
 			vi, _ := row.Value(f.AName, "")
 			pp.kvs = append(pp.kvs, f.AName, vi)
 			continue

internal/topo/planner/planner.go

@@ -277,7 +277,7 @@ func buildOps(lp LogicalPlan, tp *topo.Topo, options *def.RuleOption, sources ma
 	case *OrderPlan:
 		op = Transform(&operator.OrderOp{SortFields: t.SortFields}, fmt.Sprintf("%d_order", newIndex), options)
 	case *ProjectPlan:
-		op = Transform(&operator.ProjectOp{ColNames: t.colNames, AliasNames: t.aliasNames, AliasFields: t.aliasFields, ExprFields: t.exprFields, ExceptNames: t.exceptNames, IsAggregate: t.isAggregate, AllWildcard: t.allWildcard, WildcardEmitters: t.wildcardEmitters, ExprNames: t.exprNames, SendMeta: t.sendMeta, LimitCount: t.limitCount, EnableLimit: t.enableLimit, WindowFuncNames: t.windowFuncNames}, fmt.Sprintf("%d_project", newIndex), options)
+		op = Transform(&operator.ProjectOp{ColNames: t.colNames, AliasNames: t.aliasNames, AliasFields: t.aliasFields, ExprFields: t.exprFields, ExceptNames: t.exceptNames, IsAggregate: t.isAggregate, AllWildcard: t.allWildcard, WildcardEmitters: t.wildcardEmitters, ExprNames: t.exprNames, SendMeta: t.sendMeta, LimitCount: t.limitCount, EnableLimit: t.enableLimit, OtherFieldNames: t.otherFieldNames}, fmt.Sprintf("%d_project", newIndex), options)
 	case *ProjectSetPlan:
 		op = Transform(&operator.ProjectSetOperator{SrfMapping: t.SrfMapping, LimitCount: t.limitCount, EnableLimit: t.enableLimit}, fmt.Sprintf("%d_projectset", newIndex), options)
 	case *WindowFuncPlan:
@@ -562,7 +562,7 @@ func createLogicalPlan(stmt *ast.SelectStatement, opt *def.RuleOption, store kv.
 			limitCount = int(stmt.Limit.(*ast.LimitExpr).LimitCount.Val)
 		}
 		p = ProjectPlan{
-			windowFuncNames: windowFuncFields,
+			otherFieldNames: packOtherField(windowFuncFields),
 			fields:          fields,
 			isAggregate:     xsql.WithAggFields(stmt),
 			sendMeta:        opt.SendMetaToSink,
@@ -591,6 +591,10 @@ func createLogicalPlan(stmt *ast.SelectStatement, opt *def.RuleOption, store kv.
 	return optimize(p)
 }
 
+func packOtherField(windowFuncFields map[string]ast.Field) map[string]ast.Field {
+	return windowFuncFields
+}
+
 // extractSRFMapping extracts the set-returning-function in the field
 func extractSRFMapping(stmt *ast.SelectStatement) map[string]struct{} {
 	m := make(map[string]struct{})

internal/topo/planner/planner_test.go

@@ -388,7 +388,7 @@ func Test_createLogicalPlan(t *testing.T) {
 						},
 					},
 				},
-				windowFuncNames: map[string]ast.Field{
+				otherFieldNames: map[string]ast.Field{
 					"index": {
 						Name:  "row_number",
 						AName: "index",
@@ -449,7 +449,7 @@ func Test_createLogicalPlan(t *testing.T) {
 						},
 					},
 				},
-				windowFuncNames: map[string]ast.Field{
+				otherFieldNames: map[string]ast.Field{
 					"row_number": {
 						Name: "row_number",
 						Expr: &ast.Call{

internal/topo/planner/projectPlan.go

@@ -30,7 +30,7 @@ type ProjectPlan struct {
 	aliasNames       []string
 	exprNames        []string
 	exceptNames      []string
-	windowFuncNames  map[string]ast.Field
+	otherFieldNames  map[string]ast.Field
 	wildcardEmitters map[string]bool
 	aliasFields      ast.Fields
 	exprFields       ast.Fields
@@ -68,8 +68,8 @@ func (p ProjectPlan) Init() *ProjectPlan {
 	}
 	p.baseLogicalPlan.self = &p
 	p.baseLogicalPlan.setPlanType(PROJECT)
-	if len(p.windowFuncNames) < 1 {
-		p.windowFuncNames = nil
+	if len(p.otherFieldNames) < 1 {
+		p.otherFieldNames = nil
 	}
 	return &p
 }