Cleanup

Author: trzysiek

quesma/clickhouse/util.go

@@ -5,10 +5,8 @@ package clickhouse
 import (
 	"bytes"
 	"fmt"
-	"github.com/QuesmaOrg/quesma/quesma/model"
 	"github.com/goccy/go-json"
 	"strings"
-	"time"
 )
 
 // Code doesn't need to be pretty, 99.9% it's just for our purposes
@@ -110,50 +108,3 @@ func PrettyJson(jsonStr string) string {
 	}
 	return prettyJSON.String()
 }
-
-// TimestampGroupBy returns string to be used in the select part of Clickhouse query, when grouping by timestamp interval.
-// e.g.
-// - timestampGroupBy("@timestamp", DateTime64, 30 seconds) --> toInt64(toUnixTimestamp64Milli(`@timestamp`)/30000)
-// - timestampGroupBy("@timestamp", DateTime, 30 seconds)   --> toInt64(toUnixTimestamp(`@timestamp`)/30)
-func TimestampGroupBy(fullTimestampExpr model.Expr, timestampField model.ColumnRef, groupByInterval time.Duration) model.Expr {
-	toUnixTsFunc := model.NewInfixExpr(
-		model.NewFunction(model.ToUnixTimestampMs, fullTimestampExpr),
-		" / ", // TODO nasty hack to make our string-based tests pass. Operator should not contain spaces obviously
-		model.NewMillisecondsLiteral(timestampField, groupByInterval.Milliseconds()),
-	)
-	return model.NewFunction("toInt64", toUnixTsFunc)
-}
-
-func TimestampGroupByWithTimezone(fullTimestampExpr model.Expr, timestampField model.ColumnRef, groupByInterval time.Duration, timezone string) model.Expr {
-
-	// If no timezone, or timezone is default (UTC), we just return TimestampGroupBy(...)
-	if timezone == "" {
-		return TimestampGroupBy(fullTimestampExpr, timestampField, groupByInterval)
-	}
-
-	var offset model.Expr = model.NewInfixExpr(
-		model.NewFunction(
-			"timeZoneOffset",
-			model.NewFunction(
-				"toTimezone",
-				fullTimestampExpr, model.NewLiteralSingleQuoteString(timezone),
-			),
-		),
-		"*",
-		model.NewMillisecondsLiteral(timestampField, 1000),
-	)
-
-	unixTsWithOffset := model.NewInfixExpr(
-		model.NewFunction(model.ToUnixTimestampMs, fullTimestampExpr),
-		"+",
-		offset,
-	)
-
-	groupByExpr := model.NewInfixExpr(
-		model.NewParenExpr(unixTsWithOffset),
-		" / ", // TODO nasty hack to make our string-based tests pass. Operator should not contain spaces obviously
-		model.NewMillisecondsLiteral(timestampField, groupByInterval.Milliseconds()),
-	)
-
-	return model.NewFunction("toInt64", groupByExpr)
-}

quesma/model/bucket_aggregations/date_histogram.go

@@ -153,8 +153,44 @@ func (query *DateHistogram) generateSQLForFixedInterval() model.Expr {
 	interval, err := util.ParseInterval(query.interval)
 	if err != nil {
 		logger.ErrorWithCtx(query.ctx).Msg(err.Error())
+		return model.InvalidExpr
 	}
-	return clickhouse.TimestampGroupByWithTimezone(query.field, query.timestampColumn, interval, query.timezone)
+
+	var groupBy model.InfixExpr
+	// If no timezone, or timezone is default (UTC)
+	if query.timezone == "" {
+		groupBy = model.NewInfixExpr(
+			model.NewFunction(model.ToUnixTimestampMs, query.field),
+			" / ", // TODO nasty hack to make our string-based tests pass. Operator should not contain spaces obviously
+			model.NewMillisecondsLiteral(query.timestampColumn, interval.Milliseconds()),
+		)
+	} else {
+		offset := model.NewInfixExpr(
+			model.NewFunction(
+				"timeZoneOffset",
+				model.NewFunction(
+					"toTimezone",
+					query.field, model.NewLiteralSingleQuoteString(query.timezone),
+				),
+			),
+			"*",
+			model.NewMillisecondsLiteral(query.timestampColumn, 1000),
+		)
+
+		unixTsWithOffset := model.NewInfixExpr(
+			model.NewFunction(model.ToUnixTimestampMs, query.field),
+			"+",
+			offset,
+		)
+
+		groupBy = model.NewInfixExpr(
+			model.NewParenExpr(unixTsWithOffset),
+			" / ", // TODO nasty hack to make our string-based tests pass. Operator should not contain spaces obviously
+			model.NewMillisecondsLiteral(query.timestampColumn, interval.Milliseconds()),
+		)
+	}
+
+	return model.NewFunction("toInt64", groupBy)
 }
 
 func (query *DateHistogram) generateSQLForCalendarInterval() model.Expr {

quesma/testdata/aggregation_requests.go

@@ -3,19 +3,10 @@
 package testdata
 
 import (
-	"github.com/QuesmaOrg/quesma/quesma/clickhouse"
 	"github.com/QuesmaOrg/quesma/quesma/model"
 	"math"
-	"time"
 )
 
-var timestampGroupByClause = model.AsString(clickhouse.TimestampGroupBy(
-	model.NewColumnRef("@timestamp"), model.NewColumnRef("@timestamp"), 30*time.Second))
-
-func groupBySQL(fieldName string, typ clickhouse.DateTimeType, groupByInterval time.Duration) string {
-	return model.AsString(clickhouse.TimestampGroupBy(model.NewColumnRef(fieldName), model.NewColumnRef(fieldName), groupByInterval))
-}
-
 const fullTextFieldName = `"` + model.FullTextFieldNamePlaceHolder + `"`
 
 // TODO change some tests to size > 0, and track_total_hits different values