Fix comet condition

biodatageeks · Jul 26, 2024 · ea12b1f · ea12b1f
1 parent 4e51ad5
commit ea12b1f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...n/scala/org/biodatageeks/sequila/rangejoins/common/ExtractRangeJoinKeysWithEquality.scala b/...n/scala/org/biodatageeks/sequila/rangejoins/common/ExtractRangeJoinKeysWithEquality.scala
@@ -28,19 +28,19 @@ object ExtractRangeJoinKeysWithEquality extends Logging with  PredicateHelper {
         condition.head match {
           case And(And(EqualTo(l3, r3), LessThanOrEqual(l1, g1)), LessThanOrEqual(l2, g2)) =>
             val rangeJoinKeys = getKeys(l1, l2, g1, g2, l3, r3, left, right)
-            Some((joinType, rangeJoinKeys, left, right, condition))
+            Some((joinType, rangeJoinKeys, left, right, Some(And(LessThanOrEqual(l1, g1), LessThanOrEqual(l2, g2)) ) ) )
           case And(And(EqualTo(l3, r3), GreaterThanOrEqual(g1, l1)), LessThanOrEqual(l2, g2)) =>
             Some((joinType,
               getKeys(l1, l2, g1, g2, l3, r3, left, right),
-              left, right,condition))
+              left, right, Some(And(GreaterThanOrEqual(g1, l1), LessThanOrEqual(l2, g2)) ) ) )
           case And(And(EqualTo(l3, r3), LessThanOrEqual(l1, g1)), GreaterThanOrEqual(g2, l2)) =>
             Some((joinType,
               getKeys(l1, l2, g1, g2, l3, r3, left, right),
-              left, right, condition))
+              left, right, Some( And( LessThanOrEqual(l1, g1), GreaterThanOrEqual(g2, l2)))))
           case And(And(EqualTo(l3, r3), GreaterThanOrEqual(g1, l1)), GreaterThanOrEqual(g2, l2)) =>
             Some((joinType,
               getKeys(l1, l2, g1, g2, l3, r3, left, right),
-              left, right, condition))
+              left, right, Some(And(GreaterThanOrEqual(g1, l1), GreaterThanOrEqual(g2, l2)))))
           case _ => None
         }
       } else {