Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11512. Use getTrimmedStrings when reading serialization keys. Contributed by Ryan P.

This commit is contained in:
Harsh J 2015-02-09 11:10:45 +05:30
parent 2b722b904e
commit 442bc776db
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -202,6 +202,9 @@ Release 2.7.0 - UNRELEASED
BUG FIXES BUG FIXES
HADOOP-11512. Use getTrimmedStrings when reading serialization keys
(Ryan P via harsh)
HADOOP-11488. Difference in default connection timeout for S3A FS HADOOP-11488. Difference in default connection timeout for S3A FS
(Daisuke Kobayashi via harsh) (Daisuke Kobayashi via harsh)

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/SerializationFactory.java
View File

@ -55,7 +55,7 @@ public class SerializationFactory extends Configured {
*/ */
public SerializationFactory(Configuration conf) { public SerializationFactory(Configuration conf) {
super(conf); super(conf);
for (String serializerName : conf.getStrings( for (String serializerName : conf.getTrimmedStrings(
CommonConfigurationKeys.IO_SERIALIZATIONS_KEY, CommonConfigurationKeys.IO_SERIALIZATIONS_KEY,
new String[]{WritableSerialization.class.getName(), new String[]{WritableSerialization.class.getName(),
AvroSpecificSerialization.class.getName(), AvroSpecificSerialization.class.getName(),

11
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/TestSerializationFactory.java
View File

@ -17,6 +17,8 @@
*/ */
package org.apache.hadoop.io.serializer; package org.apache.hadoop.io.serializer;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -41,4 +43,13 @@ public class TestSerializationFactory {
assertNull("A null should be returned if there are no deserializers found", assertNull("A null should be returned if there are no deserializers found",
factory.getDeserializer(TestSerializationFactory.class)); factory.getDeserializer(TestSerializationFactory.class));
} }
@Test
public void testSerializationKeyIsTrimmed() {
Configuration conf = new Configuration();
conf.set(CommonConfigurationKeys.IO_SERIALIZATIONS_KEY, " org.apache.hadoop.io.serializer.WritableSerialization ");
SerializationFactory factory = new SerializationFactory(conf);
assertNotNull("Valid class must be returned",
factory.getSerializer(LongWritable.class));
}
} }