Merge pull request #3 from SirJosh3917/rewrite

Rewrite

Author: SirJosh3917

README.md

@@ -1,6 +1,6 @@
 # StringDB
 <p align="center">
-    <img src="https://raw.githubusercontent.com/SirJosh3917/StringDB/master/icons/banner_ad.png" alt="StringDB" />
+    <img src="https://rawcdn.githack.com/SirJosh3917/StringDB/master/icons/banner_ad.png" alt="StringDB" />
 </p>
 
 [![AppVeyor Build Status][badge_appveyor_build_image]][badge_appveyor_build_page]
@@ -61,5 +61,5 @@ using(var db = StringDatabase.Create())
 [section_understandable]: #understandable-
 [section_simple]: #simple-
 
-[wiki_stringdb_format]: .
-[wiki_tutorials]: .
+[wiki_stringdb_format]: https://github.com/SirJosh3917/StringDB/wiki/StringDB-10.0.0-Format
+[wiki_tutorials]: https://github.com/SirJosh3917/StringDB/wiki/Getting-Started

src/StringDB.Tests/StringDB10_0_0Tests.cs

@@ -6,6 +6,7 @@
 using StringDB.IO.Compatibility;
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -16,10 +17,49 @@ namespace StringDB.Tests
 {
 	public static class StringDB10_0_0Tests
 	{
+		public class IntegrationTests
+		{
+			[Fact]
+			public void IntegrationTest()
+			{
+				if (File.Exists("stringdb.db"))
+					File.Delete("stringdb.db");
+
+				using (var db = StringDatabase.Create(File.Open("stringdb.db", FileMode.OpenOrCreate)))
+				{
+					db.Insert("test", "value");
+					db.Insert("test", "value2");
+					db.Insert("test", "value3");
+
+					db.EnumerateAggressively(3)
+						.Should().BeEquivalentTo(new[]
+						{
+							new KeyValuePair<string, string>("test", "value"),
+							new KeyValuePair<string, string>("test", "value2"),
+							new KeyValuePair<string, string>("test", "value3"),
+						});
+				}
+
+				using (var db = StringDatabase.Create(File.Open("stringdb.db", FileMode.OpenOrCreate)))
+				{
+					db.Insert("test", "value4");
+
+					db.EnumerateAggressively(3)
+						.Should().BeEquivalentTo(new[]
+						{
+							new KeyValuePair<string, string>("test", "value"),
+							new KeyValuePair<string, string>("test", "value2"),
+							new KeyValuePair<string, string>("test", "value3"),
+							new KeyValuePair<string, string>("test", "value4")
+						});
+				}
+			}
+		}
+
 		public static (MemoryStream ms, StringDB10_0_0LowlevelDatabaseIODevice io) Generate()
 		{
 			var ms = new MemoryStream();
-			var io = new StringDB10_0_0LowlevelDatabaseIODevice(ms);
+			var io = new StringDB10_0_0LowlevelDatabaseIODevice(ms, true);
 
 			return (ms, io);
 		}
@@ -57,7 +97,7 @@ public void TooLargeJumpRead()
 			{
 				var (ms, io) = Generate();
 
-				Action throws = () => io.WriteJump(0xDEAD_BEEF);
+				Action throws = () => io.WriteJump(0xDEAD_BEEF_5);
 
 				throws.Should()
 					.ThrowExactly<ArgumentException>();
@@ -73,6 +113,20 @@ public void AtEOF()
 				throws.Should()
 					.ThrowExactly<NotSupportedException>();
 			}
+
+			[Fact]
+			public void ReadingVeryLargeVariableInt()
+			{
+				var (ms, io) = Generate();
+
+				Action throws = () => io.ReadValue(8);
+
+				io.Reset();
+				ms.Write(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF, 0b0_1111111, 0x00 });
+
+				throws.Should()
+					.ThrowExactly<NotSupportedException>();
+			}
 		}
 
 		public static class Write
@@ -204,6 +258,22 @@ public void JumpShortened()
 						.Should()
 						.Be(1337 - pos);
 				}
+
+				[Fact]
+				public void WritesJumpPosition()
+				{
+					var (ms, io) = Generate();
+
+					io.JumpPos = 0xDEADBEEF5;
+
+					io.Dispose();
+
+					ms.Position = 0;
+					var jumpPos = new byte[8];
+					ms.Read(jumpPos, 0, jumpPos.Length);
+
+					jumpPos.Should().BeEquivalentTo(BitConverter.GetBytes((long)0xDEADBEEF5));
+				}
 			}
 		}
 

src/StringDB/Fluency/CacheDatabaseExtensions.cs

@@ -1,5 +1,7 @@
 using StringDB.Databases;
 
+using System.Runtime.CompilerServices;
+
 namespace StringDB.Fluency
 {
 	/// <summary>
@@ -14,6 +16,7 @@ public static class CacheDatabaseExtensions
 		/// <typeparam name="TValue">The type of value.</typeparam>
 		/// <param name="database">The database to cache results from.</param>
 		/// <returns>A database with caching.</returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabase<TKey, TValue> WithCache<TKey, TValue>(this IDatabase<TKey, TValue> database)
 			=> new CacheDatabase<TKey, TValue>(database);
 	}

src/StringDB/Fluency/DatabaseIODeviceBuilder.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Runtime.CompilerServices;
 
 namespace StringDB.Fluency
 {
@@ -22,6 +23,7 @@ public static class DatabaseIODeviceBuilderExtensions
 		/// <param name="stream">The stream to use.</param>
 		/// <param name="leaveStreamOpen">If the stream should be left open after disposing of the <see cref="IDatabaseIODevice"/>.</param>
 		/// <returns>A <see cref="StoneVaultIODevice"/>.</returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabaseIODevice UseStoneVault
 		(
 			this DatabaseIODeviceBuilder builder,

src/StringDB/Fluency/IODatabaseExtensions.cs

@@ -2,6 +2,7 @@
 using StringDB.IO;
 
 using System;
+using System.Runtime.CompilerServices;
 
 namespace StringDB.Fluency
 {
@@ -16,6 +17,7 @@ public static class IODatabaseExtensions
 		/// <param name="builder">The builder.</param>
 		/// <param name="databaseIODevice">The <see cref="IDatabaseIODevice"/> to pass to the IODatabase.</param>
 		/// <returns>An IODatabase.</returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabase<byte[], byte[]> UseIODatabase
 		(
 			this DatabaseBuilder builder,
@@ -29,6 +31,7 @@ IDatabaseIODevice databaseIODevice
 		/// <param name="builder">The builder.</param>
 		/// <param name="databaseIODevice">A delegate that allows for fluent building of an IDatabaseIODevice.</param>
 		/// <returns>An IODatabase.</returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabase<byte[], byte[]> UseIODatabase
 		(
 			this DatabaseBuilder builder,

src/StringDB/Fluency/MemoryDatabaseExtensions.cs

@@ -1,6 +1,7 @@
 using StringDB.Databases;
 
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 
 namespace StringDB.Fluency
 {
@@ -16,6 +17,7 @@ public static class MemoryDatabaseExtensions
 		/// <typeparam name="TValue">The type of value to use.</typeparam>
 		/// <param name="builder">The builder.</param>
 		/// <returns>A <see cref="MemoryDatabase{TKey,TValue}"/></returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabase<TKey, TValue> UseMemoryDatabase<TKey, TValue>
 		(
 			this DatabaseBuilder builder
@@ -30,6 +32,7 @@ this DatabaseBuilder builder
 		/// <param name="builder">The builder.</param>
 		/// <param name="data">The data to prefill it with.</param>
 		/// <returns>A <see cref="MemoryDatabase{TKey,TValue}"/></returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabase<TKey, TValue> UseMemoryDatabase<TKey, TValue>
 		(
 			this DatabaseBuilder builder,

src/StringDB/Fluency/ThreadLockDatabaseExtensions.cs

@@ -1,5 +1,7 @@
 using StringDB.Databases;
 
+using System.Runtime.CompilerServices;
+
 namespace StringDB.Fluency
 {
 	/// <summary>
@@ -14,6 +16,7 @@ public static class ThreadLockDatabaseExtensions
 		/// <typeparam name="TValue">The type of value.</typeparam>
 		/// <param name="database">The database to put a lock on.</param>
 		/// <returns>A <see cref="ThreadLockDatabase{TKey,TValue}"/>.</returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabase<TKey, TValue> WithThreadLock<TKey, TValue>(this IDatabase<TKey, TValue> database)
 			=> new ThreadLockDatabase<TKey, TValue>(database);
 	}

src/StringDB/Fluency/TransformDatabaseExtensions.cs

@@ -1,5 +1,7 @@
 using StringDB.Databases;
 
+using System.Runtime.CompilerServices;
+
 namespace StringDB.Fluency
 {
 	/// <summary>
@@ -18,6 +20,7 @@ public static class TransformDatabaseExtensions
 		/// <param name="keyTransformer">A transformer for the keys.</param>
 		/// <param name="valueTransformer">A transformer for the values.</param>
 		/// <returns>A <see cref="TransformDatabase{TPreTransformKey,TPreTransformValue,TPostTransformKey,TPostTransformValue}"/>.</returns>
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static IDatabase<TPostKey, TPostValue> WithTransform<TPreKey, TPreValue, TPostKey, TPostValue>
 		(
 			this IDatabase<TPreKey, TPreValue> database,

src/StringDB/IDatabase.cs

@@ -48,6 +48,9 @@ public interface IDatabase<TKey, TValue> : IEnumerable<KeyValuePair<TKey, ILazyL
 		void InsertRange(KeyValuePair<TKey, TValue>[] items);
 	}
 
+	/// <summary>
+	/// Handy extensions for a database.
+	/// </summary>
 	public static class DatabaseExtensions
 	{
 		/// <summary>