Signed-off-by: Song Gao <disxiaofei@163.com>

fix Signed-off-by: Song Gao <disxiaofei@163.com> fix Signed-off-by: Song Gao <disxiaofei@163.com>
lf-edge · Dec 26, 2024 · 76d3b9c · 76d3b9c
1 parent 17f5887
commit 76d3b9c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ build_prepare:
 .PHONY: build_without_edgex
 build_without_edgex: build_prepare
 	GO111MODULE=on CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X github.com/lf-edge/ekuiper/v2/cmd.Version=$(VERSION) -X github.com/lf-edge/ekuiper/v2/cmd.LoadFileType=relative" -o kuiper cmd/kuiper/main.go
-	GO111MODULE=on CGO_ENABLED=1 go build -trimpath -ldflags="-s -w -X github.com/lf-edge/ekuiper/v2/cmd.Version=$(VERSION) -X github.com/lf-edge/ekuiper/v2/cmd.LoadFileType=relative" -o kuiperd cmd/kuiperd/main.go
+	GO111MODULE=on CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X github.com/lf-edge/ekuiper/v2/cmd.Version=$(VERSION) -X github.com/lf-edge/ekuiper/v2/cmd.LoadFileType=relative" -o kuiperd cmd/kuiperd/main.go
 	@if [ "$$(uname -s)" = "Linux" ] && [ ! -z $$(which upx) ]; then upx ./kuiper; upx ./kuiperd; fi
 	@mv ./kuiper ./kuiperd $(BUILD_PATH)/$(PACKAGE_NAME)/bin
 	@echo "Build successfully"

diff --git a/internal/pkg/def/rule.go b/internal/pkg/def/rule.go
@@ -47,14 +47,14 @@ type RuleOption struct {
 type PlanOptimizeStrategy struct {
 	EnableIncrementalWindow bool `json:"enableIncrementalWindow,omitempty" yaml:"enableIncrementalWindow,omitempty"`
 	EnableAliasPushdown     bool `json:"enableAliasPushdown,omitempty" yaml:"enableAliasPushdown,omitempty"`
-	EnableAliasRefCal       bool `json:"enableAliasRefCal,omitempty" yaml:"enableAliasRefCal,omitempty"`
+	DisableAliasRefCal      bool `json:"disableAliasRefCal,omitempty" yaml:"disableAliasRefCal,omitempty"`
 }
 
 func (p *PlanOptimizeStrategy) IsAliasRefCalEnable() bool {
 	if p == nil {
-		return false
+		return true
 	}
-	return p.EnableAliasRefCal
+	return !p.DisableAliasRefCal
 }
 
 type RestartStrategy struct {
@@ -148,9 +148,7 @@ func GetDefaultRule(name, sql string) *Rule {
 				MaxDelay:     30000,
 				JitterFactor: 0.1,
 			},
-			PlanOptimizeStrategy: &PlanOptimizeStrategy{
-				EnableAliasRefCal: true,
-			},
+			PlanOptimizeStrategy: &PlanOptimizeStrategy{},
 		},
 	}
 }

diff --git a/internal/topo/planner/plan_explain_test.go b/internal/topo/planner/plan_explain_test.go
@@ -111,7 +111,6 @@ func TestExplainPlan(t *testing.T) {
 		p, err := createLogicalPlan(stmt, &def.RuleOption{
 			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
 				EnableIncrementalWindow: true,
-				EnableAliasRefCal:       true,
 			},
 			Qos: 0,
 		}, kv)

diff --git a/internal/topo/planner/planner_alias_test.go b/internal/topo/planner/planner_alias_test.go
@@ -245,17 +245,15 @@ func TestPlannerAlias(t *testing.T) {
 			continue
 		}
 		p, _ := createLogicalPlan(stmt, &def.RuleOption{
-			IsEventTime:        false,
-			LateTol:            0,
-			Concurrency:        0,
-			BufferLength:       0,
-			SendMetaToSink:     false,
-			Qos:                0,
-			CheckpointInterval: 0,
-			SendError:          true,
-			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
-				EnableAliasRefCal: true,
-			},
+			IsEventTime:          false,
+			LateTol:              0,
+			Concurrency:          0,
+			BufferLength:         0,
+			SendMetaToSink:       false,
+			Qos:                  0,
+			CheckpointInterval:   0,
+			SendError:            true,
+			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{},
 		}, kv)
 		if !reflect.DeepEqual(tt.p, p) {
 			t.Errorf("%d. %q\n\nstmt mismatch:\n\nexp=%#v\n\ngot=%#v\n\n", i, tt.sql, render.AsCode(tt.p), render.AsCode(p))

diff --git a/internal/topo/planner/planner_test.go b/internal/topo/planner/planner_test.go
@@ -2570,9 +2570,6 @@ func Test_createLogicalPlan(t *testing.T) {
 				Qos:                0,
 				CheckpointInterval: 0,
 				SendError:          true,
-				PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
-					EnableAliasRefCal: true,
-				},
 			}, kv)
 			if tt.err != "" {
 				assert.EqualError(t, err, tt.err)

diff --git a/internal/topo/topotest/rule_test.go b/internal/topo/topotest/rule_test.go
@@ -1248,7 +1248,6 @@ func TestSingleSQL(t *testing.T) {
 			SendError:    true,
 			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
 				EnableIncrementalWindow: true,
-				EnableAliasRefCal:       true,
 			},
 		},
 		{
@@ -1258,7 +1257,6 @@ func TestSingleSQL(t *testing.T) {
 			CheckpointInterval: cast.DurationConf(5 * time.Second),
 			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
 				EnableIncrementalWindow: true,
-				EnableAliasRefCal:       true,
 			},
 		},
 		{
@@ -1268,7 +1266,6 @@ func TestSingleSQL(t *testing.T) {
 			CheckpointInterval: cast.DurationConf(5 * time.Second),
 			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
 				EnableIncrementalWindow: true,
-				EnableAliasRefCal:       true,
 			},
 		},
 	}
@@ -1864,18 +1861,12 @@ func TestAliasSQL(t *testing.T) {
 			SendError:          true,
 			Qos:                def.AtLeastOnce,
 			CheckpointInterval: cast.DurationConf(5 * time.Second),
-			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
-				EnableAliasRefCal: true,
-			},
 		},
 		{
 			BufferLength:       100,
 			SendError:          true,
 			Qos:                def.ExactlyOnce,
 			CheckpointInterval: cast.DurationConf(5 * time.Second),
-			PlanOptimizeStrategy: &def.PlanOptimizeStrategy{
-				EnableAliasRefCal: true,
-			},
 		},
 	}
 	for _, opt := range options {