Replace db.Find by db.Seek (neo-project#279)

* replace find by seek * add db.seek * fix * format Co-authored-by: Luchuan <[email protected]>
chenzhitong · Oct 13, 2020 · dfe8797 · dfe8797
1 parent 8b095da
commit dfe8797
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 22 deletions.
diff --git a/src/LevelDBStore/IO/Data/LevelDB/Helper.cs b/src/LevelDBStore/IO/Data/LevelDB/Helper.cs
@@ -1,3 +1,4 @@
+using Neo.IO.Caching;
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
@@ -6,15 +7,17 @@ namespace Neo.IO.Data.LevelDB
 {
     public static class Helper
     {
-        public static IEnumerable<T> Find<T>(this DB db, ReadOptions options, byte[] prefix, Func<byte[], byte[], T> resultSelector)
+        public static IEnumerable<T> Seek<T>(this DB db, ReadOptions options, byte[] keyOrPrefix, SeekDirection direction, Func<byte[], byte[], T> resultSelector)
         {
             using Iterator it = db.NewIterator(options);
-            for (it.Seek(prefix); it.Valid(); it.Next())
+            for (it.Seek(keyOrPrefix); it.Valid();)
             {
-                byte[] key = it.Key();
-                if (key.Length < prefix.Length) break;
-                if (!key.AsSpan().StartsWith(prefix)) break;
-                yield return resultSelector(key, it.Value());
+                yield return resultSelector(it.Key(), it.Value());
+
+                if (direction == SeekDirection.Forward)
+                    it.Next();
+                else
+                    it.Prev();
             }
         }
 

diff --git a/src/LevelDBStore/LevelDBStore.csproj b/src/LevelDBStore/LevelDBStore.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00958" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00962" />
   </ItemGroup>
 
 </Project>
diff --git a/src/LevelDBStore/Plugins/Storage/Snapshot.cs b/src/LevelDBStore/Plugins/Storage/Snapshot.cs
@@ -1,3 +1,4 @@
+using Neo.IO.Caching;
 using Neo.IO.Data.LevelDB;
 using Neo.Persistence;
 using System.Collections.Generic;
@@ -35,9 +36,9 @@ public void Dispose()
             snapshot.Dispose();
         }
 
-        public IEnumerable<(byte[] Key, byte[] Value)> Find(byte table, byte[] prefix)
+        public IEnumerable<(byte[] Key, byte[] Value)> Seek(byte table, byte[] prefix, SeekDirection direction)
         {
-            return db.Find(options, Helper.CreateKey(table, prefix), (k, v) => (k[1..], v));
+            return db.Seek(options, Helper.CreateKey(table, prefix), direction, (k, v) => (k[1..], v));
         }
 
         public void Put(byte table, byte[] key, byte[] value)

diff --git a/src/LevelDBStore/Plugins/Storage/Store.cs b/src/LevelDBStore/Plugins/Storage/Store.cs
@@ -1,3 +1,4 @@
+using Neo.IO.Caching;
 using Neo.IO.Data.LevelDB;
 using Neo.Persistence;
 using System;
@@ -49,9 +50,9 @@ public void Dispose()
             db.Dispose();
         }
 
-        public IEnumerable<(byte[], byte[])> Find(byte table, byte[] prefix)
+        public IEnumerable<(byte[], byte[])> Seek(byte table, byte[] prefix, SeekDirection direction)
         {
-            return db.Find(ReadOptions.Default, Helper.CreateKey(table, prefix), (k, v) => (k[1..], v));
+            return db.Seek(ReadOptions.Default, Helper.CreateKey(table, prefix), direction, (k, v) => (k[1..], v));
         }
 
         public ISnapshot GetSnapshot()

diff --git a/src/RocksDBStore/Plugins/Storage/Snapshot.cs b/src/RocksDBStore/Plugins/Storage/Snapshot.cs
@@ -1,3 +1,4 @@
+using Neo.IO.Caching;
 using Neo.Persistence;
 using RocksDbSharp;
 using System;
@@ -40,16 +41,17 @@ public void Put(byte table, byte[] key, byte[] value)
             batch.Put(key, value, store.GetFamily(table));
         }
 
-        public IEnumerable<(byte[] Key, byte[] Value)> Find(byte table, byte[] prefix)
+        public IEnumerable<(byte[] Key, byte[] Value)> Seek(byte table, byte[] keyOrPrefix, SeekDirection direction)
         {
             using var it = db.NewIterator(store.GetFamily(table), options);
-            for (it.Seek(prefix); it.Valid(); it.Next())
+            for (it.Seek(keyOrPrefix); it.Valid();)
             {
-                var key = it.Key();
-                byte[] y = prefix;
-                if (key.Length < y.Length) break;
-                if (!key.AsSpan().StartsWith(y)) break;
-                yield return (key, it.Value());
+                yield return (it.Key(), it.Value());
+
+                if (direction == SeekDirection.Forward)
+                    it.Next();
+                else
+                    it.Prev();
             }
         }
 

diff --git a/src/RocksDBStore/Plugins/Storage/Store.cs b/src/RocksDBStore/Plugins/Storage/Store.cs
@@ -1,3 +1,4 @@
+using Neo.IO.Caching;
 using Neo.Persistence;
 using RocksDbSharp;
 using System;
@@ -81,7 +82,7 @@ public ISnapshot GetSnapshot()
             return new Snapshot(this, db);
         }
 
-        public IEnumerable<(byte[] Key, byte[] Value)> Find(byte table, byte[] prefix)
+        public IEnumerable<(byte[] Key, byte[] Value)> Seek(byte table, byte[] prefix, SeekDirection direction)
         {
             using var it = db.NewIterator(GetFamily(table), Options.ReadDefault);
             for (it.Seek(prefix); it.Valid(); it.Next())

diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00958" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00962" />
     <PackageReference Include="RocksDbNative" Version="6.2.2" />
     <PackageReference Include="RocksDbSharp" Version="6.2.2" />
   </ItemGroup>

diff --git a/src/RpcNep5Tracker/DbCache.cs b/src/RpcNep5Tracker/DbCache.cs
@@ -47,9 +47,9 @@ protected override void DeleteInternal(TKey key)
             batch?.Delete(CreateKey(prefix, key));
         }
 
-        protected override IEnumerable<(TKey, TValue)> FindInternal(byte[] key_prefix)
+        protected override IEnumerable<(TKey, TValue)> SeekInternal(byte[] key_prefix, SeekDirection direction)
         {
-            return db.Find(options, CreateKey(prefix, key_prefix), (k, v) => (k.AsSerializable<TKey>(1), v.AsSerializable<TValue>()));
+            return db.Seek(options, CreateKey(prefix, key_prefix), direction, (k, v) => (k.AsSerializable<TKey>(1), v.AsSerializable<TValue>()));
         }
 
         protected override TValue GetInternal(TKey key)