Commit b8387e4c authored by JINMEI Tatuya's avatar JINMEI Tatuya Committed by Michal 'vorner' Vaner
Browse files

[2877] Delete DB records based on rname

This is significantly faster, as the rname has an index on it, while the
name doesn't.

Applied verbatim as sent on the mailing list. Documentation will come
soon.
parent bf94c3c6
......@@ -1701,7 +1701,8 @@ DatabaseUpdater::deleteRRset(const AbstractRRset& rrset) {
}
const string params[Accessor::DEL_PARAM_COUNT] =
{ nsec3_type ? cvtr.getNSEC3Name() : cvtr.getName(),
cvtr.getType(), rdata_txt };
cvtr.getType(), rdata_txt,
nsec3_type ? cvtr.getNSEC3Name() : cvtr.getRevName() };
if (nsec3_type) {
accessor_->deleteNSEC3RecordInZone(params);
} else {
......
......@@ -127,7 +127,8 @@ public:
///< or the hash label for deleteNSEC3RecordInZone()
DEL_TYPE = 1, ///< The RRType of the record (A/NS/TXT etc.)
DEL_RDATA = 2, ///< Full text representation of the record's RDATA
DEL_PARAM_COUNT = 3 ///< Number of parameters
DEL_RNAME = 3,
DEL_PARAM_COUNT = 4 ///< Number of parameters
};
/// \brief Operation mode when adding a record diff.
......
......@@ -104,7 +104,7 @@ const char* const text_statements[NUM_STATEMENTS] = {
"INSERT INTO records " // ADD_RECORD
"(zone_id, name, rname, ttl, rdtype, sigtype, rdata) "
"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)",
"DELETE FROM records WHERE zone_id=?1 AND name=?2 " // DEL_RECORD
"DELETE FROM records WHERE zone_id=?1 AND rname=?2 " // DEL_RECORD
"AND rdtype=?3 AND rdata=?4",
// ITERATE_RECORDS:
......@@ -1295,8 +1295,14 @@ SQLite3Accessor::deleteRecordInZone(const string (&params)[DEL_PARAM_COUNT]) {
isc_throw(DataSourceError, "deleting record in SQLite3 "
"data source without transaction");
}
doUpdate<const string (&)[DEL_PARAM_COUNT]>(
*dbparameters_, DEL_RECORD, params, "delete record from zone");
const size_t SQLITE3_DEL_PARAM_COUNT = DEL_PARAM_COUNT - 1;
const string sqlite3_params[SQLITE3_DEL_PARAM_COUNT] = {
params[DEL_RNAME],
params[DEL_TYPE],
params[DEL_RDATA]
};
doUpdate<const string (&)[SQLITE3_DEL_PARAM_COUNT]>(
*dbparameters_, DEL_RECORD, sqlite3_params, "delete record from zone");
}
void
......@@ -1307,8 +1313,14 @@ SQLite3Accessor::deleteNSEC3RecordInZone(
isc_throw(DataSourceError, "deleting NSEC3-related record in SQLite3 "
"data source without transaction");
}
doUpdate<const string (&)[DEL_PARAM_COUNT]>(
*dbparameters_, DEL_NSEC3_RECORD, params,
const size_t SQLITE3_DEL_PARAM_COUNT = DEL_PARAM_COUNT - 1;
const string sqlite3_params[SQLITE3_DEL_PARAM_COUNT] = {
params[DEL_NAME],
params[DEL_TYPE],
params[DEL_RDATA]
};
doUpdate<const string (&)[SQLITE3_DEL_PARAM_COUNT]>(
*dbparameters_, DEL_NSEC3_RECORD, sqlite3_params,
"delete NSEC3 record from zone");
}
......
......@@ -806,7 +806,7 @@ const char* const new_data[] = {
};
const char* const deleted_data[] = {
// Existing data to be removed commonly used by some of the tests below
"foo.bar.example.com.", "A", "192.0.2.1"
"foo.bar.example.com.", "A", "192.0.2.1", "com.example.bar.foo."
};
const char* const nsec3_data[DatabaseAccessor::ADD_NSEC3_COLUMN_COUNT] = {
// example NSEC3 parameters. Using "apex_hash" just as a convenient
......@@ -823,7 +823,8 @@ const char* const nsec3_sig_data[DatabaseAccessor::ADD_NSEC3_COLUMN_COUNT] = {
const char* const nsec3_deleted_data[] = {
// Delete parameters for nsec3_data
apex_hash, nsec3_data[DatabaseAccessor::ADD_NSEC3_TYPE],
nsec3_data[DatabaseAccessor::ADD_NSEC3_RDATA]
nsec3_data[DatabaseAccessor::ADD_NSEC3_RDATA],
apex_hash
};
class SQLite3Update : public SQLite3AccessorTest {
......@@ -1222,6 +1223,7 @@ TEST_F(SQLite3Update, deleteNonexistent) {
// Replace the name with a non existent one, then try to delete it.
// nothing should happen.
del_params[DatabaseAccessor::DEL_NAME] = "no-such-name.example.com.";
del_params[DatabaseAccessor::DEL_RNAME] = "com.example.no-such-name.";
checkRecords(*accessor, zone_id, "no-such-name.example.com.",
empty_stored);
accessor->deleteRecordInZone(del_params);
......@@ -1535,7 +1537,7 @@ TEST_F(SQLite3Update, addDiffWithUpdate) {
// the basic tests so far pass. But we check it in case we miss something.
const char* const old_a_record[] = {
"dns01.example.com.", "A", "192.0.2.1"
"dns01.example.com.", "A", "192.0.2.1", "com.example.dns01."
};
const char* const new_a_record[] = {
"dns01.example.com.", "com.example.dns01.", "3600", "A", "",
......@@ -1544,6 +1546,7 @@ TEST_F(SQLite3Update, addDiffWithUpdate) {
const char* const old_soa_record[] = {
"example.com.", "SOA",
"ns.example.com. admin.example.com. 1234 3600 1800 2419200 7200",
"com.example."
};
const char* const new_soa_record[] = {
"dns01.example.com.", "com.example.dns01.", "3600", "A", "",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment