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 2014/04/21 21:48:05 UTC
svn commit: r1588974 - in /pig/trunk: ./ src/org/apache/pig/builtin/
Author: cheolsoo
Date: Mon Apr 21 19:48:05 2014
New Revision: 1588974
URL: http://svn.apache.org/r1588974
Log:
PIG-3894: Datetime function AddDuration, SubtractDuration and all Between
functions don't check for null values in the input tuple
(jennythompson via cheolsoo)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/builtin/AddDuration.java
pig/trunk/src/org/apache/pig/builtin/DaysBetween.java
pig/trunk/src/org/apache/pig/builtin/HoursBetween.java
pig/trunk/src/org/apache/pig/builtin/MilliSecondsBetween.java
pig/trunk/src/org/apache/pig/builtin/MinutesBetween.java
pig/trunk/src/org/apache/pig/builtin/MonthsBetween.java
pig/trunk/src/org/apache/pig/builtin/SecondsBetween.java
pig/trunk/src/org/apache/pig/builtin/SubtractDuration.java
pig/trunk/src/org/apache/pig/builtin/WeeksBetween.java
pig/trunk/src/org/apache/pig/builtin/YearsBetween.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Apr 21 19:48:05 2014
@@ -109,6 +109,8 @@ PIG-3882: Multiquery off mode execution
BUG FIXES
+PIG-3894: Datetime function AddDuration, SubtractDuration and all Between functions don't check for null values in the input tuple (jennythompson via cheolsoo)
+
PIG-3772: Syntax error when casting an inner schema of a bag and line break involved (ssvinarchukhorton via daijy)
PIG-3889: Direct fetch doesn't set job submission timestamps (cheolsoo)
Modified: pig/trunk/src/org/apache/pig/builtin/AddDuration.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/AddDuration.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/AddDuration.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/AddDuration.java Mon Apr 21 19:48:05 2014
@@ -71,7 +71,7 @@ public class AddDuration extends EvalFun
@Override
public DateTime exec(Tuple input) throws IOException {
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/DaysBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/DaysBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/DaysBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/DaysBetween.java Mon Apr 21 19:48:05 2014
@@ -78,7 +78,7 @@ public class DaysBetween extends EvalFun
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/HoursBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/HoursBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/HoursBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/HoursBetween.java Mon Apr 21 19:48:05 2014
@@ -77,7 +77,7 @@ public class HoursBetween extends EvalFu
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/MilliSecondsBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/MilliSecondsBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/MilliSecondsBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/MilliSecondsBetween.java Mon Apr 21 19:48:05 2014
@@ -77,7 +77,7 @@ public class MilliSecondsBetween extends
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/MinutesBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/MinutesBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/MinutesBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/MinutesBetween.java Mon Apr 21 19:48:05 2014
@@ -78,7 +78,7 @@ public class MinutesBetween extends Eval
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/MonthsBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/MonthsBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/MonthsBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/MonthsBetween.java Mon Apr 21 19:48:05 2014
@@ -78,7 +78,7 @@ public class MonthsBetween extends EvalF
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/SecondsBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/SecondsBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/SecondsBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/SecondsBetween.java Mon Apr 21 19:48:05 2014
@@ -78,7 +78,7 @@ public class SecondsBetween extends Eval
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/SubtractDuration.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/SubtractDuration.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/SubtractDuration.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/SubtractDuration.java Mon Apr 21 19:48:05 2014
@@ -71,7 +71,7 @@ public class SubtractDuration extends Ev
@Override
public DateTime exec(Tuple input) throws IOException {
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/WeeksBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/WeeksBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/WeeksBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/WeeksBetween.java Mon Apr 21 19:48:05 2014
@@ -78,7 +78,7 @@ public class WeeksBetween extends EvalFu
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}
Modified: pig/trunk/src/org/apache/pig/builtin/YearsBetween.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/YearsBetween.java?rev=1588974&r1=1588973&r2=1588974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/YearsBetween.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/YearsBetween.java Mon Apr 21 19:48:05 2014
@@ -78,7 +78,7 @@ public class YearsBetween extends EvalFu
@Override
public Long exec(Tuple input) throws IOException
{
- if (input == null || input.size() < 2) {
+ if (input == null || input.size() < 2 || input.get(0) == null || input.get(1) == null) {
return null;
}