test: fix planner tests

Author: trevorwhitney

pkg/engine/internal/planner/logical/planner_test.go

@@ -331,8 +331,8 @@ RETURN %10
 	})
 }
 
-func TestPlannerCreatesParse(t *testing.T) {
-	t.Run("creates Parse instruction for metric query with logfmt", func(t *testing.T) {
+func TestPlannerCreatesProjectionWithParseOperation(t *testing.T) {
+	t.Run("creates projection instruction with logfmt parse operation for metric query", func(t *testing.T) {
 		// Query with logfmt parser followed by label filter in an instant metric query
 		q := &query{
 			statement: `sum by (level) (count_over_time({app="test"} | logfmt | level="error" [5m]))`,
@@ -353,7 +353,7 @@ func TestPlannerCreatesParse(t *testing.T) {
 %4 = SELECT %2 [predicate=%3]
 %5 = LT builtin.timestamp 1970-01-01T02:00:00Z
 %6 = SELECT %4 [predicate=%5]
-%7 = PARSE %6 [kind=logfmt]
+%7 = PROJECT %6 [mode=*E, expr=PARSE_LOGFMT(builtin.message)]
 %8 = EQ ambiguous.level "error"
 %9 = SELECT %7 [predicate=%8]
 %10 = RANGE_AGGREGATION %9 [operation=count, start_ts=1970-01-01T01:00:00Z, end_ts=1970-01-01T02:00:00Z, step=0s, range=5m0s]
@@ -364,7 +364,7 @@ RETURN %12
 		require.Equal(t, expected, plan.String())
 	})
 
-	t.Run("creates Parse instruction for log query with logfmt", func(t *testing.T) {
+	t.Run("creates projection instruction with logfmt parse operation for log query", func(t *testing.T) {
 		q := &query{
 			statement: `{app="test"} | logfmt | level="error"`,
 			start:     3600,
@@ -384,7 +384,7 @@ RETURN %12
 %4 = SELECT %2 [predicate=%3]
 %5 = LT builtin.timestamp 1970-01-01T02:00:00Z
 %6 = SELECT %4 [predicate=%5]
-%7 = PARSE %6 [kind=logfmt]
+%7 = PROJECT %6 [mode=*E, expr=PARSE_LOGFMT(builtin.message)]
 %8 = EQ ambiguous.level "error"
 %9 = SELECT %7 [predicate=%8]
 %10 = SORT %9 [column=builtin.timestamp, asc=false, nulls_first=false]
@@ -395,7 +395,7 @@ RETURN %12
 		require.Equal(t, expected, plan.String())
 	})
 
-	t.Run("creates Parse instruction for metric query with json", func(t *testing.T) {
+	t.Run("creates projection instruction with json parse operation for metric query", func(t *testing.T) {
 		// Query with logfmt parser followed by label filter in an instant metric query
 		q := &query{
 			statement: `sum by (level) (count_over_time({app="test"} | json | level="error" [5m]))`,
@@ -415,7 +415,7 @@ RETURN %12
 %4 = SELECT %2 [predicate=%3]
 %5 = LT builtin.timestamp 1970-01-01T02:00:00Z
 %6 = SELECT %4 [predicate=%5]
-%7 = PARSE %6 [kind=json]
+%7 = PROJECT %6 [mode=*E, expr=PARSE_JSON(builtin.message)]
 %8 = EQ ambiguous.level "error"
 %9 = SELECT %7 [predicate=%8]
 %10 = RANGE_AGGREGATION %9 [operation=count, start_ts=1970-01-01T01:00:00Z, end_ts=1970-01-01T02:00:00Z, step=0s, range=5m0s]
@@ -426,7 +426,7 @@ RETURN %12
 		require.Equal(t, expected, plan.String())
 	})
 
-	t.Run("creates Parse instruction for log query with json", func(t *testing.T) {
+	t.Run("creates projection instruction with json parse operation for log query", func(t *testing.T) {
 		q := &query{
 			statement: `{app="test"} | json | level="error"`,
 			start:     3600,
@@ -445,7 +445,7 @@ RETURN %12
 %4 = SELECT %2 [predicate=%3]
 %5 = LT builtin.timestamp 1970-01-01T02:00:00Z
 %6 = SELECT %4 [predicate=%5]
-%7 = PARSE %6 [kind=json]
+%7 = PROJECT %6 [mode=*E, expr=PARSE_JSON(builtin.message)]
 %8 = EQ ambiguous.level "error"
 %9 = SELECT %7 [predicate=%8]
 %10 = SORT %9 [column=builtin.timestamp, asc=false, nulls_first=false]
@@ -456,7 +456,7 @@ RETURN %12
 		require.Equal(t, expected, plan.String())
 	})
 
-	t.Run("preserves operation order with filters before and after parse", func(t *testing.T) {
+	t.Run("preserves operation order with filters before and after projection with parse operation", func(t *testing.T) {
 		// Test that filters before logfmt parse are applied before parsing,
 		// and filters after logfmt parse are applied after parsing.
 		// This is important for performance - we don't want to parse lines
@@ -484,7 +484,7 @@ RETURN %12
 %8 = SELECT %6 [predicate=%7]
 %9 = SELECT %8 [predicate=%2]
 %10 = SELECT %9 [predicate=%3]
-%11 = PARSE %10 [kind=logfmt]
+%11 = PROJECT %10 [mode=*E, expr=PARSE_LOGFMT(builtin.message)]
 %12 = EQ ambiguous.level "debug"
 %13 = SELECT %11 [predicate=%12]
 %14 = SORT %13 [column=builtin.timestamp, asc=false, nulls_first=false]
@@ -496,7 +496,7 @@ RETURN %16
 		require.Equal(t, expected, plan.String(), "Operations should be in the correct order: LineFilter before Parse, LabelFilter after Parse")
 	})
 
-	t.Run("preserves operation order in metric query with filters before and after parse", func(t *testing.T) {
+	t.Run("preserves operation order in metric query with filters before and after projection with parse operation", func(t *testing.T) {
 		// Test that filters before logfmt parse are applied before parsing in metric queries too
 		q := &query{
 			statement: `sum by (level) (count_over_time({job="app"} |= "error" | label="value" | logfmt | level="debug" [5m]))`,
@@ -521,7 +521,7 @@ RETURN %16
 %8 = SELECT %6 [predicate=%7]
 %9 = SELECT %8 [predicate=%2]
 %10 = SELECT %9 [predicate=%3]
-%11 = PARSE %10 [kind=logfmt]
+%11 = PROJECT %10 [mode=*E, expr=PARSE_LOGFMT(builtin.message)]
 %12 = EQ ambiguous.level "debug"
 %13 = SELECT %11 [predicate=%12]
 %14 = RANGE_AGGREGATION %13 [operation=count, start_ts=1970-01-01T01:00:00Z, end_ts=1970-01-01T02:00:00Z, step=0s, range=5m0s]