svn commit: r1558544 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/contrib/ solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/ solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ solr/contrib/morphlines-core/...

[ma...@apache.org]

Author: markrmiller
Date: Wed Jan 15 19:35:45 2014
New Revision: 1558544

URL: http://svn.apache.org/r1558544
Log:
SOLR-1301: Merge in latest morphlines module updates.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java

Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java?rev=1558544&r1=1558543&r2=1558544&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java Wed Jan 15 19:35:45 2014
@@ -61,6 +61,7 @@ import com.cloudera.cdk.morphline.api.Mo
 import com.cloudera.cdk.morphline.api.MorphlineContext;
 import com.cloudera.cdk.morphline.api.MorphlineRuntimeException;
 import com.cloudera.cdk.morphline.api.Record;
+import com.cloudera.cdk.morphline.base.Configs;
 import com.cloudera.cdk.morphline.base.Fields;
 import com.cloudera.cdk.morphline.stdio.AbstractParser;
 import com.google.common.base.Joiner;
@@ -87,7 +88,7 @@ public final class SolrCellBuilder imple
 
   @Override
   public Command build(Config config, Command parent, Command child, MorphlineContext context) {
-    return new SolrCell(config, parent, child, context);
+    return new SolrCell(this, config, parent, child, context);
   }
   
   
@@ -109,8 +110,8 @@ public final class SolrCellBuilder imple
         
     public static final String ADDITIONAL_SUPPORTED_MIME_TYPES = "additionalSupportedMimeTypes";
     
