and and unless for native histograms

Signed-off-by: Saumya Shah <[email protected]>

Author: Saumya40-codes

Diff for: engine/engine_test.go

@@ -5373,6 +5373,10 @@ histogram_sum(
 			name:  "Binary AND",
 			query: `histogram_quantile(0.7, native_histogram_series) AND native_histogram_series`,
 		},
+		{
+			name:  "Unless",
+			query: `sum without(foo) (native_histogram_series) unless native_histogram_series`,
+		},
 	}
 
 	defer pprof.StopCPUProfile()

Diff for: execution/binary/vector.go

@@ -232,17 +232,19 @@ func (o *vectorOperator) execBinaryAnd(lhs, rhs model.StepVector) (model.StepVec
 		jp.sid = sampleID
 		jp.ats = ts
 	}
-	for i, sampleID := range lhs.SampleIDs {
-		if jp := o.hcJoinBuckets[sampleID]; jp.ats == ts {
-			step.AppendSample(o.pool, o.outputSeriesID(sampleID+1, jp.sid+1), lhs.Samples[i])
-		}
-	}
 
 	for _, histogramID := range rhs.HistogramIDs {
 		jp := o.lcJoinBuckets[histogramID]
 		jp.sid = histogramID
 		jp.ats = ts
 	}
+
+	for i, sampleID := range lhs.SampleIDs {
+		if jp := o.hcJoinBuckets[sampleID]; jp.ats == ts {
+			step.AppendSample(o.pool, o.outputSeriesID(sampleID+1, jp.sid+1), lhs.Samples[i])
+		}
+	}
+
 	for i, histogramID := range lhs.HistogramIDs {
 		if jp := o.hcJoinBuckets[histogramID]; jp.ats == ts {
 			step.AppendHistogram(o.pool, o.outputSeriesID(histogramID+1, jp.sid+1), lhs.Histograms[i])
@@ -268,8 +270,7 @@ func (o *vectorOperator) execBinaryOr(lhs, rhs model.StepVector) (model.StepVect
 	}
 
 	for i, sampleID := range rhs.SampleIDs {
-		jp := o.lcJoinBuckets[sampleID]
-		if jp.ats != ts {
+		if jp := o.lcJoinBuckets[sampleID]; jp.ats != ts {
 			step.AppendSample(o.pool, o.outputSeriesID(0, sampleID+1), rhs.Samples[i])
 		}
 	}
@@ -291,11 +292,21 @@ func (o *vectorOperator) execBinaryUnless(lhs, rhs model.StepVector) (model.Step
 		jp := o.lcJoinBuckets[sampleID]
 		jp.ats = ts
 	}
+	for _, histogramID := range rhs.HistogramIDs {
+		jp := o.lcJoinBuckets[histogramID]
+		jp.ats = ts
+	}
+
 	for i, sampleID := range lhs.SampleIDs {
 		if jp := o.hcJoinBuckets[sampleID]; jp.ats != ts {
 			step.AppendSample(o.pool, o.outputSeriesID(sampleID+1, 0), lhs.Samples[i])
 		}
 	}
+	for i, histogramID := range lhs.HistogramIDs {
+		if jp := o.hcJoinBuckets[histogramID]; jp.ats != ts {
+			step.AppendHistogram(o.pool, o.outputSeriesID(histogramID+1, 0), lhs.Histograms[i])
+		}
+	}
 	return step, nil
 }