Merge branch 'master' of https://github.com/Bobris/BTDB

Bobris · Jun 3, 2014 · d502c54 · d502c54
2 parents a8718ee + 2d67cf6
commit d502c54
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/BTDB/EventStoreLayer/AppendingEventStore.cs b/BTDB/EventStoreLayer/AppendingEventStore.cs
@@ -63,7 +63,7 @@ void SerializeIntoBuffer(object metadata, IReadOnlyList<object> events, out int
                                  out IDescriptorSerializerContext serializerContext, out BlockType blockType,
                                  out int lenWithoutEndPadding, out ByteBuffer block)
         {
-            startOffset = (int) EndBufferLen + HeaderSize;
+            startOffset = (int)EndBufferLen + HeaderSize;
             var writer = new ByteBufferWriter();
             writer.WriteBlock(_zeroes, 0, startOffset);
             serializerContext = Mapping;
@@ -95,16 +95,16 @@ void SerializeIntoBuffer(object metadata, IReadOnlyList<object> events, out int
                 }
                 else
                 {
-                    writer.WriteVUInt32((uint) events.Count);
+                    writer.WriteVUInt32((uint)events.Count);
                     foreach (var o in events)
                     {
                         serializerContext.StoreObject(writer, o);
                     }
                     blockType |= BlockType.HasMoreEvents;
                 }
             }
-            lenWithoutEndPadding = (int) writer.GetCurrentPosition();
+            lenWithoutEndPadding = (int)writer.GetCurrentPosition();
-            writer.WriteBlock(_zeroes, 0, (int) (SectorSize - 1));
+            writer.WriteBlock(_zeroes, 0, (int)(SectorSize - 1));
             block = writer.Data;
             if (CompressionStrategy.ShouldTryToCompress(lenWithoutEndPadding - startOffset))
             {
@@ -114,7 +114,7 @@ void SerializeIntoBuffer(object metadata, IReadOnlyList<object> events, out int
                     blockType |= BlockType.Compressed;
                     Array.Copy(compressedBlock.Buffer, compressedBlock.Offset, block.Buffer, startOffset, compressedBlock.Length);
                     lenWithoutEndPadding = startOffset + compressedBlock.Length;
-                    Array.Copy(_zeroes, 0, block.Buffer, lenWithoutEndPadding, (int) SectorSize - 1);
+                    Array.Copy(_zeroes, 0, block.Buffer, lenWithoutEndPadding, (int)SectorSize - 1);
                 }
             }
         }
@@ -146,7 +146,7 @@ public void FinalizeStore()
             var startOffset = (int)EndBufferLen + HeaderSize;
             if (EndBufferPosition + (ulong)startOffset <= File.MaxFileSize)
             {
-                WriteOneBlock(ByteBuffer.NewSync(new byte[SectorSize + HeaderSize], startOffset, 0), BlockType.LastBlock);
+                WriteOneBlock(ByteBuffer.NewSync(new byte[SectorSize * 2], startOffset, 0), BlockType.LastBlock);
             }
             EndBufferPosition = ulong.MaxValue;
             KnownAsFinished = true;

diff --git a/BTDBTest/EventStoreTest.cs b/BTDBTest/EventStoreTest.cs
@@ -56,6 +56,20 @@ public void CanFinalizeEventStoreAfterReadFromStart()
             Assert.False(appender.IsKnownAsFinished());
         }
 
+        [Test]
+        public void CanFinalizeEventStoreOnEverySectorPosition()
+        {
+            for (int i = 4000; i < 4600; i++)
+            {
+                var manager = new EventStoreManager();
+                manager.CompressionStrategy = new NoCompressionStrategy();
+                var file1 = new MemoryEventFileStorage(4096, 8192);
+                var appender = manager.AppendToStore(file1);
+                appender.Store(null, new object[] { new byte[i] });
+                appender.Store(null, new object[] { new byte[7000] });
+            }
+        }
+
         [Test]
         public void CanFinalizeEventStoreAfterReadFromStartFirstNearlyFull()
         {