Skip to content

Commit 56677ed

Browse files
committed
Changed UberJob building algorithm.
1 parent fb430d6 commit 56677ed

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

core/modules/ccontrol/UserQuerySelect.cc

+1-18
Original file line numberDiff line numberDiff line change
@@ -432,25 +432,8 @@ void UserQuerySelect::submit() {
432432
uberJobId++, _qMetaCzarId);
433433

434434
int chunksInUber = 0;
435-
//&&&czar::WorkerResource& wr = *workerIter;
436435
deque<int>& dq = workerIter->second;
437-
/* &&&
438-
auto& wChunkIdSet = wr.chunkIdSet;
439-
for(auto&& wcIter = wChunkIdSet.begin();
440-
wcIter != wChunkIdSet.end() && !chunksInQuery.empty() && chunksInUber < maxChunksPerUber;) {
441-
442-
int chunkIdWorker = *wcIter;
443-
auto oldIter = wcIter;
444-
++wcIter;
445-
wChunkIdSet.erase(oldIter);
446-
auto found = chunksInQuery.find(chunkIdWorker);
447-
if (found != chunksInQuery.end()) {
448-
uJob->addJob(found->second);
449-
++chunksInUber;
450-
chunksInQuery.erase(found);
451-
}
452-
}
453-
*/
436+
454437
while (!dq.empty() && !chunksInQuery.empty() && chunksInUber < maxChunksPerUber) {
455438
int chunkIdWorker = dq.front();
456439
dq.pop_front();

0 commit comments

Comments
 (0)