-    public SolrCell(Config config, Command parent, Command child, MorphlineContext context) {
-      super(config, parent, child, context);
+    public SolrCell(CommandBuilder builder, Config config, Command parent, Command child, MorphlineContext context) {
+      super(builder, config, parent, child, context);
       
       Config solrLocatorConfig = getConfigs().getConfig(config, "solrLocator");
       SolrLocator locator = new SolrLocator(solrLocatorConfig, context);
@@ -129,7 +130,7 @@ public final class SolrCellBuilder imple
       }
       Config fmapConfig = getConfigs().getConfig(config, "fmap", null);
       if (fmapConfig != null) {
-        for (Map.Entry<String, Object> entry : fmapConfig.root().unwrapped().entrySet()) {
+        for (Map.Entry<String, Object> entry : new Configs().getEntrySet(fmapConfig)) {
           cellParams.put(ExtractingParams.MAP_PREFIX + entry.getKey(), entry.getValue().toString());
         }
       }

Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java?rev=1558544&r1=1558543&r2=1558544&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java Wed Jan 15 19:35:45 2014
@@ -60,7 +60,7 @@ public final class GenerateSolrSequenceK
 
   @Override
   public Command build(Config config, Command parent, Command child, MorphlineContext context) {
-    return new GenerateSolrSequenceKey(config, parent, child, context);
+    return new GenerateSolrSequenceKey(this, config, parent, child, context);
   }
   
   
@@ -77,8 +77,8 @@ public final class GenerateSolrSequenceK
     private final String idPrefix; // for load testing only; enables adding same document many times with a different unique key
     private final Random randomIdPrefix; // for load testing only; enables adding same document many times with a different unique key
 
-    public GenerateSolrSequenceKey(Config config, Command parent, Command child, MorphlineContext context) {
-      super(config, parent, child, context);
+    public GenerateSolrSequenceKey(CommandBuilder builder, Config config, Command parent, Command child, MorphlineContext context) {
+      super(builder, config, parent, child, context);
       this.baseIdFieldName = getConfigs().getString(config, "baseIdField", Fields.BASE_ID);
       this.preserveExisting = getConfigs().getBoolean(config, "preserveExisting", true);      
       

Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java?rev=1558544&r1=1558543&r2=1558544&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java Wed Jan 15 19:35:45 2014
@@ -31,6 +31,7 @@ import com.cloudera.cdk.morphline.api.Mo
 import com.cloudera.cdk.morphline.api.MorphlineRuntimeException;
 import com.cloudera.cdk.morphline.api.Record;
 import com.cloudera.cdk.morphline.base.AbstractCommand;
+import com.cloudera.cdk.morphline.base.Configs;
 import com.cloudera.cdk.morphline.base.Metrics;
 import com.cloudera.cdk.morphline.base.Notifications;
 import com.codahale.metrics.Timer;
@@ -49,7 +50,7 @@ public final class LoadSolrBuilder imple
 
   @Override
   public Command build(Config config, Command parent, Command child, MorphlineContext context) {
-    return new LoadSolr(config, parent, child, context);
+    return new LoadSolr(this, config, parent, child, context);
   }
   
   
@@ -62,14 +63,14 @@ public final class LoadSolrBuilder imple
     private final Map<String, Float> boosts = new HashMap();
     private final Timer elapsedTime;    
     
-    public LoadSolr(Config config, Command parent, Command child, MorphlineContext context) {
-      super(config, parent, child, context);
+    public LoadSolr(CommandBuilder builder, Config config, Command parent, Command child, MorphlineContext context) {
+      super(builder, config, parent, child, context);
       Config solrLocatorConfig = getConfigs().getConfig(config, "solrLocator");
       SolrLocator locator = new SolrLocator(solrLocatorConfig, context);
       LOG.debug("solrLocator: {}", locator);
       this.loader = locator.getLoader();
       Config boostsConfig = getConfigs().getConfig(config, "boosts", ConfigFactory.empty());
-      for (Map.Entry<String, Object> entry : boostsConfig.root().unwrapped().entrySet()) {
+      for (Map.Entry<String, Object> entry : new Configs().getEntrySet(boostsConfig)) {
         String fieldName = entry.getKey();        
         float boost = Float.parseFloat(entry.getValue().toString().trim());
         boosts.put(fieldName, boost);

Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java?rev=1558544&r1=1558543&r2=1558544&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java Wed Jan 15 19:35:45 2014
@@ -50,7 +50,7 @@ public final class SanitizeUnknownSolrFi
 
   @Override
   public Command build(Config config, Command parent, Command child, MorphlineContext context) {
-    return new SanitizeUnknownSolrFields(config, parent, child, context);
+    return new SanitizeUnknownSolrFields(this, config, parent, child, context);
   }
   
   
@@ -62,8 +62,8 @@ public final class SanitizeUnknownSolrFi
     private final IndexSchema schema;
     private final String renameToPrefix;
         
-    public SanitizeUnknownSolrFields(Config config, Command parent, Command child, MorphlineContext context) {
-      super(config, parent, child, context);      
+    public SanitizeUnknownSolrFields(CommandBuilder builder, Config config, Command parent, Command child, MorphlineContext context) {
+      super(builder, config, parent, child, context);      
       
       Config solrLocatorConfig = getConfigs().getConfig(config, "solrLocator");
       SolrLocator locator = new SolrLocator(solrLocatorConfig, context);

Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java?rev=1558544&r1=1558543&r2=1558544&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java Wed Jan 15 19:35:45 2014
@@ -51,7 +51,7 @@ public final class TokenizeTextBuilder i
 
   @Override
   public Command build(Config config, Command parent, Command child, MorphlineContext context) {
-    return new TokenizeText(config, parent, child, context);
+    return new TokenizeText(this, config, parent, child, context);
   }
   
   
@@ -66,8 +66,8 @@ public final class TokenizeTextBuilder i
     private final CharTermAttribute token; // cached
     private final ReusableStringReader reader = new ReusableStringReader(); // cached
     
-    public TokenizeText(Config config, Command parent, Command child, MorphlineContext context) {
-      super(config, parent, child, context);
+    public TokenizeText(CommandBuilder builder, Config config, Command parent, Command child, MorphlineContext context) {
+      super(builder, config, parent, child, context);
       this.inputFieldName = getConfigs().getString(config, "inputField");
       this.outputFieldName = getConfigs().getString(config, "outputField");      
       String solrFieldType = getConfigs().getString(config, "solrFieldType");      

Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java?rev=1558544&r1=1558543&r2=1558544&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java Wed Jan 15 19:35:45 2014
@@ -118,8 +118,6 @@ public class SolrMorphlineZkAliasTest ex
     } catch (IllegalArgumentException e) {
       
     }
-    
-    cloudClient.shutdown();
   }
   
   private NamedList<Object> createAlias(String alias, String collections) throws SolrServerException, IOException {