Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix db.Seek #291

Merged
merged 5 commits into from
Jul 21, 2020
Merged

Fix db.Seek #291

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f826dc4
add db.seek ut
Jul 16, 2020
82cc20b
fix db.seek
Jul 16, 2020
ce886ed
remove ByteArrayCompare
Jul 16, 2020
a95037a
Merge branch 'master' into add-db.seek-ut
Tommo-L Jul 16, 2020
1f2cebd
Merge branch 'master' into add-db.seek-ut
shargon Jul 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions src/LevelDBStore/IO/Data/LevelDB/Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,46 @@ namespace Neo.IO.Data.LevelDB
{
public static class Helper
{
private static int ByteArrayCompare(byte[] x, byte[] y)
devhawk marked this conversation as resolved.
Show resolved Hide resolved
{
int length = Math.Min(x.Length, y.Length);
for (int i = 0; i < length; i++)
{
int r = x[i].CompareTo(y[i]);
if (r != 0) return r;
}
return x.Length.CompareTo(y.Length);
}

public static IEnumerable<T> Seek<T>(this DB db, ReadOptions options, byte table, byte[] prefix, SeekDirection direction, Func<byte[], byte[], T> resultSelector)
{
using Iterator it = db.NewIterator(options);
for (it.Seek(CreateKey(table, prefix)); it.Valid();)
byte[] target = CreateKey(table, prefix);
if (direction == SeekDirection.Forward)
{
for (it.Seek(target); it.Valid(); it.Next())
{
var key = it.Key();
if (key.Length < 1 || key[0] != table) break;
yield return resultSelector(it.Key(), it.Value());
}
}
else
{
var key = it.Key();
if (key.Length < 1 || key[0] != table) break;
yield return resultSelector(it.Key(), it.Value());
// SeekForPrev

if (direction == SeekDirection.Forward)
it.Next();
else
it.Seek(target);
if (!it.Valid())
it.SeekToLast();
else if (ByteArrayCompare(it.Key(), target) > 0)
devhawk marked this conversation as resolved.
Show resolved Hide resolved
it.Prev();

for (; it.Valid(); it.Prev())
{
var key = it.Key();
if (key.Length < 1 || key[0] != table) break;
yield return resultSelector(it.Key(), it.Value());
}
}
}

Expand Down
14 changes: 6 additions & 8 deletions src/RocksDBStore/Plugins/Storage/Snapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,13 @@ public void Put(byte table, byte[] key, byte[] value)
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(keyOrPrefix); it.Valid();)
{
yield return (it.Key(), it.Value());

if (direction == SeekDirection.Forward)
it.Next();
else
it.Prev();
}
if (direction == SeekDirection.Forward)
for (it.Seek(keyOrPrefix); it.Valid(); it.Next())
yield return (it.Key(), it.Value());
else
for (it.SeekForPrev(keyOrPrefix); it.Valid(); it.Prev())
yield return (it.Key(), it.Value());
}

public byte[] TryGet(byte table, byte[] key)
Expand Down
17 changes: 7 additions & 10 deletions src/RocksDBStore/Plugins/Storage/Store.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,15 @@ public ISnapshot GetSnapshot()
return new Snapshot(this, db);
}

public IEnumerable<(byte[] Key, byte[] Value)> Seek(byte table, byte[] prefix, SeekDirection direction = SeekDirection.Forward)
public IEnumerable<(byte[] Key, byte[] Value)> Seek(byte table, byte[] keyOrPrefix, SeekDirection direction = SeekDirection.Forward)
{
using var it = db.NewIterator(GetFamily(table), Options.ReadDefault);
for (it.Seek(prefix); it.Valid();)
{
yield return (it.Key(), it.Value());

if (direction == SeekDirection.Forward)
it.Next();
else
it.Prev();
}
if (direction == SeekDirection.Forward)
for (it.Seek(keyOrPrefix); it.Valid(); it.Next())
yield return (it.Key(), it.Value());
else
for (it.SeekForPrev(keyOrPrefix); it.Valid(); it.Prev())
yield return (it.Key(), it.Value());
}

