PIG-5045: CSVExcelStorage Load: A Quoted Field with a Single Escaped Quote """" Becomes "" This should become " instead
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1766169 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 4a224c7..6478863 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -48,6 +48,9 @@
BUG FIXES
+PIG-5045: CSVExcelStorage Load: A Quoted Field with a Single Escaped Quote """" Becomes "" This should become " instead
+ (szita via daijy)
+
PIG-5026: Remove src/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider (nkollar via daijy)
PIG-5041: RoundRobinPartitioner is not deterministic when order of input records change (rohini)
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java b/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java
index ace7629..a765db5 100644
--- a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java
+++ b/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java
@@ -580,7 +580,7 @@
}
} else if (b == DOUBLE_QUOTE) {
// Does a double quote immediately follow?
- if ((i < recordLen-1) && (buf[i+1] == DOUBLE_QUOTE)) {
+ if ((i < recordLen-1) && (buf[i+1] == DOUBLE_QUOTE) && (fieldBuffer.position() != 0)) {
fieldBuffer.put(b);
nextTupleSkipChar = true;
continue;
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java
index 34500d6..9cdfa95 100644
--- a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java
+++ b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java
@@ -218,7 +218,7 @@
Util.registerMultiLineQuery(pig, script);
Iterator<Tuple> it = pig.openIterator("a");
Assert.assertEquals(Util.createTuple(new String[] {"foo,\"bar\",baz"}), it.next());
- Assert.assertEquals(Util.createTuple(new String[] {"\"\"\"\""}), it.next());
+ Assert.assertEquals(Util.createTuple(new String[] {"\"\"\""}), it.next());
}
// Handle newlines in fields
