updated and and or aggregators

htemelski-redis · htemelski-redis · commit b2402d3bd837 · 2025-10-16T13:02:10.000+03:00
diff --git a/internal/routing/aggregator.go b/internal/routing/aggregator.go
@@ -494,37 +494,45 @@ func (a *AggLogicalAndAggregator) Add(result interface{}, err error) error {
 }
 
 func (a *AggLogicalAndAggregator) BatchAdd(results map[string]AggregatorResErr) error {
+	var result bool = true
+
 	for _, res := range results {
-		err := a.Add(res.Result, res.Err)
-		if err != nil {
-			return err
+		if res.Err != nil {
+			return a.Add(nil, res.Err)
 		}
 
-		if res.Err != nil {
-			return nil
+		boolRes, err := toBool(res.Result)
+		if err != nil {
+			return a.Add(nil, err)
 		}
+
+		result = result && boolRes
 	}
 
-	return nil
+	return a.Add(result, nil)
 }
 
 func (a *AggLogicalAndAggregator) AddWithKey(key string, result interface{}, err error) error {
 	return a.Add(result, err)
 }
 
 func (a *AggLogicalAndAggregator) BatchSlice(results []AggregatorResErr) error {
+	var result bool = true
+
 	for _, res := range results {
-		err := a.Add(res.Result, res.Err)
-		if err != nil {
-			return err
+		if res.Err != nil {
+			return a.Add(nil, res.Err)
 		}
 
-		if res.Err != nil {
-			return nil
+		boolRes, err := toBool(res.Result)
+		if err != nil {
+			return a.Add(nil, err)
 		}
+
+		result = result && boolRes
 	}
 
-	return nil
+	return a.Add(result, nil)
 }
 
 func (a *AggLogicalAndAggregator) Result() (interface{}, error) {
@@ -570,37 +578,45 @@ func (a *AggLogicalOrAggregator) Add(result interface{}, err error) error {
 }
 
 func (a *AggLogicalOrAggregator) BatchAdd(results map[string]AggregatorResErr) error {
+	var result bool = false
+
 	for _, res := range results {
-		err := a.Add(res.Result, res.Err)
-		if err != nil {
-			return err
+		if res.Err != nil {
+			return a.Add(nil, res.Err)
 		}
 
-		if res.Err != nil {
-			return nil
+		boolRes, err := toBool(res.Result)
+		if err != nil {
+			return a.Add(nil, err)
 		}
+
+		result = result || boolRes
 	}
 
-	return nil
+	return a.Add(result, nil)
 }
 
 func (a *AggLogicalOrAggregator) AddWithKey(key string, result interface{}, err error) error {
 	return a.Add(result, err)
 }
 
 func (a *AggLogicalOrAggregator) BatchSlice(results []AggregatorResErr) error {
+	var result bool = false
+
 	for _, res := range results {
-		err := a.Add(res.Result, res.Err)
-		if err != nil {
-			return err
+		if res.Err != nil {
+			return a.Add(nil, res.Err)
 		}
 
-		if res.Err != nil {
-			return nil
+		boolRes, err := toBool(res.Result)
+		if err != nil {
+			return a.Add(nil, err)
 		}
+
+		result = result || boolRes
 	}
 
-	return nil
+	return a.Add(result, nil)
 }
 
 func (a *AggLogicalOrAggregator) Result() (interface{}, error) {

Original file line number	Diff line number	Diff line change
`@@ -494,37 +494,45 @@ func (a *AggLogicalAndAggregator) Add(result interface{}, err error) error {`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`func (a *AggLogicalAndAggregator) BatchAdd(results map[string]AggregatorResErr) error {`
	`497`	`+ var result bool = true`
	`498`	`+`
`497`	`499`	`for _, res := range results {`
`498`		`- err := a.Add(res.Result, res.Err)`
`499`		`- if err != nil {`
`500`		`- return err`
	`500`	`+ if res.Err != nil {`
	`501`	`+ return a.Add(nil, res.Err)`
`501`	`502`	`}`
`502`	`503`
`503`		`- if res.Err != nil {`
`504`		`- return nil`
	`504`	`+ boolRes, err := toBool(res.Result)`
	`505`	`+ if err != nil {`
	`506`	`+ return a.Add(nil, err)`
`505`	`507`	`}`
	`508`	`+`
	`509`	`+ result = result && boolRes`
`506`	`510`	`}`
`507`	`511`
`508`		`- return nil`
	`512`	`+ return a.Add(result, nil)`
`509`	`513`	`}`
`510`	`514`
`511`	`515`	`func (a *AggLogicalAndAggregator) AddWithKey(key string, result interface{}, err error) error {`
`512`	`516`	`return a.Add(result, err)`
`513`	`517`	`}`
`514`	`518`
`515`	`519`	`func (a *AggLogicalAndAggregator) BatchSlice(results []AggregatorResErr) error {`
	`520`	`+ var result bool = true`
	`521`	`+`
`516`	`522`	`for _, res := range results {`
`517`		`- err := a.Add(res.Result, res.Err)`
`518`		`- if err != nil {`
`519`		`- return err`
	`523`	`+ if res.Err != nil {`
	`524`	`+ return a.Add(nil, res.Err)`
`520`	`525`	`}`
`521`	`526`
`522`		`- if res.Err != nil {`
`523`		`- return nil`
	`527`	`+ boolRes, err := toBool(res.Result)`
	`528`	`+ if err != nil {`
	`529`	`+ return a.Add(nil, err)`
`524`	`530`	`}`
	`531`	`+`
	`532`	`+ result = result && boolRes`
`525`	`533`	`}`
`526`	`534`
`527`		`- return nil`
	`535`	`+ return a.Add(result, nil)`
`528`	`536`	`}`
`529`	`537`
`530`	`538`	`func (a *AggLogicalAndAggregator) Result() (interface{}, error) {`
`@@ -570,37 +578,45 @@ func (a *AggLogicalOrAggregator) Add(result interface{}, err error) error {`
`570`	`578`	`}`
`571`	`579`
`572`	`580`	`func (a *AggLogicalOrAggregator) BatchAdd(results map[string]AggregatorResErr) error {`
	`581`	`+ var result bool = false`
	`582`	`+`
`573`	`583`	`for _, res := range results {`
`574`		`- err := a.Add(res.Result, res.Err)`
`575`		`- if err != nil {`
`576`		`- return err`
	`584`	`+ if res.Err != nil {`
	`585`	`+ return a.Add(nil, res.Err)`
`577`	`586`	`}`
`578`	`587`
`579`		`- if res.Err != nil {`
`580`		`- return nil`
	`588`	`+ boolRes, err := toBool(res.Result)`
	`589`	`+ if err != nil {`
	`590`	`+ return a.Add(nil, err)`
`581`	`591`	`}`
	`592`	`+`
	`593`	`+ result = result \|\| boolRes`
`582`	`594`	`}`
`583`	`595`
`584`		`- return nil`
	`596`	`+ return a.Add(result, nil)`
`585`	`597`	`}`
`586`	`598`
`587`	`599`	`func (a *AggLogicalOrAggregator) AddWithKey(key string, result interface{}, err error) error {`
`588`	`600`	`return a.Add(result, err)`
`589`	`601`	`}`
`590`	`602`
`591`	`603`	`func (a *AggLogicalOrAggregator) BatchSlice(results []AggregatorResErr) error {`
	`604`	`+ var result bool = false`
	`605`	`+`
`592`	`606`	`for _, res := range results {`
`593`		`- err := a.Add(res.Result, res.Err)`
`594`		`- if err != nil {`
`595`		`- return err`
	`607`	`+ if res.Err != nil {`
	`608`	`+ return a.Add(nil, res.Err)`
`596`	`609`	`}`
`597`	`610`
`598`		`- if res.Err != nil {`
`599`		`- return nil`
	`611`	`+ boolRes, err := toBool(res.Result)`
	`612`	`+ if err != nil {`
	`613`	`+ return a.Add(nil, err)`
`600`	`614`	`}`
	`615`	`+`
	`616`	`+ result = result \|\| boolRes`
`601`	`617`	`}`
`602`	`618`
`603`		`- return nil`
	`619`	`+ return a.Add(result, nil)`
`604`	`620`	`}`
`605`	`621`
`606`	`622`	`func (a *AggLogicalOrAggregator) Result() (interface{}, error) {`