Merge pull request #42 from michalt/from_antijoin

Fix `Relation::from_antijoin` (issue #39)

Author: ecstatic-morse

src/join.rs

@@ -78,15 +78,15 @@ pub(crate) fn join_into_relation<'me, Key: Ord, Val1: Ord, Val2: Ord, Result: Or
 }
 
 /// Moves all recent tuples from `input1` that are not present in `input2` into `output`.
-pub(crate) fn antijoin<'me, Key: Ord, Val: Ord, Result: Ord>(
-    input1: impl JoinInput<'me, (Key, Val)>,
+pub(crate) fn antijoin<Key: Ord, Val: Ord, Result: Ord>(
+    input1: &Relation<(Key, Val)>,
     input2: &Relation<Key>,
     mut logic: impl FnMut(&Key, &Val) -> Result,
 ) -> Relation<Result> {
     let mut tuples2 = &input2[..];
 
     let results = input1
-        .recent()
+        .elements
         .iter()
         .filter(|(ref key, _)| {
             tuples2 = gallop(tuples2, |k| k < key);

src/test.rs

@@ -219,3 +219,14 @@ fn passthrough_leaper() {
     expected.extend((20..=40).filter_map(|i| (i%4 == 0).then(|| (i, i))));
     assert_eq!(&*variable, &expected);
 }
+
+#[test]
+fn relation_from_antijoin() {
+    let lhs: Relation<_> = (0 .. 10).map(|x| (x, x)).collect();
+    let rhs: Relation<_> = (0 .. 10).filter(|x| x % 2 == 0).collect();
+    let expected: Relation<_> = (0 .. 10).filter(|x| x % 2 == 1).map(|x| (x, x)).collect();
+
+    let result = Relation::from_antijoin(&lhs, &rhs, |a, b| (*a, *b));
+
+    assert_eq!(result.elements, expected.elements);
+}

src/variable.rs

@@ -177,7 +177,7 @@ impl<Tuple: Ord> Variable<Tuple> {
         input2: &Relation<K>,
         logic: impl FnMut(&K, &V) -> Tuple,
     ) {
-        self.insert(join::antijoin(input1, input2, logic))
+        self.insert(join::antijoin(&input1.recent.borrow(), input2, logic))
     }
 
     /// Adds tuples that result from mapping `input`.