BIND 10 master, updated. 9163208c660f8ef8c4b1dbdae6c0c785c516bb1a [master] Merge branch 'trac1216'
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Oct 7 22:37:26 UTC 2011
The branch, master has been updated
via 9163208c660f8ef8c4b1dbdae6c0c785c516bb1a (commit)
via ff23bfe6d68eeb0972e9b01a45b950e6ae781b01 (commit)
from f5c9c2f489e84de596aff390c498ec31fe44a5b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9163208c660f8ef8c4b1dbdae6c0c785c516bb1a
Merge: f5c9c2f ff23bfe
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Fri Oct 7 15:33:41 2011 -0700
[master] Merge branch 'trac1216'
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/sqlite3_accessor.cc | 15 +-------
src/lib/datasrc/sqlite3_accessor.h | 18 ++-------
src/lib/datasrc/tests/database_unittest.cc | 3 +-
src/lib/datasrc/tests/sqlite3_accessor_unittest.cc | 40 +++++++++----------
src/lib/python/isc/datasrc/client_python.cc | 5 +-
5 files changed, 28 insertions(+), 53 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/sqlite3_accessor.cc b/src/lib/datasrc/sqlite3_accessor.cc
index 7e5734c..8fb95af 100644
--- a/src/lib/datasrc/sqlite3_accessor.cc
+++ b/src/lib/datasrc/sqlite3_accessor.cc
@@ -138,19 +138,6 @@ private:
};
SQLite3Accessor::SQLite3Accessor(const std::string& filename,
- const isc::dns::RRClass& rrclass) :
- dbparameters_(new SQLite3Parameters),
- filename_(filename),
- class_(rrclass.toText()),
- database_name_("sqlite3_" +
- isc::util::Filename(filename).nameAndExtension())
-{
- LOG_DEBUG(logger, DBG_TRACE_BASIC, DATASRC_SQLITE_NEWCONN);
-
- open(filename);
-}
-
-SQLite3Accessor::SQLite3Accessor(const std::string& filename,
const string& rrclass) :
dbparameters_(new SQLite3Parameters),
filename_(filename),
@@ -771,7 +758,7 @@ createInstance(isc::data::ConstElementPtr config) {
}
std::string dbfile = config->get(CONFIG_ITEM_DATABASE_FILE)->stringValue();
boost::shared_ptr<DatabaseAccessor> sqlite3_accessor(
- new SQLite3Accessor(dbfile, isc::dns::RRClass::IN()));
+ new SQLite3Accessor(dbfile, "IN")); // XXX: avoid hardcode RR class
return (new DatabaseClient(isc::dns::RRClass::IN(), sqlite3_accessor));
}
diff --git a/src/lib/datasrc/sqlite3_accessor.h b/src/lib/datasrc/sqlite3_accessor.h
index 3286f3b..86b9e6d 100644
--- a/src/lib/datasrc/sqlite3_accessor.h
+++ b/src/lib/datasrc/sqlite3_accessor.h
@@ -67,20 +67,10 @@ public:
* doesn't work (it is broken, doesn't exist and can't be created, etc).
*
* \param filename The database file to be used.
- * \param rrclass Which class of data it should serve (while the database
- * file can contain multiple classes of data, single database can
- * provide only one class).
- */
- SQLite3Accessor(const std::string& filename,
- const isc::dns::RRClass& rrclass);
-
- /**
- * \brief Constructor
- *
- * Same as the other version, but takes rrclass as a bare string.
- * we should obsolete the other version and unify the constructor to
- * this version; the SQLite3Accessor is expected to be "dumb" and
- * shouldn't care about DNS specific information such as RRClass.
+ * \param rrclass Textual representation of RR class ("IN", "CH", etc),
+ * specifying which class of data it should serve (while the database
+ * file can contain multiple classes of data, a single accessor can
+ * work with only one class).
*/
SQLite3Accessor(const std::string& filename, const std::string& rrclass);
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index fe57185..8cd70ef 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -830,8 +830,7 @@ public:
class TestSQLite3Accessor : public SQLite3Accessor {
public:
TestSQLite3Accessor() : SQLite3Accessor(
- TEST_DATA_BUILDDIR "/rwtest.sqlite3.copied",
- RRClass::IN())
+ TEST_DATA_BUILDDIR "/rwtest.sqlite3.copied", "IN")
{
startUpdateZone("example.org.", true);
string columns[ADD_COLUMN_COUNT];
diff --git a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 3974977..62fa3c3 100644
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@ -57,36 +57,34 @@ const char* SQLITE_NEW_DBFILE = TEST_DATA_BUILDDIR "/newdb.sqlite3";
// Opening works (the content is tested in different tests)
TEST(SQLite3Open, common) {
- EXPECT_NO_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_EXAMPLE,
- RRClass::IN()));
+ EXPECT_NO_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_EXAMPLE, "IN"));
}
// The file can't be opened
TEST(SQLite3Open, notExist) {
- EXPECT_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_NOTEXIST,
- RRClass::IN()), SQLite3Error);
+ EXPECT_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_NOTEXIST, "IN"),
+ SQLite3Error);
}
// It rejects broken DB
TEST(SQLite3Open, brokenDB) {
- EXPECT_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_BROKENDB,
- RRClass::IN()), SQLite3Error);
+ EXPECT_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_BROKENDB, "IN"),
+ SQLite3Error);
}
// Test we can create the schema on the fly
TEST(SQLite3Open, memoryDB) {
- EXPECT_NO_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_MEMORY,
- RRClass::IN()));
+ EXPECT_NO_THROW(SQLite3Accessor accessor(SQLITE_DBFILE_MEMORY, "IN"));
}
// Test fixture for querying the db
class SQLite3AccessorTest : public ::testing::Test {
public:
SQLite3AccessorTest() {
- initAccessor(SQLITE_DBFILE_EXAMPLE, RRClass::IN());
+ initAccessor(SQLITE_DBFILE_EXAMPLE, "IN");
}
// So it can be re-created with different data
- void initAccessor(const std::string& filename, const RRClass& rrclass) {
+ void initAccessor(const std::string& filename, const string& rrclass) {
accessor.reset(new SQLite3Accessor(filename, rrclass));
}
// The tested accessor
@@ -112,14 +110,14 @@ TEST_F(SQLite3AccessorTest, noZone) {
// This zone is there, but in different class
TEST_F(SQLite3AccessorTest, noClass) {
- initAccessor(SQLITE_DBFILE_EXAMPLE, RRClass::CH());
+ initAccessor(SQLITE_DBFILE_EXAMPLE, "CH");
EXPECT_FALSE(accessor->getZone("example.com.").first);
}
// This tests the iterator context
TEST_F(SQLite3AccessorTest, iterator) {
// Our test zone is conveniently small, but not empty
- initAccessor(SQLITE_DBFILE_EXAMPLE_ORG, RRClass::IN());
+ initAccessor(SQLITE_DBFILE_EXAMPLE_ORG, "IN");
const std::pair<bool, int> zone_info(accessor->getZone("example.org."));
ASSERT_TRUE(zone_info.first);
@@ -207,12 +205,12 @@ TEST_F(SQLite3AccessorTest, iterator) {
}
TEST(SQLite3Open, getDBNameExample2) {
- SQLite3Accessor accessor(SQLITE_DBFILE_EXAMPLE2, RRClass::IN());
+ SQLite3Accessor accessor(SQLITE_DBFILE_EXAMPLE2, "IN");
EXPECT_EQ(SQLITE_DBNAME_EXAMPLE2, accessor.getDBName());
}
TEST(SQLite3Open, getDBNameExampleROOT) {
- SQLite3Accessor accessor(SQLITE_DBFILE_EXAMPLE_ROOT, RRClass::IN());
+ SQLite3Accessor accessor(SQLITE_DBFILE_EXAMPLE_ROOT, "IN");
EXPECT_EQ(SQLITE_DBNAME_EXAMPLE_ROOT, accessor.getDBName());
}
@@ -410,7 +408,7 @@ bool isReadable(const char* filename) {
TEST_F(SQLite3Create, creationtest) {
ASSERT_FALSE(isReadable(SQLITE_NEW_DBFILE));
// Should simply be created
- SQLite3Accessor accessor(SQLITE_NEW_DBFILE, RRClass::IN());
+ SQLite3Accessor accessor(SQLITE_NEW_DBFILE, "IN");
ASSERT_TRUE(isReadable(SQLITE_NEW_DBFILE));
}
@@ -422,12 +420,12 @@ TEST_F(SQLite3Create, emptytest) {
ASSERT_EQ(SQLITE_OK, sqlite3_open(SQLITE_NEW_DBFILE, &db));
// empty, but not locked, so creating it now should work
- SQLite3Accessor accessor2(SQLITE_NEW_DBFILE, RRClass::IN());
+ SQLite3Accessor accessor2(SQLITE_NEW_DBFILE, "IN");
sqlite3_close(db);
// should work now that we closed it
- SQLite3Accessor accessor3(SQLITE_NEW_DBFILE, RRClass::IN());
+ SQLite3Accessor accessor3(SQLITE_NEW_DBFILE, "IN");
}
TEST_F(SQLite3Create, lockedtest) {
@@ -439,13 +437,13 @@ TEST_F(SQLite3Create, lockedtest) {
sqlite3_exec(db, "BEGIN EXCLUSIVE TRANSACTION", NULL, NULL, NULL);
// should not be able to open it
- EXPECT_THROW(SQLite3Accessor accessor2(SQLITE_NEW_DBFILE, RRClass::IN()),
+ EXPECT_THROW(SQLite3Accessor accessor2(SQLITE_NEW_DBFILE, "IN"),
SQLite3Error);
sqlite3_exec(db, "ROLLBACK TRANSACTION", NULL, NULL, NULL);
// should work now that we closed it
- SQLite3Accessor accessor3(SQLITE_NEW_DBFILE, RRClass::IN());
+ SQLite3Accessor accessor3(SQLITE_NEW_DBFILE, "IN");
}
TEST_F(SQLite3AccessorTest, clone) {
@@ -508,11 +506,11 @@ protected:
isc_throw(isc::Exception,
"Error setting up; command failed: " << install_cmd);
};
- initAccessor(TEST_DATA_BUILDDIR "/test.sqlite3.copied", RRClass::IN());
+ initAccessor(TEST_DATA_BUILDDIR "/test.sqlite3.copied", "IN");
zone_id = accessor->getZone("example.com.").second;
another_accessor.reset(new SQLite3Accessor(
TEST_DATA_BUILDDIR "/test.sqlite3.copied",
- RRClass::IN()));
+ "IN"));
expected_stored.push_back(common_expected_data);
}
diff --git a/src/lib/python/isc/datasrc/client_python.cc b/src/lib/python/isc/datasrc/client_python.cc
index 984eabf..c75e7ca 100644
--- a/src/lib/python/isc/datasrc/client_python.cc
+++ b/src/lib/python/isc/datasrc/client_python.cc
@@ -165,12 +165,13 @@ DataSourceClient_init(s_DataSourceClient* self, PyObject* args) {
// TODO: we should use the factory function which hasn't been written
// yet. For now we hardcode the sqlite3 initialization, and pass it one
// string for the database file. (similar to how the 'old direct'
- // sqlite3_ds code works)
+ // sqlite3_ds code works). Of course, we shouldn't hardcode the RR class
+ // at that point.
try {
char* db_file_name;
if (PyArg_ParseTuple(args, "s", &db_file_name)) {
boost::shared_ptr<DatabaseAccessor> sqlite3_accessor(
- new SQLite3Accessor(db_file_name, isc::dns::RRClass::IN()));
+ new SQLite3Accessor(db_file_name, "IN"));
self->cppobj = new DatabaseClient(isc::dns::RRClass::IN(),
sqlite3_accessor);
return (0);
More information about the bind10-changes
mailing list