You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2008/10/21 09:05:40 UTC
svn commit: r706542 - in /lucene/solr/trunk/contrib/dataimporthandler: ./
src/main/java/org/apache/solr/handler/dataimport/
src/test/java/org/apache/solr/handler/dataimport/
Author: shalin
Date: Tue Oct 21 00:05:39 2008
New Revision: 706542
URL: http://svn.apache.org/viewvc?rev=706542&view=rev
Log:
SOLR-782 -- Refactored SolrWriter to make it a concrete class and removed wrappers over SolrInputDocument
Modified:
lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=706542&r1=706541&r2=706542&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Tue Oct 21 00:05:39 2008
@@ -33,6 +33,10 @@
Documentation
----------------------
+Other
+----------------------
+1. SOLR-782: Refactored SolrWriter to make it a concrete class and removed wrappers over SolrInputDocument
+ (Noble Paul via shalin)
================== Release 1.3.0 20080915 ==================
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=706542&r1=706541&r2=706542&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java Tue Oct 21 00:05:39 2008
@@ -78,8 +78,6 @@
private List<SolrInputDocument> debugDocuments;
- private DebugLogger debugLogger;
-
private boolean debugEnabled = true;
@Override
@@ -180,8 +178,7 @@
req.getCore().getUpdateProcessingChain(params.get(UpdateParams.UPDATE_PROCESSOR));
UpdateRequestProcessor processor = processorChain.createProcessor(req, rsp);
SolrResourceLoader loader = req.getCore().getResourceLoader();
- SolrWriter sw = getSolrWriter(processor, loader, req
- .getSchema());
+ SolrWriter sw = getSolrWriter(processor, loader);
if (requestParams.debug) {
if (debugEnabled) {
@@ -189,9 +186,8 @@
importer.runCmd(requestParams, sw, variables);
rsp.add("mode", "debug");
rsp.add("documents", debugDocuments);
- if (debugLogger != null)
- rsp.add("verbose-output", debugLogger.output);
- debugLogger = null;
+ if (sw.debugLogger != null)
+ rsp.add("verbose-output", sw.debugLogger.output);
debugDocuments = null;
} else {
message = DataImporter.MSG.DEBUG_NOT_ENABLED;
@@ -266,14 +262,13 @@
}
private SolrWriter getSolrWriter(final UpdateRequestProcessor processor,
- final SolrResourceLoader loader, final IndexSchema schema) {
+ final SolrResourceLoader loader) {
return new SolrWriter(processor, loader.getConfigDir()) {
@Override
- public boolean upload(SolrDoc d) {
+ public boolean upload(SolrInputDocument document) {
try {
- SolrInputDocument document = ((SolrDocumentWrapper) d).doc;
if (requestParams.debug) {
if (debugDocuments == null)
debugDocuments = new ArrayList<SolrInputDocument>();
@@ -283,53 +278,15 @@
importer.getDocBuilder().abort();
}
}
-
return super.upload(document);
} catch (RuntimeException e) {
- LOG.error( "Exception while adding: " + d, e);
+ LOG.error( "Exception while adding: " + document, e);
return false;
}
}
-
- public void log(int event, String name, Object row) {
- if (debugLogger == null) {
- debugLogger = new DebugLogger();
- }
- debugLogger.log(event, name, row);
- }
-
-
-
- public SolrDoc getSolrDocInstance() {
- return new SolrDocumentWrapper();
- }
};
}
- static class SolrDocumentWrapper implements SolrWriter.SolrDoc {
- SolrInputDocument doc;
-
- public SolrDocumentWrapper() {
- doc = new SolrInputDocument();
- }
-
- public void setDocumentBoost(float boost) {
- doc.setDocumentBoost(boost);
- }
-
- public Object getField(String field) {
- return doc.getField(field);
- }
-
- public void addField(String name, Object value, float boost) {
- doc.addField(name, value, boost);
- }
-
- public String toString() {
- return doc.toString();
- }
- }
-
@Override
@SuppressWarnings("unchecked")
public NamedList getStatistics() {
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=706542&r1=706541&r2=706542&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Tue Oct 21 00:05:39 2008
@@ -18,6 +18,7 @@
package org.apache.solr.handler.dataimport;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.common.SolrInputDocument;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -229,7 +230,7 @@
}
@SuppressWarnings("unchecked")
- private void buildDocument(VariableResolverImpl vr, SolrWriter.SolrDoc doc,
+ private void buildDocument(VariableResolverImpl vr, SolrInputDocument doc,
Map<String, Object> pk, DataConfig.Entity entity, boolean isRoot,
ContextImpl parentCtx) {
@@ -272,7 +273,7 @@
ctx.getDocSession().clear();
else
ctx.setDocSession(new HashMap<String, Object>());
- doc = writer.getSolrDocInstance();
+ doc = new SolrInputDocument();
DataConfig.Entity e = entity;
while (e.parentEntity != null) {
addFields(e.parentEntity, doc, (Map<String, Object>) vr
@@ -351,7 +352,7 @@
}
}
- private void setDocumentBoost(SolrWriter.SolrDoc doc, Map<String, Object> arow) {
+ private void setDocumentBoost(SolrInputDocument doc, Map<String, Object> arow) {
Object v = arow.get(DOC_BOOST);
float value = 1.0f;
if (v instanceof Number) {
@@ -363,7 +364,7 @@
}
@SuppressWarnings("unchecked")
- private void addFields(DataConfig.Entity entity, SolrWriter.SolrDoc doc,
+ private void addFields(DataConfig.Entity entity, SolrInputDocument doc,
Map<String, Object> arow) {
DataConfig.Entity parentMost = entity;
while (parentMost.parentEntity != null)
@@ -383,7 +384,7 @@
}
private void addFieldValue(DataConfig.Field field, Map<String, Object> arow,
- Map<String, Object> lowerCaseMap, SolrWriter.SolrDoc doc) {
+ Map<String, Object> lowerCaseMap, SolrInputDocument doc) {
if (!field.toWrite)
return;
Object value = arow.get(field.column);
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java?rev=706542&r1=706541&r2=706542&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java Tue Oct 21 00:05:39 2008
@@ -16,18 +16,18 @@
*/
package org.apache.solr.handler.dataimport;
+import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-import org.apache.solr.common.SolrInputDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.*;
import java.text.ParseException;
import java.util.Date;
import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* <p>
@@ -40,7 +40,7 @@
* @version $Id$
* @since solr 1.3
*/
-public abstract class SolrWriter {
+public class SolrWriter {
private static final Logger log = LoggerFactory.getLogger(SolrWriter.class);
static final String IMPORTER_PROPERTIES = "dataimport.properties";
@@ -51,6 +51,8 @@
private final String configDir;
+ DebugLogger debugLogger;
+
public SolrWriter(UpdateRequestProcessor processor, String confDir) {
this.processor = processor;
configDir = confDir;
@@ -66,10 +68,10 @@
command.overwriteCommitted = true;
processor.processAdd(command);
} catch (IOException e) {
- log.error( "Exception while adding: " + d, e);
+ log.error("Exception while adding: " + d, e);
return false;
} catch (Exception e) {
- log.warn( "Error creating document : " + d, e);
+ log.warn("Error creating document : " + d, e);
return false;
}
@@ -85,7 +87,7 @@
delCmd.fromCommitted = true;
processor.processDelete(delCmd);
} catch (IOException e) {
- log.error( "Exception while deleteing: " + id, e);
+ log.error("Exception while deleteing: " + id, e);
}
}
@@ -145,7 +147,7 @@
props.load(propInput);
log.info("Read " + SolrWriter.IMPORTER_PROPERTIES);
} catch (Exception e) {
- log.warn( "Unable to read: " + SolrWriter.IMPORTER_PROPERTIES);
+ log.warn("Unable to read: " + SolrWriter.IMPORTER_PROPERTIES);
} finally {
try {
if (propInput != null)
@@ -167,7 +169,7 @@
delCmd.fromPending = true;
processor.processDelete(delCmd);
} catch (IOException e) {
- log.error( "Exception while deleting by query: " + query, e);
+ log.error("Exception while deleting by query: " + query, e);
}
}
@@ -176,7 +178,7 @@
CommitUpdateCommand commit = new CommitUpdateCommand(optimize);
processor.processCommit(commit);
} catch (Exception e) {
- log.error( "Exception while solr commit.", e);
+ log.error("Exception while solr commit.", e);
}
}
@@ -240,18 +242,6 @@
this.persistStartTime(date);
}
- public abstract SolrDoc getSolrDocInstance();
-
- /**
- * <p>
- * Write the document to the index
- * </p>
- *
- * @param d . The Document warapper object
- * @return a boolean value denoting success (true) or failure (false)
- */
- public abstract boolean upload(SolrDoc d);
-
/**
* This method is used for verbose debugging
*
@@ -259,20 +249,11 @@
* @param name Name of the entity/transformer
* @param row The actual data . Can be a Map<String,object> or a List<Map<String,object>>
*/
- public abstract void log(int event, String name, Object row);
-
- /**
- * The purpose of this interface to provide pluggable implementations for Solr
- * 1.2 & 1.3 The implementation can choose to wrap appropriate Objects based
- * on the version
- */
- public static interface SolrDoc {
-
- public void addField(String name, Object value, float boost);
-
- public Object getField(String field);
-
- public void setDocumentBoost(float boost);
+ public void log(int event, String name, Object row) {
+ if (debugLogger == null) {
+ debugLogger = new DebugLogger();
+ }
+ debugLogger.log(event, name, row);
}
public static final int START_ENTITY = 1, END_ENTITY = 2,
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java?rev=706542&r1=706541&r2=706542&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java Tue Oct 21 00:05:39 2008
@@ -170,12 +170,8 @@
super(null, ".");
}
- public SolrDoc getSolrDocInstance() {
- return new DataImportHandler.SolrDocumentWrapper();
- }
-
- public boolean upload(SolrDoc d) {
- return docs.add(((DataImportHandler.SolrDocumentWrapper) d).doc);
+ public boolean upload(SolrInputDocument doc) {
+ return docs.add(doc);
}
public void log(int event, String name, Object row) {