From 5efebea5d1811f12933b15379cf3e334f2331b6c Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Wed, 30 Apr 2014 17:42:32 +0200 Subject: [PATCH] prune-trace: limit row deletion to the pruner's FSP method Otherwise it's not possible to keep a "basic" and a "sampling" pruned version of one variant in the same database. Change-Id: Ic71eb27ea16df23e2289cbf9f96ae10209745791 --- tools/prune-trace/Pruner.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/prune-trace/Pruner.cc b/tools/prune-trace/Pruner.cc index a3d339c5..4066461d 100644 --- a/tools/prune-trace/Pruner.cc +++ b/tools/prune-trace/Pruner.cc @@ -79,12 +79,14 @@ bool Pruner::create_database() { bool Pruner::clear_database() { std::stringstream ss; - ss << "DELETE FROM fsppilot WHERE variant_id IN (" << m_variant_id_query << ")"; + ss << "DELETE FROM fsppilot WHERE variant_id IN (" << m_variant_id_query + << ") AND fspmethod_id = " << m_method_id; bool ret = (bool) db->query(ss.str().c_str()); LOG << "deleted " << db->affected_rows() << " rows from fsppilot table" << std::endl; ss.str(""); - ss << "DELETE FROM fspgroup WHERE variant_id IN (" << m_variant_id_query << ")"; + ss << "DELETE FROM fspgroup WHERE variant_id IN (" << m_variant_id_query + << ") AND fspmethod_id = " << m_method_id; ret = ret && (bool) db->query(ss.str().c_str()); LOG << "deleted " << db->affected_rows() << " rows from fspgroup table" << std::endl;