Changeset 22657

Timestamp:

02/09/10 17:24:15 (17 months ago)

Author:

rns

Message:

Fix broken batch size, LOOKUP constraint wildcards work again now.

File:

• branches/mnw21/pathquery_refactor/intermine/api/main/src/org/intermine/api/bag/BagQueryRunner.java (modified) (5 diffs)

branches/mnw21/pathquery_refactor/intermine/api/main/src/org/intermine/api/bag/BagQueryRunner.java

@@ -20 +20 @@
 import java.util.regex.Pattern;
 
+import org.apache.log4j.Logger;
 import org.intermine.InterMineException;
 import org.intermine.api.template.TemplateQuery;
@@ -29 +30 @@
 import org.intermine.objectstore.query.Query;
 import org.intermine.objectstore.query.Results;
+import org.intermine.objectstore.query.ResultsBatches;
 import org.intermine.objectstore.query.ResultsRow;
 import org.intermine.util.CollectionUtil;
@@ -41 +43 @@
 public class BagQueryRunner
 {
-    //private static final Logger LOG = Logger.getLogger(BagQueryRunner.class);
+    private static final Logger LOG = Logger.getLogger(BagQueryRunner.class);
     private ObjectStore os;
 
@@ -171 +173 @@
                     Map<String, Set<Integer>> resMap = new HashMap<String, Set<Integer>>();
                     Query q = bq.getQueryForWildcards(wildcardInput, extraFieldValue);
-                    Results res = os.execute(q, 0, true, true, false);
+                    Results res = os.execute(q, ResultsBatches.DEFAULT_BATCH_SIZE, true, true,
+                            false);
                     for (Object rowObj : res) {
                         ResultsRow<?> row = (ResultsRow<?>) rowObj;
@@ -200 +203 @@
                     }
                 } catch (IllegalArgumentException e) {
+                    LOG.error("Error running bag query lookup: ", e);
                     // Query couldn't handle extra value
                 }