remove unused 'generic' table and functions

buildbot/broken_test/runs/test_db.py

@@ -152,22 +152,6 @@ def test_old_version(self):
                             db.open_db, spec)
         return d
 
-class Generic(Base, unittest.TestCase): # XXX disabled - bug #724
-    def test_generic(self):
-        basedir = "db/generic"
-        if not os.path.isdir(basedir):
-            os.makedirs(basedir)
-        spec = db.DBSpec("sqlite3", os.path.join(basedir, "db1.sqlite"))
-        db.create_db(spec)
-        db1 = db.open_db(spec)
-        self.dbs.add(db1)
-        db1.generic_set("key1", {"value": "is json"})
-        self.failUnlessEqual(db1.generic_get("key1"), {"value": "is json"})
-        self.failUnlessEqual(db1.generic_get("missing", 123), 123)
-        db1.generic_set("key1", ["newvalue"])
-        self.failUnlessEqual(db1.generic_get("key1"), ["newvalue"])
-
-
 class FakeMaster(service.MultiService):
     def __init__(self):
         service.MultiService.__init__(self)
@@ -560,5 +544,4 @@ def _finished_f():
 
 # XXX disable Base-based tests (bug #724)
 del Create
-del Generic
 del MigrateChanges

buildbot/db.py

@@ -79,13 +79,6 @@
         );
     """),
 
-    textwrap.dedent("""
-        CREATE TABLE generic (
-            `key` VARCHAR(256) PRIMARY KEY NOT NULL,
-            `value` VARCHAR(1024) NOT NULL
-        );
-    """),
-
     textwrap.dedent("""
         CREATE TABLE changes_nextid (next_changeid INTEGER);
     """),
@@ -1295,33 +1288,6 @@ def _txn_get_buildset_info(self, t, bsid):
             return (external_idstring, reason, ssid, complete, results)
         return None # shouldn't happen
 
-    # general-purpose key-value (JSON) store, for use by e.g. ChangeSources
-
-    def generic_get(self, key, default=None, t=None):
-        if t:
-            return self._txn_generic_get(t, key, default)
-        else:
-            return self.runInteractionNow(self._txn_generic_get, key, default)
-    def _txn_generic_get(self, t, key, default):
-        q = self.quoteq("SELECT value FROM generic WHERE `key`=?")
-        t.execute(q, (key,))
-        return _one_or_else(t.fetchall(), default, json.loads)
-
-    def generic_set(self, key, value, t=None):
-        if t:
-            return self._txn_generic_set(t, key, value)
-        else:
-            return self.runInteractionNow(self._txn_generic_set, key, value)
-    def _txn_generic_set(self, t, key, value):
-        q = self.quoteq("SELECT value FROM generic WHERE `key`=?")
-        t.execute(q, (key,))
-        if t.fetchall():
-            q = self.quoteq("UPDATE generic SET value=? WHERE `key`=?")
-            t.execute(q, (json.dumps(value), key))
-        else:
-            q = self.quoteq("INSERT INTO generic (`key`, value) VALUES (?,?)")
-            t.execute(q, (key, json.dumps(value)))
-
     # test/debug methods
 
     def has_pending_operations(self):