Merge pull request #125 from CoreyKaylor/cursor-api-changes

Reworked api to be more in line with native lib, exposed 0-copy read options.
CoreyKaylor · Jul 30, 2020 · b6db0b4 · b6db0b4
2 parents 46432b4 + 14cbb67
commit b6db0b4
Show file tree

Hide file tree

Showing 22 changed files with 975 additions and 979 deletions.
diff --git a/src/LightningDB.Tests/CursorTests.cs b/src/LightningDB.Tests/CursorTests.cs
diff --git a/src/LightningDB.Tests/DatabaseIOTests.cs b/src/LightningDB.Tests/DatabaseIOTests.cs
@@ -44,7 +44,7 @@ public void DatabaseGetShouldNotThrowExceptions()
         }
 
         [Fact]
-        public void DatabaseInsertedValueShouldBeRetrivedThen()
+        public void DatabaseInsertedValueShouldBeRetrievedThen()
         {
             var key = "key";
             var value = "value";

diff --git a/src/LightningDB.Tests/DatabaseTests.cs b/src/LightningDB.Tests/DatabaseTests.cs
@@ -88,8 +88,8 @@ public void NamedDatabaseNameExistsInMaster()
                 var db = tx.OpenDatabase();
                 using (var cursor = tx.CreateCursor(db))
                 {
-                    cursor.MoveNext();
-                    Assert.Equal("customdb", UTF8.GetString(cursor.Current.Key.CopyToNewArray()));
+                    cursor.Next();
+                    Assert.Equal("customdb", UTF8.GetString(cursor.GetCurrent().key.CopyToNewArray()));
                 }
             }
         }
@@ -166,7 +166,7 @@ public void TruncatingTheDatabase()
             db = _txn.OpenDatabase();
             var result = _txn.Get(db, UTF8.GetBytes("hello"));
 
-            Assert.Null(result);
+            Assert.Equal(MDBResultCode.NotFound, result.resultCode);
         }
     }
 }
diff --git a/src/LightningDB.Tests/HelperTests.cs b/src/LightningDB.Tests/HelperTests.cs
diff --git a/src/LightningDB.Tests/ProfilingTests.cs b/src/LightningDB.Tests/ProfilingTests.cs
diff --git a/src/LightningDB.Tests/TestHelperExtensions.cs b/src/LightningDB.Tests/TestHelperExtensions.cs
@@ -1,21 +1,22 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Collections.Generic;
 
 namespace LightningDB.Tests
 {
     public static class TestHelperExtensions
     {
-        public static void Put(this LightningTransaction tx, LightningDatabase db, string key, string value)
+        public static MDBResultCode Put(this LightningTransaction tx, LightningDatabase db, string key, string value)
         {
             var enc = System.Text.Encoding.UTF8;
-            tx.Put(db, enc.GetBytes(key), enc.GetBytes(value));
+            return tx.Put(db, enc.GetBytes(key), enc.GetBytes(value));
         }
 
         public static string Get(this LightningTransaction tx, LightningDatabase db, string key)
         {
             var enc = System.Text.Encoding.UTF8;
             var result = tx.Get(db, enc.GetBytes(key));
-            return enc.GetString(result);
+            return enc.GetString(result.value.CopyToNewArray());
         }
 
         public static void Delete(this LightningTransaction tx, LightningDatabase db, string key)
@@ -46,5 +47,24 @@ public static IEnumerable<IEnumerable<T>> Split<T>(this IEnumerable<T> list, int
                 .GroupBy(x => x.Index / parts)
                 .Select(x => x.Select(v => v.Value));
         }
+
+        public static void RunCursorScenario(this LightningEnvironment env, 
+            Action<LightningTransaction, LightningDatabase, LightningCursor> scenario,
+            DatabaseOpenFlags flags = DatabaseOpenFlags.Create, TransactionBeginFlags transactionFlags = TransactionBeginFlags.None)
+        {
+            using var tx = env.BeginTransaction(transactionFlags);
+            using var db = tx.OpenDatabase(configuration: new DatabaseConfiguration { Flags = flags });
+            using var cursor = tx.CreateCursor(db);
+            scenario(tx, db, cursor);
+        }
+
+        public static void RunTransactionScenario(this LightningEnvironment env, 
+            Action<LightningTransaction, LightningDatabase> scenario,
+            DatabaseOpenFlags flags = DatabaseOpenFlags.Create, TransactionBeginFlags transactionFlags = TransactionBeginFlags.None)
+        {
+            using var tx = env.BeginTransaction(transactionFlags);
+            using var db = tx.OpenDatabase(configuration: new DatabaseConfiguration { Flags = flags });
+            scenario(tx, db);
+        }
     }
 }