feat(backend): fix

Author: kidkidkid

backend/modules/observability/infra/repo/ck/spans.go

@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -213,23 +214,25 @@ func (s *SpansCkDaoImpl) formatAggregationExpression(ctx context.Context, dimens
 }
 
 type buildSqlParam struct {
-	spanTable   string
-	annoTable   string
-	queryParam  *QueryParam
-	db          *gorm.DB
-	omitColumns []string
+	spanTable     string
+	annoTable     string
+	queryParam    *QueryParam
+	db            *gorm.DB
+	selectColumns []string
+	omitColumns   []string
 }
 
 func (s *SpansCkDaoImpl) buildSql(ctx context.Context, param *QueryParam) (*gorm.DB, error) {
 	db := s.newSession(ctx)
 	var tableQueries []*gorm.DB
 	for _, table := range param.Tables {
 		query, err := s.buildSingleSql(ctx, &buildSqlParam{
-			spanTable:   table,
-			annoTable:   param.AnnoTableMap[table],
-			queryParam:  param,
-			db:          db,
-			omitColumns: param.OmitColumns,
+			spanTable:     table,
+			annoTable:     param.AnnoTableMap[table],
+			queryParam:    param,
+			db:            db,
+			selectColumns: param.SelectColumns,
+			omitColumns:   param.OmitColumns,
 		})
 		if err != nil {
 			return nil, err
@@ -265,9 +268,9 @@ func (s *SpansCkDaoImpl) buildSingleSql(ctx context.Context, param *buildSqlPara
 		return nil, err
 	}
 	queryColumns := lo.Ternary(
-		len(param.SelectColumns) == 0,
-		getColumnStr(spanColumns, param.OmitColumns),
-		getColumnStr(param.SelectColumns, param.OmitColumns),
+		len(param.selectColumns) == 0,
+		getColumnStr(spanColumns, param.omitColumns),
+		getColumnStr(param.selectColumns, param.omitColumns),
 	)
 	sqlQuery = param.db.
 		Table(param.spanTable).Select(queryColumns).
@@ -370,11 +373,11 @@ func (s *SpansCkDaoImpl) buildFieldCondition(ctx context.Context, db *gorm.DB, f
 		}
 		queryChain = queryChain.Where(fmt.Sprintf("%s like ?", filter.FieldName), fmt.Sprintf("%%%v%%", fieldValues[0]))
 	case loop_span.QueryTypeEnumNotMatch:
-			if len(fieldValues) != 1 {
-				return nil, fmt.Errorf("filter field %s should have one value", filter.FieldName)
-			}
-			queryChain = queryChain.Where(fmt.Sprintf("%s NOT like ?", fieldName), fmt.Sprintf("%%%v%%", fieldValues[0]))
-		case loop_span.QueryTypeEnumEq:
+		if len(fieldValues) != 1 {
+			return nil, fmt.Errorf("filter field %s should have one value", filter.FieldName)
+		}
+		queryChain = queryChain.Where(fmt.Sprintf("%s NOT like ?", filter.FieldName), fmt.Sprintf("%%%v%%", fieldValues[0]))
+	case loop_span.QueryTypeEnumEq:
 		if len(fieldValues) != 1 {
 			return nil, fmt.Errorf("filter field %s should have one value", filter.FieldName)
 		}
@@ -680,6 +683,7 @@ var validColumnRegex = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_.]*$`)
 func isSafeColumnName(name string) bool {
 	return validColumnRegex.MatchString(name)
 }
+
 var (
 	defSuperFieldsMap = map[string]bool{
 		loop_span.SpanFieldStartTime:       true,

backend/modules/observability/infra/repo/ck/spans_test.go

@@ -391,7 +391,7 @@ func TestBuildSql(t *testing.T) {
 					},
 				},
 			},
-			expectedSql: "SELECT * FROM `observability_spans` WHERE span_id in (SELECT span_id FROM `observability_annotations` WHERE (annotation_type = 'manual_feedback' AND key = 'abc' AND value_string IN ('123')) AND deleted_at = 0 AND start_time >= 1 AND start_time <= 2 SETTINGS final = 1) AND start_time >= 1 AND start_time <= 2 LIMIT 100",
+			expectedSql: "SELECT start_time, logid, span_id, trace_id, parent_id, duration, psm, call_type, space_id, span_type, span_name, method, status_code, input, output, object_storage, system_tags_string, system_tags_long, system_tags_float, tags_string, tags_long, tags_bool, tags_float, tags_byte, reserve_create_time, logic_delete_date FROM `observability_spans` WHERE span_id in (SELECT span_id FROM `observability_annotations` WHERE (annotation_type = 'manual_feedback' AND key = 'abc' AND value_string IN ('123')) AND deleted_at = 0 AND start_time >= 1 AND start_time <= 2 SETTINGS final = 1) AND start_time >= 1 AND start_time <= 2 LIMIT 100",
 		},
 	}
 	for _, tc := range testCases {
@@ -584,11 +584,15 @@ func TestQueryTypeEnumNotMatchSqlExceptionCases(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			qDb, err := new(SpansCkDaoImpl).buildSingleSql(context.Background(), db, "observability_spans", &QueryParam{
-				StartTime: 1,
-				EndTime:   2,
-				Filters:   tc.filter,
-				Limit:     100,
+			qDb, err := new(SpansCkDaoImpl).buildSingleSql(context.Background(), &buildSqlParam{
+				spanTable: "observability_spans",
+				queryParam: &QueryParam{
+					StartTime: 1,
+					EndTime:   2,
+					Filters:   tc.filter,
+					Limit:     100,
+				},
+				db: db,
 			})
 
 			if tc.shouldError {
@@ -731,11 +735,15 @@ func TestQueryTypeEnumNotMatchComplexScenarios(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			qDb, err := new(SpansCkDaoImpl).buildSingleSql(context.Background(), db, "observability_spans", &QueryParam{
-				StartTime: 1,
-				EndTime:   2,
-				Filters:   tc.filter,
-				Limit:     100,
+			qDb, err := new(SpansCkDaoImpl).buildSingleSql(context.Background(), &buildSqlParam{
+				spanTable: "observability_spans",
+				queryParam: &QueryParam{
+					StartTime: 1,
+					EndTime:   2,
+					Filters:   tc.filter,
+					Limit:     100,
+				},
+				db: db,
 			})
 			assert.NoError(t, err, "Unexpected error for test case: %s", tc.name)
 			sql := qDb.ToSQL(func(tx *gorm.DB) *gorm.DB {