*** empty log message ***

svn path=/trunk/boinc/; revision=3763
This commit is contained in:
David Anderson 2004-07-02 23:24:36 +00:00
parent c15b0bc10f
commit 3a85d20931
3 changed files with 13 additions and 3 deletions

View File

@ -646,6 +646,7 @@ int DB_TRANSITIONER_ITEM_SET::enumerate(
return -1; return -1;
} }
last_item.parse(row); last_item.parse(row);
nitems_this_query = 1;
} }
items.clear(); items.clear();
@ -654,9 +655,17 @@ int DB_TRANSITIONER_ITEM_SET::enumerate(
row = mysql_fetch_row(cursor.rp); row = mysql_fetch_row(cursor.rp);
if (!row) { if (!row) {
cursor.active = false; cursor.active = false;
return -1;
// if got fewer rows than requested, last group is complete
//
if (nitems_this_query < nresult_limit) {
return 0;
} else {
return -1;
}
} }
new_item.parse(row); new_item.parse(row);
nitems_this_query++;
if (new_item.id != last_item.id) { if (new_item.id != last_item.id) {
last_item = new_item; last_item = new_item;
return 0; return 0;

View File

@ -573,6 +573,7 @@ class DB_TRANSITIONER_ITEM_SET : public DB_BASE_SPECIAL {
public: public:
DB_TRANSITIONER_ITEM_SET(); DB_TRANSITIONER_ITEM_SET();
TRANSITIONER_ITEM last_item; TRANSITIONER_ITEM last_item;
int nitems_this_query;
int enumerate( int enumerate(
int transition_time, int transition_time,

View File

@ -76,7 +76,7 @@ void handle_wu(DB_TRANSITIONER_ITEM_SET& transitioner, std::vector<TRANSITIONER_
for (unsigned int i=0; i<items.size(); i++) { for (unsigned int i=0; i<items.size(); i++) {
switch (items[i].res_server_state) { switch (items[i].res_server_state) {
case RESULT_SERVER_STATE_UNSENT: case RESULT_SERVER_STATE_UNSENT:
if (items[i].res_id) { nunsent++ }; if (items[i].res_id) nunsent++;
break; break;
case RESULT_SERVER_STATE_IN_PROGRESS: case RESULT_SERVER_STATE_IN_PROGRESS:
if (items[i].res_id) { if (items[i].res_id) {
@ -125,7 +125,7 @@ void handle_wu(DB_TRANSITIONER_ITEM_SET& transitioner, std::vector<TRANSITIONER_
} }
break; break;
case RESULT_OUTCOME_CLIENT_ERROR: case RESULT_OUTCOME_CLIENT_ERROR:
if (items[i].res_id) { nerrors++ }; if (items[i].res_id) nerrors++;
break; break;
} }
break; break;