Commit 4a44dbbd authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#3179 clamp the hot indexer progress refs[t:3179]

git-svn-id: file:///svn/toku/tokudb@27130 c7de825b-a66e-492c-adef-691d508d4ae1
parent cdb0d9c0
...@@ -384,12 +384,10 @@ maybe_call_poll_func(DB_INDEXER *indexer, uint64_t loop_count) { ...@@ -384,12 +384,10 @@ maybe_call_poll_func(DB_INDEXER *indexer, uint64_t loop_count) {
// what happens if estimate_rows fails? // what happens if estimate_rows fails?
// - currently does not modify estimate, which is probably sufficient // - currently does not modify estimate, which is probably sufficient
float progress; float progress;
if ( indexer->i->estimated_rows == 0 ) { if ( indexer->i->estimated_rows == 0 || loop_count > indexer->i->estimated_rows)
progress = 1.0; progress = 1.0;
} else
else {
progress = (float)loop_count / (float)indexer->i->estimated_rows; progress = (float)loop_count / (float)indexer->i->estimated_rows;
}
result = indexer->i->poll_func(indexer->i->poll_extra, progress); result = indexer->i->poll_func(indexer->i->poll_extra, progress);
} }
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment