Fixed a read length bug in GridFS

Renamed MapReduce result stats
samus · Feb 17, 2010 · 335e5e3 · 335e5e3
1 parent 7d63829
commit 335e5e3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/MongoDB.GridFS.Tests/GridFileStreamTest.cs b/MongoDB.GridFS.Tests/GridFileStreamTest.cs
@@ -260,7 +260,27 @@ public class GridFileStreamTest
             Assert.AreEqual(newsize, gfs.GridFileInfo.Length);
         }
 
-
+        [Test]
+        public void TestReadLengthIsSameAsWriteLength(){
+            string filename = "readwritelength.txt";
+            GridFileStream gfs = fs.Create(filename);
+            int length = 0;
+            for(int i = 1; i <= 50; i++){
+                gfs.Write(BitConverter.GetBytes(i), 0, 4);
+                length += 4;
+            }
+            gfs.Close();
+            Assert.AreEqual(length, gfs.GridFileInfo.Length, "File length written is not the same as in gridfileinfo");
+
+            gfs = fs.OpenRead(filename);            
+            byte[] buffer = new byte[16];
+            int read = 0;
+            int readLength = read;
+            while((read = gfs.Read(buffer,0,buffer.Length)) > 0){
+                readLength += read;
+            }
+            Assert.AreEqual(length, readLength, "Too much read back.");
+        }
 
         #region File API compatibility
 

diff --git a/MongoDB.GridFS/GridFileStream.cs b/MongoDB.GridFS/GridFileStream.cs
@@ -108,6 +108,10 @@ public class GridFileStream : Stream
                 }else{
                     readCount = buffAvailable;
                 }
+                if(readCount + position > highestPosWritten){
+                    //adjust readcount so that we don't read past the end of file.
+                    readCount = readCount - (int)(readCount + position - highestPosWritten);
+                }
                 Array.Copy(buffer,buffPosition,array,offset,readCount);
                 buffPosition += readCount;
                 bytesLeftToRead -= readCount;

diff --git a/MongoDB.Net-Tests/TestMapReduceBuilder.cs b/MongoDB.Net-Tests/TestMapReduceBuilder.cs
@@ -69,9 +69,9 @@ public class TestMapReduceBuilder
             MapReduce mr = mrb.Map(mapfunction).Reduce(reducefunction).Execute();
             Assert.IsNotNull(mr.Result);
             Assert.IsTrue(mr.Result.Ok);
-            Assert.AreEqual(4, mr.Result.Input);
-            Assert.AreEqual(6, mr.Result.Emit);
-            Assert.AreEqual(3, mr.Result.Output);
+            Assert.AreEqual(4, mr.Result.InputCount);
+            Assert.AreEqual(6, mr.Result.EmitCount);
+            Assert.AreEqual(3, mr.Result.OutputCount);
         }
 
         [Test()]

diff --git a/MongoDBDriver/CodeWScope.cs b/MongoDBDriver/CodeWScope.cs
@@ -15,6 +15,8 @@ public class CodeWScope : Code
 
         public CodeWScope(){}
 
+        public CodeWScope(String code):this(code, new Document()){}
+
         public CodeWScope(String code, Document scope){
             this.Value = code;
             this.Scope = scope;

diff --git a/MongoDBDriver/MapReduce.cs b/MongoDBDriver/MapReduce.cs
@@ -21,15 +21,15 @@ public class MapReduceResult{
             public string CollectionName{
                 get{return (string)result["result"];}
             }
-            public long Input{
+            public long InputCount{
                 get{return Convert.ToInt64(counts["input"]);}
             }
 
-            public long Emit{
+            public long EmitCount{
                 get{return Convert.ToInt64(counts["emit"]);}
             }
 
-            public long Output{
+            public long OutputCount{
                 get{return Convert.ToInt64(counts["output"]);}
             }