Updates

quesma/model/expr.go

@@ -9,7 +9,10 @@ type Expr interface {
 	Accept(v ExprVisitor) interface{}
 }
 
-var InvalidExpr = Expr(nil)
+var (
+	InvalidExpr = Expr(nil)
+	TrueExpr    = NewLiteral(true)
+)
 
 // ColumnRef is a reference to a column in a table, we can enrich it with more information (e.g. type used) as we go
 type ColumnRef struct {

quesma/queryparser/filters_aggregation.go

@@ -4,6 +4,7 @@ package queryparser
 
 import (
 	"quesma/logger"
+	"quesma/model"
 	"quesma/model/bucket_aggregations"
 )
 
@@ -32,13 +33,17 @@ func (cw *ClickhouseQueryTranslator) parseFilters(queryMap QueryMap) (success bo
 	}
 
 	filters := make([]bucket_aggregations.Filter, 0, len(nestedMap))
-	for name, filter := range nestedMap {
-		filterMap, ok := filter.(QueryMap)
+	for name, filterRaw := range nestedMap {
+		filterMap, ok := filterRaw.(QueryMap)
 		if !ok {
-			logger.WarnWithCtx(cw.Ctx).Msgf("filter is not a map, but %T, value: %v. Skipping.", filter, filter)
+			logger.WarnWithCtx(cw.Ctx).Msgf("filter is not a map, but %T, value: %v. Skipping.", filterRaw, filterRaw)
 			continue
 		}
-		filters = append(filters, bucket_aggregations.NewFilter(name, cw.parseQueryMap(filterMap)))
+		filter := cw.parseQueryMap(filterMap)
+		if filter.WhereClause == nil {
+			filter = model.NewSimpleQuery(model.TrueExpr, true)
+		}
+		filters = append(filters, bucket_aggregations.NewFilter(name, filter))
 	}
 	return true, bucket_aggregations.NewFilters(cw.Ctx, filters)
 }

quesma/queryparser/pancake_aggregation_parser.go

@@ -153,6 +153,9 @@ func (cw *ClickhouseQueryTranslator) pancakeParseAggregation(aggregationName str
 	if filterRaw, ok := queryMap["filter"]; ok {
 		if filter, ok := filterRaw.(QueryMap); ok {
 			whereClause := cw.parseQueryMap(filter).WhereClause
+			if whereClause == nil { // empty filter same as true
+				whereClause = model.TrueExpr
+			}
 			aggregation.queryType = bucket_aggregations.NewFilterAgg(cw.Ctx, whereClause)
 		} else {
 			logger.WarnWithCtx(cw.Ctx).Msgf("filter is not a map, but %T, value: %v. Skipping", filterRaw, filterRaw)

quesma/queryparser/pancake_sql_query_generation_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"quesma/clickhouse"
 	"quesma/concurrent"
+	"quesma/logger"
 	"quesma/model"
 	"quesma/model/bucket_aggregations"
 	"quesma/quesma/config"
@@ -24,7 +25,7 @@ const TableName = model.SingleTableNamePlaceHolder
 
 func TestPancakeQueryGeneration(t *testing.T) {
 
-	// logger.InitSimpleLoggerForTests()
+	logger.InitSimpleLoggerForTests()
 	table := clickhouse.Table{
 		Cols: map[string]*clickhouse.Column{
 			"@timestamp":  {Name: "@timestamp", Type: clickhouse.NewBaseType("DateTime64")},
@@ -61,7 +62,7 @@ func TestPancakeQueryGeneration(t *testing.T) {
 			}
 
 			if test.TestName == "multiple buckets_path(file:clients/clover,nr:1)" {
-				t.Skip("Unskip after merge of auto_date_histogram")
+				t.Skip("This needs fixing ASAP, easy to fix")
 			}
 
 			fmt.Println("i:", i, "test:", test.TestName)
@@ -79,6 +80,7 @@ func TestPancakeQueryGeneration(t *testing.T) {
 			assert.Len(t, pancakeSqls, 1+len(test.ExpectedAdditionalPancakeSQLs),
 				"Mismatch pancake sqls vs main and 'ExpectedAdditionalPancakeSQLs'")
 			for pancakeIdx, pancakeSql := range pancakeSqls {
+				pp.Println("=== Pancake SQL:", pancakeSql.SelectCommand)
 				pancakeSqlStr := model.AsString(pancakeSql.SelectCommand)
 
 				prettyPancakeSql := util.SqlPrettyPrint([]byte(pancakeSqlStr))

quesma/testdata/clients/clover.go

@@ -333,17 +333,17 @@ var CloverTests = []testdata.AggregationTestCase{
 		ExpectedPancakeResults: []model.QueryResultRow{
 			{Cols: []model.QueryResultCol{
 				model.NewQueryResultCol("aggr__timeseries__count", int64(202)),
+				model.NewQueryResultCol("metric__timeseries__a2-numerator_col_0", int64(202)),
+				model.NewQueryResultCol("aggr__timeseries__a2-denominator__count", int64(202)),
 			}},
 		},
 		ExpectedPancakeSQL: `
 			SELECT count(*) AS "aggr__timeseries__count",
-			  countIf(True) AS
-			  "name",
-			  countIf(NOT ("field" = 'sth')) AS
-			  "name"
+			  countIf(NOT ("table.flower" = 'clover')) AS "metric__timeseries__a2-numerator_col_0",
+			  countIf(true) AS "aggr__timeseries__a2-denominator__count"
 			FROM __quesma_table_name
-			WHERE ("@timestamp">=parseDateTime64BestEffort('2024-10-11T09:58:03.723Z') AND
-			  "@timestamp"<=parseDateTime64BestEffort('2024-10-11T10:13:03.723Z'))`,
+			WHERE ("@timestamp">=fromUnixTimestamp64Milli(1728640683723) AND "@timestamp"<=
+			  fromUnixTimestamp64Milli(1728641583723))`,
 	},
 	{ // [2]
 		TestName: "simplest auto_date_histogram",