Apply sum() only when having is enabled

runtime/queries/metricsview_comparison_toplist.go

@@ -6,14 +6,14 @@
 	"fmt"
 	"io"
 	"strings"
 	// Load IANA time zone data
 	_ "time/tzdata"
 
 	runtimev1 "github.com/rilldata/rill/proto/gen/rill/runtime/v1"
 	"github.com/rilldata/rill/runtime"
 	"github.com/rilldata/rill/runtime/drivers"
 	"github.com/rilldata/rill/runtime/pkg/pbutil"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
 type MetricsViewComparison struct {
@@ -32,7 +32,7 @@
 	ResolvedMVSecurity  *runtime.ResolvedMetricsViewSecurity           `json:"security"`
 	Exact               bool                                           `json:"exact"`
 
-	// TODO: backwards compatibility
+	// backwards compatibility
 	Filter *runtimev1.MetricsViewFilter `json:"filter"`
 
 	Result *runtimev1.MetricsViewComparisonResponse `json:"-"`
@@ -165,6 +165,7 @@
 		return fmt.Errorf("error building query: %w", err)
 	}
 
+	fmt.Println(sql, args)
 	rows, err := olap.Execute(ctx, &drivers.Statement{
 		Query:    sql,
 		Args:     args,
@@ -461,14 +462,23 @@
 		var columnsTuple string
 		var labelTuple string
 		if dialect != drivers.DialectDruid {
-			// TODO: only add `sum()` only if having is enabled
-			columnsTuple = fmt.Sprintf(
-				"sum(base.%[1]s) as %[1]s, sum(comparison.%[1]s) AS %[2]s, sum(base.%[1]s - comparison.%[1]s) AS %[3]s, sum((base.%[1]s - comparison.%[1]s)/comparison.%[1]s::DOUBLE) AS %[4]s",
-				safeName(m.Name),
-				safeName(m.Name+"__previous"),
-				safeName(m.Name+"__delta_abs"),
-				safeName(m.Name+"__delta_rel"),
-			)
+			if q.Having != nil {
+				columnsTuple = fmt.Sprintf(
+					"sum(base.%[1]s) as %[1]s, sum(comparison.%[1]s) AS %[2]s, sum(base.%[1]s - comparison.%[1]s) AS %[3]s, sum((base.%[1]s - comparison.%[1]s)/comparison.%[1]s::DOUBLE) AS %[4]s",
+					safeName(m.Name),
+					safeName(m.Name+"__previous"),
+					safeName(m.Name+"__delta_abs"),
+					safeName(m.Name+"__delta_rel"),
+				)
+			} else {
+				columnsTuple = fmt.Sprintf(
+					"base.%[1]s, comparison.%[1]s AS %[2]s, base.%[1]s - comparison.%[1]s AS %[3]s, (base.%[1]s - comparison.%[1]s)/comparison.%[1]s::DOUBLE AS %[4]s",
+					safeName(m.Name),
+					safeName(m.Name+"__previous"),
+					safeName(m.Name+"__delta_abs"),
+					safeName(m.Name+"__delta_rel"),
+				)
+			}
 			labelTuple = fmt.Sprintf(
 				"base.%[1]s AS %[5]s, comparison.%[1]s AS %[2]s, base.%[1]s - comparison.%[1]s AS %[3]s, (base.%[1]s - comparison.%[1]s)/comparison.%[1]s::DOUBLE AS %[4]s",
 				safeName(m.Name),
@@ -565,7 +575,7 @@
 		if err != nil {
 			return "", nil, err
 		}
-		havingClause = "HAVING " + havingClause
+		havingClause = "GROUP BY 1 HAVING " + havingClause
 		args = append(args, havingClauseArgs...)
 	}
 
@@ -700,7 +710,6 @@
 			) comparison
 		ON
 				base.%[2]s = comparison.%[2]s OR (base.%[2]s is null and comparison.%[2]s is null)
-		GROUP BY 1
 		%[16]s
 		ORDER BY
 			%[6]s

runtime/queries/metricsview_rows.go

@@ -27,7 +27,7 @@ type MetricsViewRows struct {
 	MetricsView        *runtimev1.MetricsViewSpec           `json:"-"`
 	ResolvedMVSecurity *runtime.ResolvedMetricsViewSecurity `json:"security"`
 
-	// TODO: backwards compatibility
+	// backwards compatibility
 	Filter *runtimev1.MetricsViewFilter `json:"filter,omitempty"`
 
 	Result *runtimev1.MetricsViewRowsResponse `json:"-"`

runtime/queries/metricsview_timeseries.go

@@ -35,7 +35,7 @@ type MetricsViewTimeSeries struct {
 	MetricsView        *runtimev1.MetricsViewSpec           `json:"-"`
 	ResolvedMVSecurity *runtime.ResolvedMetricsViewSecurity `json:"security"`
 
-	// TODO: backwards compatibility
+	// backwards compatibility
 	Filter *runtimev1.MetricsViewFilter `json:"filter,omitempty"`
 
 	Result *runtimev1.MetricsViewTimeSeriesResponse `json:"-"`

runtime/queries/metricsview_toplist.go

@@ -28,7 +28,7 @@ type MetricsViewToplist struct {
 	MetricsView        *runtimev1.MetricsViewSpec           `json:"-"`
 	ResolvedMVSecurity *runtime.ResolvedMetricsViewSecurity `json:"security"`
 
-	// TODO: backwards compatibility
+	// backwards compatibility
 	Filter *runtimev1.MetricsViewFilter `json:"filter,omitempty"`
 
 	Result *runtimev1.MetricsViewToplistResponse `json:"-"`

runtime/queries/metricsview_totals.go

@@ -24,7 +24,7 @@ type MetricsViewTotals struct {
 	MetricsView        *runtimev1.MetricsViewSpec           `json:"-"`
 	ResolvedMVSecurity *runtime.ResolvedMetricsViewSecurity `json:"security"`
 
-	// TODO: backwards compatibility
+	// backwards compatibility
 	Filter *runtimev1.MetricsViewFilter `json:"filter,omitempty"`
 
 	Result *runtimev1.MetricsViewTotalsResponse `json:"-"`