feat(sql): 密态 GROUP BY 的 k-匿名抑制(小组整行置 NaN)
secure_group_by 加 min_group_size 参数:命中数低于阈值的分组整行置 NaN, 与明文引擎的 k-匿名语义一致(防止「某个组只有一行 ⇒ 聚合值即原始值」)。 aggregate_with_mask 改回传 (count, values) 供抑制判断。 新增 k-匿名测试。nax-sql --features secure 19 测,workspace 216 全绿。
This commit is contained in:
1 parent
33c25533cf
commit
86c871fac3
1 file changed
+47
-7
@@ -68,13 +68,13 @@ pub fn mask_for<T: Transport>(
|
||||
}
|
||||
}
|
||||
|
||||
/// 在给定 0/1 掩码下对 `col` 求各聚合,返回明文结果。
|
||||
/// 在给定 0/1 掩码下对 `col` 求各聚合,返回 `(count, 各聚合明文值)`。
|
||||
fn aggregate_with_mask<T: Transport>(
|
||||
vault: &mut Vault<T>,
|
||||
col: &[u64],
|
||||
mask: &[u64],
|
||||
aggs: &[Agg],
|
||||
) -> Result<Vec<f64>, VaultError> {
|
||||
) -> Result<(usize, Vec<f64>), VaultError> {
|
||||
let fxp = vault.fxp();
|
||||
let len = col.len();
|
||||
let masked = vault.bit_mask(mask, col)?; // mask · col,精确
|
||||
@@ -136,7 +136,7 @@ fn aggregate_with_mask<T: Transport>(
|
||||
};
|
||||
out.push(v);
|
||||
}
|
||||
Ok(out)
|
||||
Ok((count, out))
|
||||
}
|
||||
|
||||
/// 密态执行 `SELECT <aggs> FROM t WHERE col <op> T`(无 GROUP BY),返回各聚合的明文结果。
|
||||
@@ -151,13 +151,15 @@ pub fn secure_where_aggregate<T: Transport>(
|
||||
) -> Result<Vec<f64>, VaultError> {
|
||||
let th = vault.constant(threshold, col.len())?;
|
||||
let mask = mask_for(vault, col, &th, op)?;
|
||||
aggregate_with_mask(vault, col, &mask, aggs)
|
||||
let (_count, vals) = aggregate_with_mask(vault, col, &mask, aggs)?;
|
||||
Ok(vals)
|
||||
}
|
||||
|
||||
/// 密态 GROUP BY:`gcol` 是已编码到 `0..n_groups-1` 的分组码分片(fxp 尺度),
|
||||
/// `n_groups` 是**公开**取值域大小。`pred` 可选 `(threshold, op)` 作为 WHERE。
|
||||
///
|
||||
/// 返回 `n_groups` 行,每行按 `aggs` 顺序给出明文聚合值(组顺序 = 码顺序)。
|
||||
/// `min_group_size > 0` 时,命中数低于阈值的分组整行置 `NaN`(k-匿名抑制)。
|
||||
pub fn secure_group_by<T: Transport>(
|
||||
vault: &mut Vault<T>,
|
||||
col: &[u64],
|
||||
@@ -165,6 +167,7 @@ pub fn secure_group_by<T: Transport>(
|
||||
n_groups: usize,
|
||||
pred: Option<(f64, CmpOp)>,
|
||||
aggs: &[Agg],
|
||||
min_group_size: usize,
|
||||
) -> Result<Vec<Vec<f64>>, VaultError> {
|
||||
let len = col.len();
|
||||
if gcol.len() != len {
|
||||
@@ -184,7 +187,12 @@ pub fn secure_group_by<T: Transport>(
|
||||
let gc = vault.constant(g as f64, len)?;
|
||||
let gmask = vault.bit_eq(gcol, &gc)?;
|
||||
let mask = vault.bit_and(&base, &gmask)?;
|
||||
out.push(aggregate_with_mask(vault, col, &mask, aggs)?);
|
||||
let (count, vals) = aggregate_with_mask(vault, col, &mask, aggs)?;
|
||||
if min_group_size > 0 && count < min_group_size {
|
||||
out.push(vec![f64::NAN; aggs.len()]); // 整行抑制
|
||||
} else {
|
||||
out.push(vals);
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
@@ -313,10 +321,10 @@ mod tests {
|
||||
let (g0, g1) = split_vec(&mut va, &g, fxp);
|
||||
|
||||
let ha = thread::spawn(move || {
|
||||
secure_group_by(&mut va, &x0, &g0, 2, None, &aggs).unwrap()
|
||||
secure_group_by(&mut va, &x0, &g0, 2, None, &aggs, 0).unwrap()
|
||||
});
|
||||
let hb = thread::spawn(move || {
|
||||
let _ = secure_group_by(&mut vb, &x1, &g1, 2, None, &aggs).unwrap();
|
||||
let _ = secure_group_by(&mut vb, &x1, &g1, 2, None, &aggs, 0).unwrap();
|
||||
});
|
||||
let got = ha.join().unwrap();
|
||||
hb.join().unwrap();
|
||||
@@ -328,4 +336,36 @@ mod tests {
|
||||
assert!((row[1] - ws).abs() < 1e-6, "group {gi} SUM {} vs {ws}", row[1]);
|
||||
}
|
||||
}
|
||||
|
||||
/// k-匿名:命中数低于阈值的分组整行置 NaN。
|
||||
#[test]
|
||||
fn secure_group_by_k_anonymity() {
|
||||
let x = [10.0f64, 20.0, 30.0, 40.0];
|
||||
let g = [0.0f64, 1.0, 1.0, 1.0]; // 组0 仅 1 行,组1 3 行
|
||||
let aggs = [Agg::Count, Agg::Sum];
|
||||
|
||||
let (pa, pb) = Pipe::pair();
|
||||
let sites = ["alice", "bob"];
|
||||
let fxp = 18u32;
|
||||
let seed = [41u8; 32];
|
||||
let mut va = Vault::new(pa, "alice", &sites, seed, fxp).unwrap();
|
||||
let mut vb = Vault::new(pb, "bob", &sites, seed, fxp).unwrap();
|
||||
let (x0, x1) = split_vec(&mut va, &x, fxp);
|
||||
let (g0, g1) = split_vec(&mut va, &g, fxp);
|
||||
|
||||
let ha = thread::spawn(move || {
|
||||
secure_group_by(&mut va, &x0, &g0, 2, None, &aggs, 2).unwrap()
|
||||
});
|
||||
let hb = thread::spawn(move || {
|
||||
let _ = secure_group_by(&mut vb, &x1, &g1, 2, None, &aggs, 2).unwrap();
|
||||
});
|
||||
let got = ha.join().unwrap();
|
||||
hb.join().unwrap();
|
||||
|
||||
// 组0 只有 1 行 < 2 → NaN
|
||||
assert!(got[0].iter().all(|v| v.is_nan()), "组0 应整体抑制: {:?}", got[0]);
|
||||
// 组1 3 行 → count=3, sum=90
|
||||
assert_eq!(got[1][0], 3.0, "组1 COUNT");
|
||||
assert!((got[1][1] - 90.0).abs() < 1e-6, "组1 SUM {}", got[1][1]);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user