From 3e340136daaa39f496f7e64a994e3973dfba602b Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 9 Jul 2007 20:09:49 +0000
Subject: [PATCH] - feeder: simplified DB query - make_project: remove space
 after URL in schedulers.txt

svn path=/trunk/boinc/; revision=13127
---
 checkin_notes             |  9 +++++++++
 db/boinc_db.C             | 14 ++++++++++----
 db/constraints.sql        |  2 +-
 py/Boinc/setup_project.py |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 90f3fb582c..458ad7c015 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7126,3 +7126,12 @@ Rom    9 July 2007
     clientgui/
         MainDocument.cpp
 
+David  9 July 2007
+    - feeder: simplified DB query
+    - make_project: remove space after URL in schedulers.txt
+
+    db/
+        boinc_db.C
+        constraints.sql
+    py/Boinc/
+        setup_project.py
diff --git a/db/boinc_db.C b/db/boinc_db.C
index 8e373ec510..4872cd3eba 100644
--- a/db/boinc_db.C
+++ b/db/boinc_db.C
@@ -1303,9 +1303,12 @@ int DB_WORK_ITEM::enumerate(
     int retval;
     MYSQL_ROW row;
     if (!cursor.active) {
+        // use "r1" to refer to the result, since the feeder assumes that
+        // (historical reasons)
+        //
         sprintf(query,
-            "select high_priority r2.id, r2.priority, workunit.* from result r1, result r2, workunit "
-            " where r1.server_state=%d and r2.id=r1.id and r1.workunitid=workunit.id "
+            "select high_priority r1.id, r1.priority, workunit.* from result r1 force index(ind_res_st), workunit "
+            " where r1.server_state=%d and r1.workunitid=workunit.id "
             " %s "
             " %s "
             "limit %d",
@@ -1340,9 +1343,12 @@ int DB_WORK_ITEM::enumerate_all(
     int retval;
     MYSQL_ROW row;
     if (!cursor.active) {
+        // use "r1" to refer to the result, since the feeder assumes that
+        // (historical reasons)
+        //
         sprintf(query,
-            "select high_priority r2.id, r2.priority, workunit.* from result r1, result r2, workunit "
-            " where r1.server_state=%d and r2.id=r1.id and r1.workunitid=workunit.id and r1.id>%d "
+            "select high_priority r1.id, r1.priority, workunit.* from result r1 force index(ind_res_st), workunit force index(primary)"
+            " where r1.server_state=%d and r1.workunitid=workunit.id and r1.id>%d "
             " %s "
             "limit %d",
             RESULT_SERVER_STATE_UNSENT,
diff --git a/db/constraints.sql b/db/constraints.sql
index f6158abb25..97e32d3e4d 100644
--- a/db/constraints.sql
+++ b/db/constraints.sql
@@ -50,7 +50,7 @@ alter table result
         -- feeder
 
     add index res_app_state(appid, server_state),
-        -- splitter, e.g.
+        -- to get count of unsent results for given app (e.g. in work generator)
 
     add index res_filedel (file_delete_state),
         -- file_deleter
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index 5343b4791b..eb715b4d12 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -508,7 +508,7 @@ class Project:
         else:
             scheduler_file = 'schedulers.txt'
             f = open(self.dir('html/user', scheduler_file), 'w')
-            print >>f, "<!-- <scheduler>" + self.scheduler_url.strip(), "</scheduler> -->"
+            print >>f, "<!-- <scheduler>" + self.scheduler_url.strip() + "</scheduler> -->"
             print >>f, "<link rel=\"boinc_scheduler\" href=\"" + self.scheduler_url.strip()+ "\">"
             f.close()