[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  bdf8fad Add host_id.
      from  ed4f5cf Avoid indirection.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bdf8fadc903c3d5f24867991f41a6283599cee92
Author: Jelmer Vernooij <jel...@samba.org>
Date:   Sat Nov 20 01:19:40 2010 +0100

    Add host_id.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/sqldb.py        |   16 +++++++++++++++-
 buildfarm/web/__init__.py |    3 ---
 2 files changed, 15 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index 9c55fc6..2c3c932 100644
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -51,6 +51,7 @@ class StormBuild(Build):
     tree = RawStr()
     revision = RawStr()
     host = RawStr()
+    host_id = Int()
     compiler = RawStr()
     checksum = RawStr()
     upload_time = Int(name="age")
@@ -287,7 +288,20 @@ CREATE TABLE IF NOT EXISTS host (
     join_time int
 );""", noresult=True)
     db.execute("CREATE UNIQUE INDEX IF NOT EXISTS unique_hostname ON host 
(name);", noresult=True)
-    db.execute("CREATE TABLE IF NOT EXISTS build (id integer primary key 
autoincrement, tree blob not null, revision blob, host blob not null, compiler 
blob not null, checksum blob, age int, status blob, basename blob);", 
noresult=True)
+    db.execute("""
+CREATE TABLE IF NOT EXISTS build (
+    id integer primary key autoincrement,
+    tree blob not null,
+    revision blob,
+    host blob not null,
+    host_id integer,
+    compiler blob not null,
+    checksum blob,
+    age int,
+    status blob,
+    basename blob,
+    FOREIGN KEY (host_id) REFERENCES host (id)
+);""", noresult=True)
     db.execute("CREATE UNIQUE INDEX IF NOT EXISTS unique_checksum ON build 
(checksum);", noresult=True)
     db.execute("""
 CREATE TABLE IF NOT EXISTS tree (
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 7363505..83b8520 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -39,9 +39,6 @@ from buildfarm import (
     hostdb,
     util,
     )
-from buildfarm.filecache import (
-    CachingBuildFarm,
-    )
 
 import cgi
 from pygments import highlight


-- 
build.samba.org