flamechart: Stack Merging (#5478)

* wip: stack merging initial implementation * pkg/query: Fix grouping by timestamps and durations * ui/profile/ProfileIcicleGraph: Read duration and timestamp from column We expose these two columns in the table now and therefore can read the values directly. * Fixing the groupby field name and some UI fixes * [pre-commit.ci lite] apply automatic fixes * Brought back the group by timestamp field * Linter fix --------- Co-authored-by: Matthias Loibl <[email protected]> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
parca-dev · Feb 12, 2025 · 6ad4a58 · 6ad4a58
1 parent fb92f9a
commit 6ad4a58
Show file tree

Hide file tree

Showing 12 changed files with 264 additions and 161 deletions.
diff --git a/gen/proto/go/google/api/http.pb.go b/gen/proto/go/google/api/http.pb.go
diff --git a/pkg/parcacol/querier.go b/pkg/parcacol/querier.go
@@ -971,14 +971,18 @@ func (q *Querier) SymbolizeArrowRecord(
 
 		indices = schema.FieldIndices(profile.ColumnTimestamp)
 		var timestampColumn *array.Int64
-		if len(indices) != 1 {
+		if len(indices) == 1 {
+			timestampColumn = r.Column(indices[0]).(*array.Int64)
+		} else {
 			timestampColumn = arrowutils.MakeNullArray(q.pool, arrow.PrimitiveTypes.Int64, valueColumn.Len()).(*array.Int64)
 			defer timestampColumn.Release()
 		}
 
 		indices = schema.FieldIndices(profile.ColumnDuration)
 		var durationColumn *array.Int64
-		if len(indices) != 1 {
+		if len(indices) == 1 {
+			durationColumn = r.Column(indices[0]).(*array.Int64)
+		} else {
 			durationColumn = arrowutils.MakeNullArray(q.pool, arrow.PrimitiveTypes.Int64, valueColumn.Len()).(*array.Int64)
 			defer durationColumn.Release()
 		}

diff --git a/pkg/profile/reader.go b/pkg/profile/reader.go
@@ -39,7 +39,7 @@ type RecordReader struct {
 	Locations                     *array.List
 	Location                      *array.Struct
 	Address                       *array.Uint64
-	TimeNanos                     *array.Int64
+	Timestamp                     *array.Int64
 	Duration                      *array.Int64
 	MappingStart                  *array.Uint64
 	MappingLimit                  *array.Uint64
@@ -122,7 +122,7 @@ func NewRecordReader(ar arrow.Record) *RecordReader {
 	lineFunctionStartLine := line.Field(4).(*array.Int64)
 	valueColumn := ar.Column(labelNum + 1).(*array.Int64)
 	diffColumn := ar.Column(labelNum + 2).(*array.Int64)
-	timeNanos := ar.Column(labelNum + 3).(*array.Int64)
+	timestamp := ar.Column(labelNum + 3).(*array.Int64)
 	duration := ar.Column(labelNum + 4).(*array.Int64)
 
 	return &RecordReader{
@@ -151,7 +151,7 @@ func NewRecordReader(ar arrow.Record) *RecordReader {
 		LineFunctionStartLine:         lineFunctionStartLine,
 		Value:                         valueColumn,
 		Diff:                          diffColumn,
-		TimeNanos:                     timeNanos,
+		Timestamp:                     timestamp,
 		Duration:                      duration,
 	}
 }
diff --git a/pkg/query/columnquery.go b/pkg/query/columnquery.go
@@ -236,16 +236,16 @@ func (q *ColumnQueryAPI) Query(ctx context.Context, req *pb.QueryRequest) (*pb.Q
 
 	groupBy := req.GetGroupBy().GetFields()
 	allowedGroupBy := map[string]struct{}{
-		profile.ColumnTimeNanos:         {},
-		profile.ColumnDuration:          {},
+		FlamegraphFieldDuration:         {},
+		FlamegraphFieldFunctionFileName: {},
 		FlamegraphFieldFunctionName:     {},
 		FlamegraphFieldLocationAddress:  {},
 		FlamegraphFieldMappingFile:      {},
-		FlamegraphFieldFunctionFileName: {},
+		FlamegraphFieldTimestamp:        {},
 	}
 
 	if req.GetReportType() == pb.QueryRequest_REPORT_TYPE_FLAMECHART {
-		groupBy = append(groupBy, profile.ColumnTimeNanos, profile.ColumnDuration)
+		groupBy = append(groupBy, FlamegraphFieldTimestamp, FlamegraphFieldDuration)
 	}
 
 	groupByLabels := make([]string, 0, len(groupBy))