validator: fix 64-bit ID problem

This commit is contained in:
David Anderson 2015-07-28 16:19:31 -07:00
parent a2a2dd8cd7
commit 1af264747f
3 changed files with 5 additions and 4 deletions

View File

@ -61,7 +61,7 @@ using std::vector;
//
int check_set(
vector<RESULT>& results, WORKUNIT& wu,
int& canonicalid, double&, bool& retry
DB_ID_TYPE& canonicalid, double&, bool& retry
) {
vector<void*> data;
vector<bool> had_error;

View File

@ -28,7 +28,7 @@ extern int cleanup_result(RESULT const&, void*);
extern double compute_granted_credit(WORKUNIT&, std::vector<RESULT>& results);
extern int check_set(
std::vector<RESULT>& results, WORKUNIT& wu,
int& canonicalid, double& credit_deprecated, bool& retry
DB_ID_TYPE& canonicalid, double& credit_deprecated, bool& retry
);
extern void check_pair(RESULT& r1, RESULT& r2, bool& retry);
#endif

View File

@ -185,7 +185,8 @@ int handle_wu(
int canonical_result_index = -1;
bool update_result, retry;
TRANSITION_TIME transition_time = NO_CHANGE;
int retval = 0, canonicalid = 0, x;
int retval = 0, x;
DB_ID_TYPE canonicalid = 0;
double credit = 0;
unsigned int i;
@ -602,7 +603,7 @@ int handle_wu(
//
transition_time = NEVER;
log_messages.printf(MSG_DEBUG,
"[WU#%lu %s] Found a canonical result: id=%d\n",
"[WU#%lu %s] Found a canonical result: id=%lu\n",
wu.id, wu.name, canonicalid
);
wu.canonical_resultid = canonicalid;