From d964adafe93b034f4cfbb80e2dbc34373d559459 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 17 Feb 2011 12:26:11 +0000 Subject: [PATCH] SOLR-2367: use ignoreException for DIH tests that expect exceptions git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1071594 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/solr/handler/dataimport/DataImporter.java | 3 ++- .../java/org/apache/solr/handler/dataimport/DocBuilder.java | 5 +++-- .../apache/solr/handler/dataimport/EntityProcessorBase.java | 3 ++- .../solr/handler/dataimport/EntityProcessorWrapper.java | 3 ++- .../apache/solr/handler/dataimport/TestErrorHandling.java | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java index 45f8fcf1598..84cb0514820 100644 --- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java +++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java @@ -17,6 +17,7 @@ package org.apache.solr.handler.dataimport; +import org.apache.solr.common.SolrException; import org.apache.solr.core.SolrConfig; import org.apache.solr.core.SolrCore; import org.apache.solr.schema.IndexSchema; @@ -336,7 +337,7 @@ public class DataImporter { if (!requestParams.debug) cumulativeStatistics.add(docBuilder.importStatistics); } catch (Throwable t) { - LOG.error("Full Import failed", t); + SolrException.log(LOG, "Full Import failed", t); docBuilder.rollback(); } finally { setStatus(Status.IDLE); diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java index 858d688976e..974fe214480 100644 --- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java +++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java @@ -17,6 +17,7 @@ package org.apache.solr.handler.dataimport; +import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.SolrCore; import static org.apache.solr.handler.dataimport.SolrWriter.LAST_INDEX_KEY; @@ -490,7 +491,7 @@ public class DocBuilder { importStatistics.skipDocCount.getAndIncrement(); exception = null;//should not propogate up } else { - LOG.error("Exception while processing: " + SolrException.log(LOG, "Exception while processing: " + entity.name + " document : " + docWrapper, dihe); } if (dihe.getErrCode() == DataImportHandlerException.SEVERE) @@ -649,7 +650,7 @@ public class DocBuilder { importStatistics.skipDocCount.getAndIncrement(); doc = null; } else { - LOG.error("Exception while processing: " + SolrException.log(LOG, "Exception while processing: " + entity.name + " document : " + doc, e); } if (e.getErrCode() == DataImportHandlerException.SEVERE) diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java index 5d761194440..10d8c147d6c 100644 --- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java +++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java @@ -16,6 +16,7 @@ */ package org.apache.solr.handler.dataimport; +import org.apache.solr.common.SolrException; import static org.apache.solr.handler.dataimport.DataImportHandlerException.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,7 +80,7 @@ public class EntityProcessorBase extends EntityProcessor { rowIterator = null; return null; } catch (Exception e) { - log.error("getNext() failed for query '" + query + "'", e); + SolrException.log(log, "getNext() failed for query '" + query + "'", e); query = null; rowIterator = null; wrapAndThrow(DataImportHandlerException.WARN, e); diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java index 432e64ac767..92fc9d48b62 100644 --- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java +++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java @@ -16,6 +16,7 @@ */ package org.apache.solr.handler.dataimport; +import org.apache.solr.common.SolrException; import static org.apache.solr.handler.dataimport.DataImportHandlerException.*; import static org.apache.solr.handler.dataimport.EntityProcessorBase.*; import static org.apache.solr.handler.dataimport.EntityProcessorBase.SKIP; @@ -240,7 +241,7 @@ public class EntityProcessorWrapper extends EntityProcessor { wrapAndThrow(SEVERE, e); } else { //SKIP is not really possible. If this calls the nextRow() again the Entityprocessor would be in an inconisttent state - log.error("Exception in entity : "+ entityName, e); + SolrException.log(log, "Exception in entity : "+ entityName, e); return null; } } diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java index b8e285dffe1..64f58df4ff4 100644 --- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java +++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java @@ -37,6 +37,7 @@ public class TestErrorHandling extends AbstractDataImportHandlerTestCase { @BeforeClass public static void beforeClass() throws Exception { initCore("dataimport-solrconfig.xml", "dataimport-schema.xml"); + ignoreException("Unexpected close tag"); } @Before @Override