External/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2025-12-19 00:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved conflicts

Browse Source
This commit is contained in:
eKuG 2025-08-11 12:44:17 +05:30
parent 5450b92650
commit 6338af55dd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/querier/consume.go
View File

@ -301,7 +301,7 @@ func readAsScalar(rows driver.Rows, queryName string) (*qbtypes.RawData, error)
} }
rr := qbtypes.RawRow{ rr := qbtypes.RawRow{
Data: make(map[string]*any, colCnt), Data: make(map[string]any, colCnt),
} }
for i, cellPtr := range scan { for i, cellPtr := range scan {

10
pkg/telemetrytraces/trace_operator_cte_builder.go
View File

@ -223,7 +223,7 @@ func (b *traceOperatorCTEBuilder) buildQueryCTE(queryName string) (string, error
// Get key selectors for the query // Get key selectors for the query
keySelectors := getKeySelectors(*query) keySelectors := getKeySelectors(*query)
keys, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors) keys, _, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -243,7 +243,7 @@ func (b *traceOperatorCTEBuilder) buildQueryCTE(queryName string) (string, error
// Add filter conditions if present // Add filter conditions if present
if query.Filter != nil && query.Filter.Expression != "" { if query.Filter != nil && query.Filter.Expression != "" {
filterWhereClause, _, err := querybuilder.PrepareWhereClause( filterWhereClause, err := querybuilder.PrepareWhereClause(
query.Filter.Expression, query.Filter.Expression,
querybuilder.FilterExprVisitorOpts{ querybuilder.FilterExprVisitorOpts{
FieldMapper: b.stmtBuilder.fm, FieldMapper: b.stmtBuilder.fm,
@ -255,7 +255,7 @@ func (b *traceOperatorCTEBuilder) buildQueryCTE(queryName string) (string, error
return "", err return "", err
} }
if filterWhereClause != nil { if filterWhereClause != nil {
sb.AddWhereClause(filterWhereClause) sb.AddWhereClause(filterWhereClause.WhereClause)
} }
} }
@ -515,7 +515,7 @@ func (b *traceOperatorCTEBuilder) buildTimeSeriesQuery(selectFromCTE string) (*q
// Get keys for field mapping // Get keys for field mapping
keySelectors := b.getKeySelectors() keySelectors := b.getKeySelectors()
keys, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors) keys, _, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -600,7 +600,7 @@ func (b *traceOperatorCTEBuilder) buildScalarQuery(selectFromCTE string) (*qbtyp
// Get keys for field mapping // Get keys for field mapping
keySelectors := b.getKeySelectors() keySelectors := b.getKeySelectors()
keys, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors) keys, _, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
if err != nil { if err != nil {
return nil, err return nil, err
} }