handle python longs properly

klbostee · Jan 15, 2009 · f16275c · f16275c
1 parent e60bfed
commit f16275c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/java/org/apache/hadoop/dumbo/CodeUtils.java b/src/java/org/apache/hadoop/dumbo/CodeUtils.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.dumbo;
 
 import java.io.ByteArrayOutputStream;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,6 +69,10 @@ public static String floatToCode(float f) {
   public static String doubleToCode(double d) {
     return numberToCode(d);
   }
+
+  public static String bigIntToCode(BigInteger i) {
+    return numberToCode(i);
+  }
 
   private static String numberToCode(Number n) {
     return n.toString();
@@ -78,11 +83,11 @@ public static int codeToInt(String code) {
   }
 
   public static long codeToLong(String code) {
-    int lastIndex = code.length() - 1;
-    if (code.charAt(lastIndex) == 'L')
-      return Long.parseLong(code.substring(0, code.length()-1));
-    else
-      return Long.parseLong(code);
+    return Long.parseLong(code);
+  }
+
+  public static BigInteger codeToBigInteger(String code) {
+    return new BigInteger(code.substring(0, code.length()-1));
   }
 
   public static float codeToFloat(String code) {

diff --git a/src/java/org/apache/hadoop/dumbo/CodeWritable.java b/src/java/org/apache/hadoop/dumbo/CodeWritable.java
@@ -61,7 +61,7 @@ public void write(DataOutput out) throws IOException {
       writeString(out, CodeUtils.codeToString(code));
     } else if (type == CodeType.BOOLEAN) {
       out.writeBoolean(CodeUtils.codeToBoolean(code));
-    } else if ((type == CodeType.INTEGER) || (type == CodeType.LONG))  {
+    } else if (type == CodeType.INTEGER) {
       WritableUtils.writeVLong(out, CodeUtils.codeToLong(code));
     } else if (type == CodeType.FLOAT) {
       out.writeFloat(CodeUtils.codeToFloat(code));
@@ -82,7 +82,7 @@ public void readFields(DataInput in) throws IOException {
       code = CodeUtils.stringToCode(readString(in));
     } else if (type == CodeType.BOOLEAN.ordinal()) {
       code = CodeUtils.booleanToCode(in.readBoolean());
-    } else if ((type == CodeType.INTEGER.ordinal()) || (type == CodeType.LONG.ordinal())) {
+    } else if (type == CodeType.INTEGER.ordinal()) {
       code = CodeUtils.longToCode(WritableUtils.readVLong(in));
     } else if (type == CodeType.FLOAT.ordinal()) {
       code = new Float(in.readFloat()).toString();

diff --git a/src/test/java/org/apache/hadoop/dumbo/TestCodeWritable.java b/src/test/java/org/apache/hadoop/dumbo/TestCodeWritable.java
@@ -54,7 +54,7 @@ public void testBoolean() throws Exception {
 
   public void testNumber() throws Exception {
     testCode("1234");
-    testCode("1234L","1234");
+    testCode("1234L", false);
     testCode("123.45");
   }