public byte[] TryGet(byte table, byte[] key)
Expand Down
45 changes: 44 additions & 1 deletion tests/Neo.Plugins.Storage.Tests/StoreTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Persistence;
using System;

namespace Neo.Plugins.Storage.Tests
{
Expand Down Expand Up @@ -43,7 +44,7 @@ public void TestRocksDb()
}

/// <summary>
/// Test Put/Delete/TryGet
/// Test Put/Delete/TryGet/Seek
/// </summary>
/// <param name="store">Store</param>
private void TestStorage(IStore store)
Expand All @@ -64,6 +65,48 @@ private void TestStorage(IStore store)

ret = store.TryGet(0, new byte[] { 0x01, 0x02 });
Assert.IsNull(ret);

// Test seek

store.Put(1, new byte[] { 0x00, 0x00, 0x00 }, new byte[] { 0x00 });
store.Put(1, new byte[] { 0x00, 0x00, 0x01 }, new byte[] { 0x01 });
store.Put(1, new byte[] { 0x00, 0x00, 0x02 }, new byte[] { 0x02 });
store.Put(1, new byte[] { 0x00, 0x00, 0x03 }, new byte[] { 0x03 });
store.Put(1, new byte[] { 0x00, 0x00, 0x04 }, new byte[] { 0x04 });

// Seek Forward

var enumerator = store.Seek(1, new byte[] { 0x00, 0x00, 0x02 }, IO.Caching.SeekDirection.Forward).GetEnumerator();
Assert.IsTrue(enumerator.MoveNext());
CollectionAssert.AreEqual(new byte[] { 0x00, 0x00, 0x02 }, enumerator.Current.Key);
CollectionAssert.AreEqual(new byte[] { 0x02 }, enumerator.Current.Value);
Assert.IsTrue(enumerator.MoveNext());
CollectionAssert.AreEqual(new byte[] { 0x00, 0x00, 0x03 }, enumerator.Current.Key);
CollectionAssert.AreEqual(new byte[] { 0x03 }, enumerator.Current.Value);

// Seek Backward

enumerator = store.Seek(1, new byte[] { 0x00, 0x00, 0x02 }, IO.Caching.SeekDirection.Backward).GetEnumerator();
Assert.IsTrue(enumerator.MoveNext());
CollectionAssert.AreEqual(new byte[] { 0x00, 0x00, 0x02 }, enumerator.Current.Key);
CollectionAssert.AreEqual(new byte[] { 0x02 }, enumerator.Current.Value);
Assert.IsTrue(enumerator.MoveNext());
CollectionAssert.AreEqual(new byte[] { 0x00, 0x00, 0x01 }, enumerator.Current.Key);
CollectionAssert.AreEqual(new byte[] { 0x01 }, enumerator.Current.Value);

// Seek Backward

store.Put(2, new byte[] { 0x00, 0x00, 0x00 }, new byte[] { 0x00 });
store.Put(2, new byte[] { 0x00, 0x00, 0x01 }, new byte[] { 0x01 });
store.Put(2, new byte[] { 0x00, 0x01, 0x02 }, new byte[] { 0x02 });

enumerator = store.Seek(2, new byte[] { 0x00, 0x00, 0x03 }, IO.Caching.SeekDirection.Backward).GetEnumerator();
Assert.IsTrue(enumerator.MoveNext());
CollectionAssert.AreEqual(new byte[] { 0x00, 0x00, 0x01 }, enumerator.Current.Key);
CollectionAssert.AreEqual(new byte[] { 0x01 }, enumerator.Current.Value);
Assert.IsTrue(enumerator.MoveNext());
CollectionAssert.AreEqual(new byte[] { 0x00, 0x00, 0x00 }, enumerator.Current.Key);
CollectionAssert.AreEqual(new byte[] { 0x00 }, enumerator.Current.Value);
}
}

Expand Down