You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/08/17 19:51:59 UTC
svn commit: r1618489 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/contrib/
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/
solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
Author: shalin
Date: Sun Aug 17 17:51:59 2014
New Revision: 1618489
URL: http://svn.apache.org/r1618489
Log:
SOLR-6383: RegexTransformer returns no results after replaceAll if regex does not match a value
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1618489&r1=1618488&r2=1618489&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sun Aug 17 17:51:59 2014
@@ -195,6 +195,9 @@ Bug Fixes
* SOLR-6380: Added missing context info to log message if IOException occurs in processing tlog
(Steven Bower via hossman)
+* SOLR-6383: RegexTransformer returns no results after replaceAll if regex does not match a value.
+ (Alexander Kingson, shalin)
+
Optimizations
---------------------
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java?rev=1618489&r1=1618488&r2=1618489&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java Sun Aug 17 17:51:59 2014
@@ -122,7 +122,7 @@ public class RegexTransformer extends Tr
} else if (replaceWith != null) {
Pattern p = getPattern(reStr);
Matcher m = p.matcher(value);
- return m.find()? m.replaceAll(replaceWith): null;
+ return m.find() ? m.replaceAll(replaceWith) : value;
} else {
return readfromRegExp(reStr, value, col, groupNames);
}
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java?rev=1618489&r1=1618488&r2=1618489&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java Sun Aug 17 17:51:59 2014
@@ -98,6 +98,20 @@ public class TestRegexTransformer extend
Map<String, Object> result = new RegexTransformer().transformRow(src,
context);
assertEquals("D''souza", result.get("name"));
+
+ fld = getField("title_underscore", "string", "\\s+", "title", null);
+ fld.put(REPLACE_WITH, "_");
+ fields.clear();
+ fields.add(fld);
+ context = getContext(null, null, null, Context.FULL_DUMP, fields, null);
+ src.clear();
+ src.put("title", "value with spaces"); // a value which will match the regex
+ result = new RegexTransformer().transformRow(src, context);
+ assertEquals("value_with_spaces", result.get("title_underscore"));
+ src.clear();
+ src.put("title", "valueWithoutSpaces"); // value which will not match regex
+ result = new RegexTransformer().transformRow(src, context);
+ assertEquals("valueWithoutSpaces", result.get("title_underscore")); // value should be returned as-is
}
@Test
@@ -117,7 +131,7 @@ public class TestRegexTransformer extend
fld = getField("t1", "string","duff", "rowdata", null);
fields.add(fld);
- // **ATTEMPTS** a match WITH a replaceWith
+ // **ATTEMPTS** a match WITH a replaceWith (should return original data)
// <field column="t2" sourceColName="rowdata" regexp="duff" replaceWith="60"/>
fld = getField("t2", "string","duff", "rowdata", null);
fld.put(REPLACE_WITH, "60");
@@ -140,7 +154,8 @@ public class TestRegexTransformer extend
Context context = getContext(null, resolver, null, Context.FULL_DUMP, fields, eAttrs);
Map<String, Object> result = new RegexTransformer().transformRow(row, context);
- assertEquals(5, result.size());
+ assertEquals(6, result.size());
+ assertEquals(s, result.get("t2"));
assertEquals(s, result.get("rowdata"));
assertEquals("26", result.get("highway_mileage"));
assertEquals("19", result.get("city_mileage"));