You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by bi...@apache.org on 2013/01/22 05:08:36 UTC
svn commit: r1436744 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/builtin/PigStorage.java
Author: billgraham
Date: Tue Jan 22 04:08:36 2013
New Revision: 1436744
URL: http://svn.apache.org/viewvc?rev=1436744&view=rev
Log:
PIG-3057: Make PigStorage.readField() protected (pablomar and billgraham via billgraham)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/builtin/PigStorage.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1436744&r1=1436743&r2=1436744&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Jan 22 04:08:36 2013
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-3057: Make PigStorage.readField() protected (pablomar and billgraham via billgraham)
+
PIG-2788: improved string interpolation of variables (jcoveney)
PIG-2362: Rework Ant build.xml to use macrodef instead of antcall (azaroth via cheolsoo)
Modified: pig/trunk/src/org/apache/pig/builtin/PigStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/PigStorage.java?rev=1436744&r1=1436743&r2=1436744&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/PigStorage.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/PigStorage.java Tue Jan 22 04:08:36 2013
@@ -248,14 +248,14 @@ LoadPushDown, LoadMetadata, StoreMetadat
for (int i = 0; i < len; i++) {
if (buf[i] == fieldDel) {
if (mRequiredColumns==null || (mRequiredColumns.length>fieldID && mRequiredColumns[fieldID]))
- readField(buf, start, i);
+ addTupleValue(mProtoTuple, buf, start, i);
start = i + 1;
fieldID++;
}
}
// pick up the last field
if (start <= len && (mRequiredColumns==null || (mRequiredColumns.length>fieldID && mRequiredColumns[fieldID]))) {
- readField(buf, start, len);
+ addTupleValue(mProtoTuple, buf, start, len);
}
Tuple t = mTupleFactory.newTupleNoCopy(mProtoTuple);
@@ -320,12 +320,22 @@ LoadPushDown, LoadMetadata, StoreMetadat
}
}
- private void readField(byte[] buf, int start, int end) {
+ private void addTupleValue(ArrayList<Object> tuple, byte[] buf, int start, int end) {
+ tuple.add(readField(buf, start, end));
+ }
+
+ /**
+ * Read the bytes between start and end into a DataByteArray for inclusion in the return tuple.
+ * @param bytes byte array to copy data from
+ * @param start starting point to copy from
+ * @param end ending point to copy to, exclusive.
+ * @return
+ */
+ protected DataByteArray readField(byte[] bytes, int start, int end) {
if (start == end) {
- // NULL value
- mProtoTuple.add(null);
+ return null;
} else {
- mProtoTuple.add(new DataByteArray(buf, start, end));
+ return new DataByteArray(bytes, start, end);
}
}