hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject [14/50] [abbrv] hadoop git commit: MAPREDUCE-1125. SerialUtils.cc: deserializeFloat is out of sync with SerialUtils.hh (Simone Leo via aw)
Date Thu, 12 Nov 2015 18:22:26 GMT
MAPREDUCE-1125. SerialUtils.cc: deserializeFloat is out of sync with SerialUtils.hh (Simone
Leo via aw)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19a0c266
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/19a0c266
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/19a0c266

Branch: refs/heads/HDFS-8707
Commit: 19a0c2660cce0dccf968376bed249de94b58b8a2
Parents: fc7cd46
Author: Allen Wittenauer <aw@apache.org>
Authored: Thu Nov 5 16:57:22 2015 -0800
Committer: Allen Wittenauer <aw@apache.org>
Committed: Thu Nov 5 16:57:22 2015 -0800

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                          | 4 +++-
 .../src/main/native/utils/api/hadoop/SerialUtils.hh           | 1 +
 .../hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc    | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/19a0c266/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 938509a..17b7f4e 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -120,7 +120,6 @@ Trunk (Unreleased)
 
   BUG FIXES
 
-
     MAPREDUCE-6191. Improve clearing stale state of Java serialization
                     testcase.  (Sam Liu via Eric Yang)
 
@@ -172,6 +171,9 @@ Trunk (Unreleased)
     MAPREDUCE-3914. Mismatched free() / delete / delete [] in HadoopPipes
     (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
     non-WritableComparable key types. (harsh)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/19a0c266/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh b/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
index cadfd76..ec1838b 100644
--- a/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
+++ b/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);
   int64_t deserializeLong(InStream& stream);
   void serializeFloat(float t, OutStream& stream);
+  void deserializeFloat(float& t, InStream& stream);
   float deserializeFloat(InStream& stream);
   void serializeString(const std::string& t, OutStream& stream);
   void deserializeString(std::string& t, InStream& stream);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/19a0c266/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc b/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
index 03d009b..401dfee 100644
--- a/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
+++ b/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
@@ -252,6 +252,13 @@ namespace HadoopUtils {
     stream.write(buf, sizeof(float));
   }
 
+  float deserializeFloat(InStream& stream)
+  {
+    float f;
+    deserializeFloat(f, stream);
+    return f;
+  }
+
   void deserializeFloat(float& t, InStream& stream)
   {
     char buf[sizeof(float)];


Mime
View raw message