You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2014/08/18 20:40:06 UTC
svn commit: r1618699 - in /hadoop/common/branches/branch-1: CHANGES.txt
src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java
Author: kasha
Date: Mon Aug 18 18:40:06 2014
New Revision: 1618699
URL: http://svn.apache.org/r1618699
Log:
MAPREDUCE-6012. DBInputSplit creates invalid ranges on Oracle. (Wei Yan via kasha)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1618699&r1=1618698&r2=1618699&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Aug 18 18:40:06 2014
@@ -239,6 +239,9 @@ Release 1.3.0 - unreleased
HDFS-6822. Namenode and datanode fails to replace "_HOST" to hostname for
hadoop.http.authentication.kerberos.principal. (jing9)
+ MAPREDUCE-6012. DBInputSplit creates invalid ranges on Oracle.
+ (Wei Yan via kasha)
+
Release 1.2.2 - unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java?rev=1618699&r1=1618698&r2=1618699&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java Mon Aug 18 18:40:06 2014
@@ -81,15 +81,14 @@ public class OracleDBRecordReader<T exte
try {
DBInputFormat.DBInputSplit split = getSplit();
- if (split.getLength() > 0 && split.getStart() > 0){
+ if (split.getLength() > 0){
String querystring = query.toString();
query = new StringBuilder();
query.append("SELECT * FROM (SELECT a.*,ROWNUM dbif_rno FROM ( ");
query.append(querystring);
- query.append(" ) a WHERE rownum <= ").append(split.getStart());
- query.append(" + ").append(split.getLength());
- query.append(" ) WHERE dbif_rno >= ").append(split.getStart());
+ query.append(" ) a WHERE rownum <= ").append(split.getEnd());
+ query.append(" ) WHERE dbif_rno > ").append(split.getStart());
}
} catch (IOException ex) {
// ignore, will not throw.