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

Jump to bottom

Added operation index to support asynchronous replication and audits #94

Merged
merged 1 commit into from
Sep 7, 2024
Merged

Added operation index to support asynchronous replication and audits #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ zoneTree.TryAtomicAddOrUpdate(39, "a", (ref string x) =>
{
x += "b";
return true;
});
}, out var opIndex);
```

---
Expand Down
2 changes: 1 addition & 1 deletion src/Playground/Test1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static void TestReverseIterator(
{
x += " ooops!";
return true;
});
}, out _);
}
maintainer.WaitForBackgroundThreads();
}
Expand Down
7 changes: 4 additions & 3 deletions src/ZoneTree.UnitTests/AtomicUpdateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ public void IntIntAtomicIncrement(WriteAheadLogMode walMode)
{
++y;
return true;
}
},
out _
);
Interlocked.Increment(ref off);
}
Expand Down Expand Up @@ -116,7 +117,7 @@ public void IntIntAtomicIncrementForBTree(WriteAheadLogMode walMode)
{
++y;
return true;
});
}, out _);
Interlocked.Increment(ref off);
}

Expand Down Expand Up @@ -182,7 +183,7 @@ public void IntIntMutableSegmentOnlyAtomicIncrement(WriteAheadLogMode walMode)
{
++y;
return true;
});
}, out _);
Interlocked.Increment(ref off);
}

Expand Down
52 changes: 26 additions & 26 deletions src/ZoneTree.UnitTests/FixedSizeKeyAndValueTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ public void IntStringDeleteTest()
using var data = new ZoneTreeFactory<int, string>()
.SetDataDirectory(dataPath)
.OpenOrCreate();
data.TryAtomicAdd(1, "1");
data.TryAtomicAdd(2, "2");
data.TryAtomicAdd(3, "3");
data.TryDelete(2);
data.TryAtomicAdd(1, "1", out _);
data.TryAtomicAdd(2, "2", out _);
data.TryAtomicAdd(3, "3", out _);
data.TryDelete(2, out _);
Assert.That(data.ContainsKey(1), Is.True);
Assert.That(data.ContainsKey(2), Is.False);
Assert.That(data.ContainsKey(3), Is.True);
Expand All @@ -95,10 +95,10 @@ public void IntNullableIntDeleteTest()
.SetDataDirectory(dataPath)
.SetValueSerializer(new NullableInt32Serializer())
.OpenOrCreate();
data.TryAtomicAdd(1, 1);
data.TryAtomicAdd(2, 2);
data.TryAtomicAdd(3, 3);
data.TryDelete(2);
data.TryAtomicAdd(1, 1, out _);
data.TryAtomicAdd(2, 2, out _);
data.TryAtomicAdd(3, 3, out _);
data.TryDelete(2, out _);
Assert.That(data.ContainsKey(1), Is.True);
Assert.That(data.ContainsKey(2), Is.False);
Assert.That(data.ContainsKey(3), Is.True);
Expand All @@ -116,13 +116,13 @@ public void IntStringGarbageCollectionTest()
using var data = new ZoneTreeFactory<int, string>()
.SetDataDirectory(dataPath)
.OpenOrCreate();
data.TryAtomicAdd(1, "1");
data.TryAtomicAdd(2, "2");
data.TryAtomicAdd(3, "3");
data.TryDelete(2);
data.TryAtomicAdd(4, "4");
data.TryAtomicUpdate(3, "33");
data.TryDelete(2);
data.TryAtomicAdd(1, "1", out _);
data.TryAtomicAdd(2, "2", out _);
data.TryAtomicAdd(3, "3", out _);
data.TryDelete(2, out _);
data.TryAtomicAdd(4, "4", out _);
data.TryAtomicUpdate(3, "33", out _);
data.TryDelete(2, out _);
Assert.That(data.ContainsKey(1), Is.True);
Assert.That(data.ContainsKey(2), Is.False);
Assert.That(data.ContainsKey(3), Is.True);
Expand Down Expand Up @@ -161,13 +161,13 @@ public void IntStringReadOnlySegmentLoadingTest()
using var data = new ZoneTreeFactory<int, string>()
.SetDataDirectory(dataPath)
.OpenOrCreate();
data.TryAtomicAdd(1, "1");
data.TryAtomicAdd(2, "2");
data.TryAtomicAdd(3, "3");
data.TryDelete(2);
data.TryAtomicAdd(4, "4");
data.TryAtomicUpdate(3, "33");
data.TryDelete(2);
data.TryAtomicAdd(1, "1", out _);
data.TryAtomicAdd(2, "2", out _);
data.TryAtomicAdd(3, "3", out _);
data.TryDelete(2, out _);
data.TryAtomicAdd(4, "4", out _);
data.TryAtomicUpdate(3, "33", out _);
data.TryDelete(2, out _);
Assert.That(data.ContainsKey(1), Is.True);
Assert.That(data.ContainsKey(2), Is.False);
Assert.That(data.ContainsKey(3), Is.True);
Expand Down Expand Up @@ -207,10 +207,10 @@ public void IntStringDiskSegmentLoadingTest()
using var data = new ZoneTreeFactory<int, string>()
.SetDataDirectory(dataPath)
.OpenOrCreate();
data.TryAtomicAdd(1, "1");
data.TryAtomicAdd(2, "2");
data.TryAtomicAdd(3, "3");
data.TryDelete(2);
data.TryAtomicAdd(1, "1", out _);
data.TryAtomicAdd(2, "2", out _);
data.TryAtomicAdd(3, "3", out _);
data.TryDelete(2, out _);
Assert.That(data.ContainsKey(1), Is.True);
Assert.That(data.ContainsKey(2), Is.False);
Assert.That(data.ContainsKey(3), Is.True);
Expand Down
51 changes: 51 additions & 0 deletions src/ZoneTree.UnitTests/OpIndexTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
using System.Collections.Concurrent;
using Tenray.ZoneTree.PresetTypes;
using Tenray.ZoneTree.Serializers;

namespace Tenray.ZoneTree.UnitTests;

public sealed class OpIndexTests
{
[Test]
public void TestOpIndex()
{
var dataPath = "data/TestOpIndex";
if (Directory.Exists(dataPath))
Directory.Delete(dataPath, true);
var recordCount = 10_000;
var opIndexes = new ConcurrentBag<long>();
void CreateData()
{
using var zoneTree = new ZoneTreeFactory<int, int>()
.SetDataDirectory(dataPath)
.SetMutableSegmentMaxItemCount(100)
.OpenOrCreate();

using var maintainer = zoneTree.CreateMaintainer();
Parallel.For(0, recordCount, (i) =>
{
var opIndex = zoneTree.Upsert(i, i);
opIndexes.Add(opIndex);
});
maintainer.EvictToDisk();
maintainer.WaitForBackgroundThreads();
}

void ReloadData()
{
using var zoneTree = new ZoneTreeFactory<int, int>()
.SetDataDirectory(dataPath)
.SetMutableSegmentMaxItemCount(100)
.Open();

var opIndex = zoneTree.Upsert(recordCount + 1, recordCount + 1);
Assert.That(opIndex, Is.EqualTo(recordCount + 1));
zoneTree.Maintenance.Drop();
}
CreateData();
ReloadData();
Assert.IsTrue(
opIndexes.Order().ToArray()
.SequenceEqual(Enumerable.Range(1, recordCount).Select(x => (long)x)));
}
}
2 changes: 1 addition & 1 deletion src/ZoneTree.UnitTests/StringTreeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void HelloWorldTest2()
{
x += "b";
return true;
});
}, out _);
zoneTree.TryGet(39, out value);
Assert.That(value, Is.EqualTo("Hello Zone Tree!b"));
}
Expand Down
6 changes: 4 additions & 2 deletions src/ZoneTree.UnitTests/TTLTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ public void TestTTL()
5,
out v1,
bool (ref TTLValue<int> v) =>
v.SlideExpiration(TimeSpan.FromMilliseconds(300)));
v.SlideExpiration(TimeSpan.FromMilliseconds(300)),
out _);
Thread.Sleep(450); // initial expiration (300) + slided expiration (300) - Thread.Sleep(150)
f2 = zoneTree.TryGetAndUpdate(
5,
out v2,
bool (ref TTLValue<int> v) =>
v.SlideExpiration(TimeSpan.FromMilliseconds(300)));
v.SlideExpiration(TimeSpan.FromMilliseconds(300)),
out _);

Assert.That(f1, Is.True);
Assert.That(f2, Is.False);
Expand Down
1 change: 1 addition & 0 deletions src/ZoneTree/Core/ZoneTree.Merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ void MoveMutableSegmentForward(IMutableSegment<TKey, TValue> mutableSegment)

mutableSegment.Freeze();
ReadOnlySegmentQueue.Enqueue(mutableSegment);
MetaWal.EnqueueMaximumOpIndex(mutableSegment.MaximumOpIndex);
MetaWal.EnqueueReadOnlySegment(mutableSegment.SegmentId);

MutableSegment = new MutableSegment<TKey, TValue>(
Expand Down
Loading
Loading