Changeset 22648

Timestamp:

02/09/10 11:48:05 (17 months ago)

Author:

mnw21

Message:

More attempts to debug dataloader

Location:

branches/mnw21/pathquery_refactor/intermine/integrate/main/src/org/intermine

Files:

• dataloader/IntegrationWriterAbstractImpl.java (modified) (1 diff)
• objectstore/fastcollections/ObjectStoreFastCollectionsForTranslatorImpl.java (modified) (4 diffs)

branches/mnw21/pathquery_refactor/intermine/integrate/main/src/org/intermine/dataloader/IntegrationWriterAbstractImpl.java

@@ -237 +237 @@
                                 srcObj.getFieldProxy(fieldName);
                             if (sourceTarget instanceof ProxyReference) {
+                                if (type == SOURCE) {
+                                    if (srcObj instanceof InterMineObject) {
+                                        LOG.error("Having to fetch reference " + fieldName
+                                                + " for object with ID "
+                                                + ((InterMineObject) srcObj).getId()
+                                                + " referencing object with ID "
+                                                + sourceTarget.getId());
+                                    }
+                                }
                                 if (idMap.get(sourceTarget.getId()) == null) {
                                     sourceTarget = ((ProxyReference) sourceTarget).getObject();

branches/mnw21/pathquery_refactor/intermine/integrate/main/src/org/intermine/objectstore/fastcollections/ObjectStoreFastCollectionsForTranslatorImpl.java

@@ -336 +336 @@
                                 : froms.entrySet()) {
                             FastPathObject objToPopulate = fromEntry.getKey();
+                            //String objDescription;
+                            //if (objToPopulate instanceof InterMineObject) {
+                            //    objDescription = "object with ID "
+                            //        + ((InterMineObject) objToPopulate).getId();
+                            //} else {
+                            //    objDescription = "FastPathObject";
+                            //}
                             Map<String, Object> collectionsToPopulate = fromEntry.getValue();
                             for (Map.Entry<String, Object> collectionEntry
@@ -354 +361 @@
                                                 objToAdd = new ProxyReference(os, idToAdd,
                                                         InterMineObject.class);
+                                                //LOG.warn("Did not fetch object with ID " + idToAdd
+                                                //        + " for " + objDescription
+                                                //        + " for collection " + collectionName);
                                             } else {
                                                 ObjectStoreTranslatingImpl osti =
@@ -377 +387 @@
                                                 throw new ObjectStoreException(message);
                                             }
+                                        //} else {
+                                            //LOG.warn("Fetched object with ID " + idToAdd
+                                            //        + " for " + objDescription
+                                            //        + " for collection " + collectionName);
                                         }
                                         substituteCollection.add(objToAdd);
@@ -388 +402 @@
                                     if (objToAdd != null) {
                                         objToPopulate.setFieldValue(collectionName, objToAdd);
+                                        //LOG.warn("Fetched object with ID " + id + " for "
+                                        //        + objDescription + " for reference "
+                                        //        + collectionName);
+                                    //} else {
+                                        //LOG.warn("Did not fetch object with ID " + id + " for "
+                                        //        + objDescription + " for reference "
+                                        //        + collectionName);
                                     }
                                 }