You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2013/11/28 01:18:41 UTC
svn commit: r1546243 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/builtin/REGEX_EXTRACT.java
src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java
test/org/apache/pig/test/TestBuiltin.java
Author: cheolsoo
Date: Thu Nov 28 00:18:41 2013
New Revision: 1546243
URL: http://svn.apache.org/r1546243
Log:
PIG-3566: Cannot set useMatches of REGEX_EXTRACT_ALL and REGEX_EXTRACT (nezihyigitbasi via cheolsoo)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT.java
pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java
pig/trunk/test/org/apache/pig/test/TestBuiltin.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1546243&r1=1546242&r2=1546243&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Nov 28 00:18:41 2013
@@ -54,6 +54,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-3566: Cannot set useMatches of REGEX_EXTRACT_ALL and REGEX_EXTRACT (nezihyigitbasi via cheolsoo)
+
PIG-2132: [Piggybank] MIN and MAX functions should ignore nulls (rekhajoshm via cheolsoo)
PIG-3581: Incorrect scope resolution with nested foreach (aniket486)
Modified: pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT.java?rev=1546243&r1=1546242&r2=1546243&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT.java Thu Nov 28 00:18:41 2013
@@ -44,7 +44,7 @@ import org.apache.pig.impl.logicalLayer.
* <dt><b>Matching strategy:</b></dt>
* <dd>Try to only match the first sequence by using {@link Matcher#find()} instead of
* {@link Matcher#matches()} (default useMatches=false).</dd>
-* <dd><code>DEFINE NON_GREEDY_EXTRACT REGEX_EXTRACT(true);</code></dd>
+* <dd><code>DEFINE NON_GREEDY_EXTRACT REGEX_EXTRACT('true');</code></dd>
* </dl>
*/
@@ -55,8 +55,8 @@ public class REGEX_EXTRACT extends EvalF
public REGEX_EXTRACT() {}
- public REGEX_EXTRACT(boolean useMatches) {
- this.mUseMatches = useMatches;
+ public REGEX_EXTRACT(String useMatches) {
+ this.mUseMatches = Boolean.parseBoolean(useMatches);
}
@Override
Modified: pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java?rev=1546243&r1=1546242&r2=1546243&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java Thu Nov 28 00:18:41 2013
@@ -43,7 +43,7 @@ import org.apache.pig.impl.logicalLayer.
* <dt><b>Matching strategy:</b></dt>
* <dd>Trying to match the entire input by using {@link Matcher#matches()} instead of
* {@link Matcher#find()} (default useMatches=true).</dd>
- * <dd><code>DEFINE GREEDY_EXTRACT REGEX_EXTRACT_ALL(false);</code></dd>
+ * <dd><code>DEFINE GREEDY_EXTRACT REGEX_EXTRACT_ALL('false');</code></dd>
* </dl>
*/
@@ -53,8 +53,8 @@ public class REGEX_EXTRACT_ALL extends E
public REGEX_EXTRACT_ALL() {}
- public REGEX_EXTRACT_ALL(boolean useMatches) {
- this.mUseMatches = useMatches;
+ public REGEX_EXTRACT_ALL(String useMatches) {
+ this.mUseMatches = Boolean.parseBoolean(useMatches);
}
@Override
Modified: pig/trunk/test/org/apache/pig/test/TestBuiltin.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestBuiltin.java?rev=1546243&r1=1546242&r2=1546243&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestBuiltin.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestBuiltin.java Thu Nov 28 00:18:41 2013
@@ -1861,7 +1861,7 @@ public class TestBuiltin {
r = func.exec(t4);
assertEquals("m", r);
- func = new REGEX_EXTRACT(true);
+ func = new REGEX_EXTRACT("true");
r = func.exec(t4);
assertEquals("match", r);
@@ -1903,7 +1903,7 @@ public class TestBuiltin {
assertEquals("t", re.get(0));
assertEquals("his is a match", re.get(1));
- funce = new REGEX_EXTRACT_ALL(false);
+ funce = new REGEX_EXTRACT_ALL("false");
re = funce.exec(te1);
assertEquals(re.size(), 2);
assertEquals("t", re.get(0));