Added encoding/decoding for longs

kristina · kristina · commit bc18bb2adaea · 2009-08-03T15:24:25.000-04:00
diff --git a/src/main/com/mongodb/ByteDecoder.java b/src/main/com/mongodb/ByteDecoder.java
@@ -177,7 +177,11 @@ protected int decodeNext( DBObject o , String path ){
         case NUMBER_INT:
             o.put( name , _buf.getInt() );
             break;
-	    
+
+        case NUMBER_LONG:
+            o.put( name , _buf.getLong() );
+            break;	    
+
         case SYMBOL:
             // intentional fallthrough
         case STRING:
diff --git a/src/main/com/mongodb/ByteEncoder.java b/src/main/com/mongodb/ByteEncoder.java
@@ -385,6 +385,10 @@ protected int putNumber( String name , Number n ){
 	    _put( NUMBER_INT , name );
 	    _buf.putInt( n.intValue() );
 	}
+        else if (n instanceof Long ) {
+            _put( NUMBER_LONG , name );
+            _buf.putLong( n.longValue() );
+        }
 	else {
 	    _put( NUMBER , name );
 	    _buf.putDouble( n.doubleValue() );
diff --git a/src/main/com/mongodb/Bytes.java b/src/main/com/mongodb/Bytes.java
@@ -68,6 +68,7 @@ public class Bytes {
     static final byte CODE_W_SCOPE = 15;
     static final byte NUMBER_INT = 16;
     static final byte TIMESTAMP = 17;
+    static final byte NUMBER_LONG = 18;
 
     static final byte MINKEY = -1;
     static final byte MAXKEY = 127;
diff --git a/src/main/com/mongodb/RawDBObject.java b/src/main/com/mongodb/RawDBObject.java
@@ -190,6 +190,7 @@ class Element {
                 break;
             case DATE:
             case NUMBER:
+            case NUMBER_LONG:
                 size += 8;
                 break;
 	    case NUMBER_INT:
diff --git a/src/test/com/mongodb/ByteTest.java b/src/test/com/mongodb/ByteTest.java
@@ -371,6 +371,24 @@ public void testPattern() {
         decoder.done();
     }
 
+    @Test(groups = {"basic"})
+    public void testLong() {
+        long s = -9223372036854775808l;
+        long m = 1l;
+        long l = 9223372036854775807l;
+
+        DBObject obj = BasicDBObjectBuilder.start().add("s", s).add("m", m).add("l", l).get();
+        DBCollection c = _db.getCollection("test");
+        c.drop();
+
+        c.insert(obj);
+        DBObject r = c.findOne();
+
+        assertEquals(r.get("s"), -9223372036854775808l);
+        assertEquals(r.get("m"), 1l);
+        assertEquals(r.get("l"), 9223372036854775807l);
+    }
+
     final DBBase _db;
 
     public static void main( String args[] )
