You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2011/08/01 08:01:36 UTC
svn commit: r1152692 - in
/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport:
DataImportHandler.java DataImporter.java DocBuilder.java SolrWriter.java
Author: noble
Date: Mon Aug 1 06:01:35 2011
New Revision: 1152692
URL: http://svn.apache.org/viewvc?rev=1152692&view=rev
Log:
SOLR-2382 - regression . debug not working
Modified:
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=1152692&r1=1152691&r2=1152692&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java Mon Aug 1 06:01:35 2011
@@ -74,8 +74,6 @@ public class DataImportHandler extends R
private Map<String, Properties> dataSources = new HashMap<String, Properties>();
- private List<SolrInputDocument> debugDocuments;
-
private boolean debugEnabled = true;
private String myName = "dataimport";
@@ -197,16 +195,18 @@ public class DataImportHandler extends R
UpdateRequestProcessor processor = processorChain.createProcessor(req, rsp);
SolrResourceLoader loader = req.getCore().getResourceLoader();
SolrWriter sw = getSolrWriter(processor, loader, requestParams, req);
-
+
if (requestParams.debug) {
if (debugEnabled) {
// Synchronous request for the debug mode
importer.runCmd(requestParams, sw);
rsp.add("mode", "debug");
- rsp.add("documents", debugDocuments);
- if (sw.debugLogger != null)
- rsp.add("verbose-output", sw.debugLogger.output);
- debugDocuments = null;
+ rsp.add("documents", requestParams.debugDocuments);
+ if (requestParams.debugVerboseOutput != null) {
+ rsp.add("verbose-output", requestParams.debugVerboseOutput);
+ }
+ requestParams.debugDocuments = new ArrayList<SolrInputDocument>(0);
+ requestParams.debugVerboseOutput = null;
} else {
message = DataImporter.MSG.DEBUG_NOT_ENABLED;
}
@@ -215,7 +215,7 @@ public class DataImportHandler extends R
if(requestParams.contentStream == null && !requestParams.syncMode){
importer.runAsync(requestParams, sw);
} else {
- importer.runCmd(requestParams, sw);
+ importer.runCmd(requestParams, sw);
}
}
} else if (DataImporter.RELOAD_CONF_CMD.equals(command)) {
@@ -285,11 +285,6 @@ public class DataImportHandler extends R
@Override
public boolean upload(SolrInputDocument document) {
try {
- if (requestParams.debug) {
- if (debugDocuments == null)
- debugDocuments = new ArrayList<SolrInputDocument>();
- debugDocuments.add(document);
- }
return super.upload(document);
} catch (RuntimeException e) {
LOG.error( "Exception while adding: " + document, e);
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=1152692&r1=1152691&r2=1152692&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java Mon Aug 1 06:01:35 2011
@@ -18,11 +18,13 @@
package org.apache.solr.handler.dataimport;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.common.util.ContentStream;
+import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.SystemIdResolver;
import org.apache.solr.common.util.XMLErrorLogger;
@@ -515,7 +517,7 @@ public class DataImporter {
public String command = null;
public boolean debug = false;
-
+
public boolean verbose = false;
public boolean syncMode = false;
@@ -537,6 +539,10 @@ public class DataImporter {
public String dataConfig;
public ContentStream contentStream;
+
+ public List<SolrInputDocument> debugDocuments = new ArrayList<SolrInputDocument>(0);
+
+ public NamedList debugVerboseOutput = null;
public RequestParams() {
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=1152692&r1=1152691&r2=1152692&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java Mon Aug 1 06:01:35 2011
@@ -72,11 +72,13 @@ public class DocBuilder {
private static final String PARAM_WRITER_IMPL = "writerImpl";
private static final String DEFAULT_WRITER_NAME = "SolrWriter";
private DebugLogger debugLogger;
-
+ private DataImporter.RequestParams reqParams;
+
@SuppressWarnings("unchecked")
public DocBuilder(DataImporter dataImporter, SolrWriter solrWriter, DIHPropertiesWriter propWriter, DataImporter.RequestParams reqParams) {
INSTANCE.set(this);
this.dataImporter = dataImporter;
+ this.reqParams = reqParams;
this.propWriter = propWriter;
DataImporter.QUERY_COUNT.set(importStatistics.queryCount);
requestParameters = reqParams;
@@ -262,6 +264,9 @@ public class DocBuilder {
if (writer != null) {
writer.close();
}
+ if(requestParameters.debug) {
+ requestParameters.debugVerboseOutput = getDebugLogger().output;
+ }
}
}
@@ -514,6 +519,9 @@ public class DocBuilder {
LOG.debug("adding a doc "+docWrapper);
}
boolean result = writer.upload(docWrapper);
+ if(reqParams.debug) {
+ reqParams.debugDocuments.add(docWrapper);
+ }
docWrapper = null;
if (result){
importStatistics.docCount.incrementAndGet();
@@ -672,6 +680,9 @@ public class DocBuilder {
return;
if (!doc.isEmpty()) {
boolean result = writer.upload(doc);
+ if(reqParams.debug) {
+ reqParams.debugDocuments.add(doc);
+ }
doc = null;
if (result){
importStatistics.docCount.incrementAndGet();
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java?rev=1152692&r1=1152691&r2=1152692&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java Mon Aug 1 06:01:35 2011
@@ -44,8 +44,6 @@ public class SolrWriter implements DIHWr
private final UpdateRequestProcessor processor;
- DebugLogger debugLogger;
-
SolrQueryRequest req;
public SolrWriter(UpdateRequestProcessor processor, SolrQueryRequest req) {