opendev/gerrit
Code Issues Proposed changes

Run parallel queries asynchronously

Browse Source 
Dave Borowitz suggested changing the calling convention for the
rewriter to delay starting the query until read() is invoked on
ChangeDataSource. This allows creating index predicates that are
discarded and replaced by other rewrite steps.

Change-Id: I4f9e0f8407340b5b489adad971990e710b8121f0
This commit is contained in:
Shawn Pearce
2013-09-13 15:12:20 -07:00
parent 44a6a5a209
commit 569f8dca84
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java
View File

@@ -33,6 +33,7 @@ import com.google.gerrit.server.query.Predicate;
import com.google.gerrit.server.query.QueryParseException; import com.google.gerrit.server.query.QueryParseException;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
@@ -229,7 +230,7 @@ public class QueryProcessor {
final Predicate<ChangeData> visibleToMe = queryBuilder.is_visible(); final Predicate<ChangeData> visibleToMe = queryBuilder.is_visible();
int cnt = queries.size(); int cnt = queries.size();
// Begin all queries, possibly asynchronously. // Parse and rewrite all queries.
List<Integer> limits = Lists.newArrayListWithCapacity(cnt); List<Integer> limits = Lists.newArrayListWithCapacity(cnt);
List<ChangeDataSource> sources = Lists.newArrayListWithCapacity(cnt); List<ChangeDataSource> sources = Lists.newArrayListWithCapacity(cnt);
for (int i = 0; i < cnt; i++) { for (int i = 0; i < cnt; i++) {
@@ -251,9 +252,16 @@ public class QueryProcessor {
sources.add(a); sources.add(a);
} }
// Run each query asynchronously, if supported.
List<ResultSet<ChangeData>> matches = Lists.newArrayListWithCapacity(cnt);
for (ChangeDataSource s : sources) {
matches.add(s.read());
}
sources = null;
List<List<ChangeData>> out = Lists.newArrayListWithCapacity(cnt); List<List<ChangeData>> out = Lists.newArrayListWithCapacity(cnt);
for (int i = 0; i < cnt; i++) { for (int i = 0; i < cnt; i++) {
List<ChangeData> results = Lists.newArrayList(sources.get(i).read()); List<ChangeData> results = Lists.newArrayList(matches.get(i).toList());
Collections.sort(results, sortkeyAfter != null ? cmpAfter : cmpBefore); Collections.sort(results, sortkeyAfter != null ? cmpAfter : cmpBefore);
if (results.size() > maxLimit) { if (results.size() > maxLimit) {
moreResults = true; moreResults = true;