Merge pull request #228 from Qrlew/fix_issue_226

Fixed DP rewriting for join of PUP and DP relations
Qrlew · Dec 19, 2023 · be2cb94 · be2cb94
2 parents 602bf61 + 1dda2dc
commit be2cb94
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- DP rewriting for join of PUP and DP relations [#228](https://github.com/Qrlew/qrlew/issues/228)
+
 
 ## [0.6.0] - 2023-12-18
 ### Added

diff --git a/src/privacy_unit_tracking/mod.rs b/src/privacy_unit_tracking/mod.rs
@@ -382,7 +382,7 @@ impl<'a> PrivacyUnitTracking<'a> {
         }
     }
 
-    /// Join privacy tracking from 2 PUP relations
+    /// Join privacy tracking from a published and a PUP relations
     pub fn join_left_published(
         //TODO this need to be cleaned (really)
         &self,
@@ -435,7 +435,7 @@ impl<'a> PrivacyUnitTracking<'a> {
         PUPRelation::try_from(relation)
     }
 
-    /// Join privacy tracking from 2 PUP relations
+    /// Join privacy tracking from a PUP and a published relations
     pub fn join_right_published(
         //TODO this need to be cleaned (really)
         &self,

diff --git a/src/rewriting/mod.rs b/src/rewriting/mod.rs
@@ -179,6 +179,7 @@ mod tests {
             ),
             ("order_table", vec![("user_id", "user_table", "id")], "name"),
             ("user_table", vec![], "name"),
+            ("table_1", vec![], PrivacyUnit::privacy_unit_row())
         ]);
         let budget = Budget::new(1., 1e-3);
 
@@ -187,13 +188,16 @@ mod tests {
             "SELECT order_id, sum(price), sum(distinct price) FROM item_table GROUP BY order_id HAVING count(*) > 2",
             "SELECT order_id, sum(order_id) FROM item_table GROUP BY order_id",
             "SELECT order_id As my_order, sum(price) FROM item_table GROUP BY my_order",
-            "SELECT order_id, MAX(order_id), sum(price) FROM item_table GROUP BY order_id"
+            "SELECT order_id, MAX(order_id), sum(price) FROM item_table GROUP BY order_id",
+            "WITH my_avg AS (SELECT AVG(price) AS avg_price, STDDEV(price) AS std_price FROM item_table WHERE price > 1.) SELECT AVG((price - avg_price) / std_price) FROM item_table CROSS JOIN my_avg WHERE std_price > 1.",
+            "WITH my_avg AS (SELECT MIN(price) AS min_price, MAX(price) AS max_price FROM item_table WHERE price > 1.) SELECT AVG(price - min_price) FROM item_table CROSS JOIN my_avg",
         ];
 
         for q in queries {
             println!("=================================\n{q}");
             let query = parse(q).unwrap();
             let relation = Relation::try_from(query.with(&relations)).unwrap();
+            relation.display_dot().unwrap();
             let relation_with_private_query = relation
                 .rewrite_with_differential_privacy(&relations, synthetic_data.clone(), privacy_unit.clone(), budget.clone())
                 .unwrap();

diff --git a/src/rewriting/rewriting_rule.rs b/src/rewriting/rewriting_rule.rs
@@ -1210,6 +1210,10 @@ impl<'a> RewriteVisitor<'a> for Rewriter<'a> {
                     [Property::Published, Property::PrivacyUnitPreserving],
                     Property::PrivacyUnitPreserving,
                     Parameters::PrivacyUnit(privacy_unit),
+                ) | (
+                    [Property::DifferentiallyPrivate, Property::PrivacyUnitPreserving],
+                    Property::PrivacyUnitPreserving,
+                    Parameters::PrivacyUnit(privacy_unit),
                 ) => {
                     let privacy_unit_tracking = PrivacyUnitTracking::new(
                         self.0,
@@ -1229,6 +1233,10 @@ impl<'a> RewriteVisitor<'a> for Rewriter<'a> {
                     [Property::PrivacyUnitPreserving, Property::Published],
                     Property::PrivacyUnitPreserving,
                     Parameters::PrivacyUnit(privacy_unit),
+                ) | (
+                    [Property::PrivacyUnitPreserving, Property::DifferentiallyPrivate],
+                    Property::PrivacyUnitPreserving,
+                    Parameters::PrivacyUnit(privacy_unit),
                 ) => {
                     let privacy_unit_tracking = PrivacyUnitTracking::new(
                         self.0,