GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-15 00:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use proper tableName (#5982)

Browse Source 
* fix: use proper tableName

* fix: remove duplicate code
This commit is contained in:
Nityananda Gohain 2024-09-16 14:30:31 +05:30 committed by GitHub
parent fe0d2a967f
commit 481c4e1271
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/query-service/app/clickhouseReader/reader.go
View File

@ -136,8 +136,9 @@ type ClickHouseReader struct {
liveTailRefreshSeconds int liveTailRefreshSeconds int
cluster string cluster string
useLogsNewSchema bool useLogsNewSchema bool
logsTableName string logsTableName string
logsLocalTableName string
} }
// NewTraceReader returns a TraceReader for the database // NewTraceReader returns a TraceReader for the database
@ -202,8 +203,10 @@ func NewReaderFromClickhouseConnection(
} }
logsTableName := options.primary.LogsTable logsTableName := options.primary.LogsTable
logsLocalTableName := options.primary.LogsLocalTable
if useLogsNewSchema { if useLogsNewSchema {
logsTableName = options.primary.LogsTableV2 logsTableName = options.primary.LogsTableV2
logsLocalTableName = options.primary.LogsLocalTableV2
} }
return &ClickHouseReader{ return &ClickHouseReader{
@ -240,6 +243,7 @@ func NewReaderFromClickhouseConnection(
logsResourceTableV2: options.primary.LogsResourceTableV2, logsResourceTableV2: options.primary.LogsResourceTableV2,
logsResourceLocalTableV2: options.primary.LogsResourceLocalTableV2, logsResourceLocalTableV2: options.primary.LogsResourceLocalTableV2,
logsTableName: logsTableName, logsTableName: logsTableName,
logsLocalTableName: logsLocalTableName,
} }
} }
@ -3268,23 +3272,23 @@ func (r *ClickHouseReader) GetLogFields(ctx context.Context) (*model.GetFieldsRe
resources = removeUnderscoreDuplicateFields(resources) resources = removeUnderscoreDuplicateFields(resources)
statements := []model.ShowCreateTableStatement{} statements := []model.ShowCreateTableStatement{}
query = fmt.Sprintf("SHOW CREATE TABLE %s.%s", r.logsDB, r.logsTable) query = fmt.Sprintf("SHOW CREATE TABLE %s.%s", r.logsDB, r.logsLocalTableName)
err = r.db.Select(ctx, &statements, query) err = r.db.Select(ctx, &statements, query)
if err != nil { if err != nil {
return nil, &model.ApiError{Err: err, Typ: model.ErrorInternal} return nil, &model.ApiError{Err: err, Typ: model.ErrorInternal}
} }
extractSelectedAndInterestingFields(statements[0].Statement, constants.Attributes, &attributes, &response) r.extractSelectedAndInterestingFields(statements[0].Statement, constants.Attributes, &attributes, &response)
extractSelectedAndInterestingFields(statements[0].Statement, constants.Resources, &resources, &response) r.extractSelectedAndInterestingFields(statements[0].Statement, constants.Resources, &resources, &response)
return &response, nil return &response, nil
} }
func extractSelectedAndInterestingFields(tableStatement string, fieldType string, fields *[]model.LogField, response *model.GetFieldsResponse) { func (r *ClickHouseReader) extractSelectedAndInterestingFields(tableStatement string, fieldType string, fields *[]model.LogField, response *model.GetFieldsResponse) {
for _, field := range *fields { for _, field := range *fields {
field.Type = fieldType field.Type = fieldType
// all static fields are assumed to be selected as we don't allow changing them // all static fields are assumed to be selected as we don't allow changing them
if isSelectedField(tableStatement, field) { if isColumn(r.useLogsNewSchema, tableStatement, field.Type, field.Name, field.DataType) {
response.Selected = append(response.Selected, field) response.Selected = append(response.Selected, field)
} else { } else {
response.Interesting = append(response.Interesting, field) response.Interesting = append(response.Interesting, field)
@ -3292,13 +3296,6 @@ func extractSelectedAndInterestingFields(tableStatement string, fieldType string
} }
} }
func isSelectedField(tableStatement string, field model.LogField) bool {
// in case of attributes and resources, if there is a materialized column present then it is selected
// TODO: handle partial change complete eg:- index is removed but materialized column is still present
name := utils.GetClickhouseColumnName(field.Type, field.DataType, field.Name)
return strings.Contains(tableStatement, name)
}
func (r *ClickHouseReader) UpdateLogFieldV2(ctx context.Context, field *model.UpdateField) *model.ApiError { func (r *ClickHouseReader) UpdateLogFieldV2(ctx context.Context, field *model.UpdateField) *model.ApiError {
if !field.Selected { if !field.Selected {
return model.ForbiddenError(errors.New("removing a selected field is not allowed, please reach out to support.")) return model.ForbiddenError(errors.New("removing a selected field is not allowed, please reach out to support."))
@ -4033,7 +4030,7 @@ func (r *ClickHouseReader) GetLogAggregateAttributes(ctx context.Context, req *v
defer rows.Close() defer rows.Close()
statements := []model.ShowCreateTableStatement{} statements := []model.ShowCreateTableStatement{}
query = fmt.Sprintf("SHOW CREATE TABLE %s.%s", r.logsDB, r.logsTable) query = fmt.Sprintf("SHOW CREATE TABLE %s.%s", r.logsDB, r.logsLocalTableName)
err = r.db.Select(ctx, &statements, query) err = r.db.Select(ctx, &statements, query)
if err != nil { if err != nil {
return nil, fmt.Errorf("error while fetching logs schema: %s", err.Error()) return nil, fmt.Errorf("error while fetching logs schema: %s", err.Error())
@ -4087,7 +4084,7 @@ func (r *ClickHouseReader) GetLogAttributeKeys(ctx context.Context, req *v3.Filt
defer rows.Close() defer rows.Close()
statements := []model.ShowCreateTableStatement{} statements := []model.ShowCreateTableStatement{}
query = fmt.Sprintf("SHOW CREATE TABLE %s.%s", r.logsDB, r.logsTable) query = fmt.Sprintf("SHOW CREATE TABLE %s.%s", r.logsDB, r.logsLocalTableName)
err = r.db.Select(ctx, &statements, query) err = r.db.Select(ctx, &statements, query)
if err != nil { if err != nil {
return nil, fmt.Errorf("error while fetching logs schema: %s", err.Error()) return nil, fmt.Errorf("error while fetching logs schema: %s", err.Error())
@ -4174,10 +4171,10 @@ func (r *ClickHouseReader) GetLogAttributeValues(ctx context.Context, req *v3.Fi
// prepare the query and run // prepare the query and run
if len(req.SearchText) != 0 { if len(req.SearchText) != 0 {
query = fmt.Sprintf("select distinct %s from %s.%s where timestamp >= toInt64(toUnixTimestamp(now() - INTERVAL 48 HOUR)*1000000000) and %s ILIKE $1 limit $2", selectKey, r.logsDB, r.logsTable, filterValueColumnWhere) query = fmt.Sprintf("select distinct %s from %s.%s where timestamp >= toInt64(toUnixTimestamp(now() - INTERVAL 48 HOUR)*1000000000) and %s ILIKE $1 limit $2", selectKey, r.logsDB, r.logsLocalTableName, filterValueColumnWhere)
rows, err = r.db.Query(ctx, query, searchText, req.Limit) rows, err = r.db.Query(ctx, query, searchText, req.Limit)
} else { } else {
query = fmt.Sprintf("select distinct %s from %s.%s where timestamp >= toInt64(toUnixTimestamp(now() - INTERVAL 48 HOUR)*1000000000) limit $1", selectKey, r.logsDB, r.logsTable) query = fmt.Sprintf("select distinct %s from %s.%s where timestamp >= toInt64(toUnixTimestamp(now() - INTERVAL 48 HOUR)*1000000000) limit $1", selectKey, r.logsDB, r.logsLocalTableName)
rows, err = r.db.Query(ctx, query, req.Limit) rows, err = r.db.Query(ctx, query, req.Limit)
} }
} else if len(req.SearchText) != 0 { } else if len(req.SearchText) != 0 {