From f51a50736808660efc30ece4511c2ca8ffa49651 Mon Sep 17 00:00:00 2001 From: Frank McSherry Date: Fri, 26 Jan 2024 13:57:06 -0500 Subject: [PATCH] Update dogs3 dependency --- Cargo.lock | 4 ++-- misc/cargo-vet/audits.toml | 2 +- src/compute/src/render/join/delta_join.rs | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e24f6bd9d2fe..ffff09b21e5bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1785,7 +1785,7 @@ checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" [[package]] name = "differential-dataflow" version = "0.12.0" -source = "git+https://github.com/MaterializeInc/differential-dataflow.git#c5b9baca0283f4d96f7e6f914de8578fb5c521de" +source = "git+https://github.com/MaterializeInc/differential-dataflow.git#9da4dd365cc2cb0bcd317198731c3c7d42f3f657" dependencies = [ "abomonation", "abomonation_derive", @@ -1841,7 +1841,7 @@ checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" [[package]] name = "dogsdogsdogs" version = "0.1.0" -source = "git+https://github.com/MaterializeInc/differential-dataflow.git#c5b9baca0283f4d96f7e6f914de8578fb5c521de" +source = "git+https://github.com/MaterializeInc/differential-dataflow.git#9da4dd365cc2cb0bcd317198731c3c7d42f3f657" dependencies = [ "abomonation", "abomonation_derive", diff --git a/misc/cargo-vet/audits.toml b/misc/cargo-vet/audits.toml index 788752e614e36..9822c8dff3c89 100644 --- a/misc/cargo-vet/audits.toml +++ b/misc/cargo-vet/audits.toml @@ -38,7 +38,7 @@ version = "1.2.6" [[audits.differential-dataflow]] who = "Moritz Hoffmann " criteria = "safe-to-deploy" -version = "0.12.0@git:c5b9baca0283f4d96f7e6f914de8578fb5c521de" +version = "0.12.0@git:9da4dd365cc2cb0bcd317198731c3c7d42f3f657" [[audits.dynfmt]] who = "Sean Loiselle " diff --git a/src/compute/src/render/join/delta_join.rs b/src/compute/src/render/join/delta_join.rs index 08bd4424e4a86..15b1c473b322c 100644 --- a/src/compute/src/render/join/delta_join.rs +++ b/src/compute/src/render/join/delta_join.rs @@ -461,7 +461,9 @@ where let (oks, errs2) = dogsdogsdogs::operators::half_join::half_join_internal_unsafe( &updates, trace, - |time| time.step_back(), + |time, antichain| { + antichain.insert(time.step_back()); + }, comparison, // TODO(mcsherry): investigate/establish trade-offs here; time based had problems, // in that we seem to yield too much and do too little work when we do. @@ -508,7 +510,9 @@ where let oks = dogsdogsdogs::operators::half_join::half_join_internal_unsafe( &updates, trace, - |time| time.step_back(), + |time, antichain| { + antichain.insert(time.step_back()); + }, comparison, // TODO(mcsherry): investigate/establish trade-offs here; time based had problems, // in that we seem to yield too much and do too little work when we do.