Sfoglia il codice sorgente

MAPREDUCE-1125. SerialUtils.cc: deserializeFloat is out of sync with SerialUtils.hh (Simone Leo via aw)

Allen Wittenauer 9 anni fa
parent
commit
19a0c2660c

+ 3 - 1
hadoop-mapreduce-project/CHANGES.txt

@@ -120,7 +120,6 @@ Trunk (Unreleased)
 
 
   BUG FIXES
   BUG FIXES
 
 
-
     MAPREDUCE-6191. Improve clearing stale state of Java serialization
     MAPREDUCE-6191. Improve clearing stale state of Java serialization
                     testcase.  (Sam Liu via Eric Yang)
                     testcase.  (Sam Liu via Eric Yang)
 
 
@@ -172,6 +171,9 @@ Trunk (Unreleased)
     MAPREDUCE-3914. Mismatched free() / delete / delete [] in HadoopPipes
     MAPREDUCE-3914. Mismatched free() / delete / delete [] in HadoopPipes
     (Joe Mudd via aw)
     (Joe Mudd via aw)
 
 
+    MAPREDUCE-1125. SerialUtils.cc: deserializeFloat is out of sync with
+    SerialUtils.hh (Simone Leo via aw)
+
     MAPREDUCE-4574. Fix TotalOrderParitioner to work with
     MAPREDUCE-4574. Fix TotalOrderParitioner to work with
     non-WritableComparable key types. (harsh)
     non-WritableComparable key types. (harsh)
 
 

+ 1 - 0
hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh

@@ -162,6 +162,7 @@ namespace HadoopUtils {
   void serializeLong(int64_t t, OutStream& stream);
   void serializeLong(int64_t t, OutStream& stream);
   int64_t deserializeLong(InStream& stream);
   int64_t deserializeLong(InStream& stream);
   void serializeFloat(float t, OutStream& stream);
   void serializeFloat(float t, OutStream& stream);
+  void deserializeFloat(float& t, InStream& stream);
   float deserializeFloat(InStream& stream);
   float deserializeFloat(InStream& stream);
   void serializeString(const std::string& t, OutStream& stream);
   void serializeString(const std::string& t, OutStream& stream);
   void deserializeString(std::string& t, InStream& stream);
   void deserializeString(std::string& t, InStream& stream);

+ 7 - 0
hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc

@@ -252,6 +252,13 @@ namespace HadoopUtils {
     stream.write(buf, sizeof(float));
     stream.write(buf, sizeof(float));
   }
   }
 
 
+  float deserializeFloat(InStream& stream)
+  {
+    float f;
+    deserializeFloat(f, stream);
+    return f;
+  }
+
   void deserializeFloat(float& t, InStream& stream)
   void deserializeFloat(float& t, InStream& stream)
   {
   {
     char buf[sizeof(float)];
     char buf[sizeof(float)];