Initial

Author: trzysiek

quesma/queryparser/aggregation_parser_test.go

@@ -10,9 +10,6 @@ import (
 	"quesma/schema"
 	"quesma/testdata"
 	"quesma/testdata/clients"
-	dashboard_1 "quesma/testdata/dashboard-1"
-	kibana_visualize "quesma/testdata/kibana-visualize"
-	opensearch_visualize "quesma/testdata/opensearch-visualize"
 	"testing"
 )
 
@@ -655,17 +652,18 @@ func allAggregationTests() []testdata.AggregationTestCase {
 		}
 	}
 
-	add(testdata.AggregationTests, "agg_req")
-	add(testdata.AggregationTests2, "agg_req_2")
-	add(testdata.AggregationTestsWithDates, "dates")
-	add(opensearch_visualize.AggregationTests, "opensearch-visualize/agg_req")
-	add(dashboard_1.AggregationTests, "dashboard-1/agg_req")
-	add(testdata.PipelineAggregationTests, "pipeline_agg_req")
-	add(opensearch_visualize.PipelineAggregationTests, "opensearch-visualize/pipeline_agg_req")
-	add(kibana_visualize.AggregationTests, "kibana-visualize/agg_req")
-	add(kibana_visualize.PipelineAggregationTests, "kibana-visualize/pipeline_agg_req")
-	add(clients.KunkkaTests, "clients/kunkka")
-	add(clients.OpheliaTests, "clients/ophelia")
+	//add(testdata.AggregationTests, "agg_req")
+	//add(testdata.AggregationTests2, "agg_req_2")
+	//add(testdata.AggregationTestsWithDates, "dates")
+	//add(opensearch_visualize.AggregationTests, "opensearch-visualize/agg_req")
+	//add(dashboard_1.AggregationTests, "dashboard-1/agg_req")
+	//add(testdata.PipelineAggregationTests, "pipeline_agg_req")
+	//add(opensearch_visualize.PipelineAggregationTests, "opensearch-visualize/pipeline_agg_req")
+	//add(kibana_visualize.AggregationTests, "kibana-visualize/agg_req")
+	//add(kibana_visualize.PipelineAggregationTests, "kibana-visualize/pipeline_agg_req")
+	//add(clients.KunkkaTests, "clients/kunkka")
+	//add(clients.OpheliaTests, "clients/ophelia")
+	add(clients.CloverTests, "clients/clover")
 
 	return allTests
 }

quesma/queryparser/pancake_sql_query_generation.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/k0kubun/pp"
 	"quesma/model"
 	"quesma/model/bucket_aggregations"
 	"quesma/model/metrics_aggregations"
@@ -292,7 +293,7 @@ func (p *pancakeSqlQueryGenerator) generateSelectCommand(aggregation *pancakeMod
 	addIfCombinators := make([]addIfCombinator, 0)
 	var optTopHitsOrMetrics *pancakeModelMetricAggregation
 
-	for _, layer := range aggregation.layers {
+	for i, layer := range aggregation.layers {
 		for _, metric := range layer.currentMetricAggregations {
 			switch metric.queryType.(type) {
 			case *metrics_aggregations.TopMetrics, *metrics_aggregations.TopHits:
@@ -309,7 +310,15 @@ func (p *pancakeSqlQueryGenerator) generateSelectCommand(aggregation *pancakeMod
 
 		if layer.nextBucketAggregation != nil {
 			if combinator, isCombinator := layer.nextBucketAggregation.queryType.(bucket_aggregations.CombinatorAggregationInterface); isCombinator {
-				addIfCombinators = append(addIfCombinators, addIfCombinator{len(selectColumns), combinator})
+				var isFilter bool
+				pp.Println(combinator)
+				switch combinator.(type) {
+				case *bucket_aggregations.FilterAgg, bucket_aggregations.Filters:
+					isFilter = true
+				}
+				if !isFilter || i > 0 {
+					addIfCombinators = append(addIfCombinators, addIfCombinator{len(selectColumns), combinator})
+				}
 			}
 
 			if layer.nextBucketAggregation.DoesHaveGroupBy() {
@@ -333,6 +342,7 @@ func (p *pancakeSqlQueryGenerator) generateSelectCommand(aggregation *pancakeMod
 	// this change selects by adding -If suffix, e.g. count(*) -> countIf(response_time < 1000)
 	// they may also add more columns with different prefix and where clauses
 	var combinatorWhere []model.Expr
+	fmt.Println("len(addIfCombinators): ", len(addIfCombinators))
 	for i := len(addIfCombinators) - 1; i >= 0; i-- { // reverse order is important
 		combinator := addIfCombinators[i]
 		selectsBefore := selectColumns[:combinator.selectNr]

quesma/queryparser/pancake_sql_query_generation_test.go

@@ -60,6 +60,10 @@ func TestPancakeQueryGeneration(t *testing.T) {
 				t.Skip("Need to implement order by top metrics (talk with Jacek, he has an idea)")
 			}
 
+			if i != 0 {
+				t.Skip()
+			}
+
 			fmt.Println("i:", i, "test:", test.TestName)
 
 			jsonp, err := types.ParseJSON(test.QueryRequestJson)

quesma/queryparser/pancake_transformer.go

@@ -125,9 +125,14 @@ type layerAndNextBucket struct {
 }
 
 func (a *pancakeTransformer) optimizeSimpleFilter(previousAggrNames []string, result *layerAndNextBucket, childAgg *pancakeAggregationTreeNode) bool {
+	if len(previousAggrNames) == 0 { // already optimized
+		//return false
+	}
+
 	_, isFilter := result.nextBucketAggregation.queryType.(bucket_aggregations.FilterAgg)
 	secondFilter, isFilter2 := childAgg.queryType.(bucket_aggregations.FilterAgg)
 
+	fmt.Println("dupa", isFilter, isFilter2, len(childAgg.children))
 	if isFilter && isFilter2 && len(childAgg.children) == 0 {
 		metrics, err := a.metricAggregationTreeNodeToModel(previousAggrNames, childAgg)
 		if err != nil {
@@ -241,6 +246,7 @@ func (a *pancakeTransformer) aggregationChildrenToLayers(aggrNames []string, chi
 
 func (a *pancakeTransformer) checkIfSupported(layers []*pancakeModelLayer) error {
 	// for now we support filter only as last bucket aggregation
+	/* let's try to support everything
 	for layerIdx, layer := range layers {
 		if layer.nextBucketAggregation != nil {
 			switch layer.nextBucketAggregation.queryType.(type) {
@@ -253,14 +259,17 @@ func (a *pancakeTransformer) checkIfSupported(layers []*pancakeModelLayer) error
 							continue // histogram are fine
 						case bucket_aggregations.CombinatorAggregationInterface:
 							continue // we also support nested filters/range/dataRange
+						case *bucket_aggregations.Filters:
+							continue
 						default:
-							return fmt.Errorf("filter(s)/range/dataRange aggregation must be the last bucket aggregation")
+							return fmt.Errorf("filter(s)/range/dataRange aggregation must be the last bucket aggregation (found %s)", bucket.queryType.String())
 						}
 					}
 				}
 			}
 		}
 	}
+	*/
 	return nil
 }
 
@@ -379,6 +388,8 @@ func (a *pancakeTransformer) aggregationTreeToPancakes(topLevel pancakeAggregati
 		return nil, fmt.Errorf("no top level aggregations found")
 	}
 
+	//pp.Println("pancakeAggregationTree", topLevel, topLevel.children[0])
+
 	resultLayers, err := a.aggregationChildrenToLayers([]string{}, topLevel.children)
 
 	if err != nil {