Skip to content

[draft] Add null check on native create_index return and fix test callsites for new metricType param #1639

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

Open
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
+13 −7
Open

[draft] Add null check on native create_index return and fix test callsites for new metricType param #1639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73240c0
Update diskann-garnet from v1.0.23 to v1.0.25 with new metric_type pa…
Copilot Mar 18, 2026
0f1efb3
Add null check on create_index return value, throw GarnetException if…
Copilot Mar 18, 2026
5cad134
Fix DiskANNServiceTests to pass new metricType parameter to create_index
Copilot Mar 18, 2026
beff58d
Fix DiskANNServiceTests: add metricType parameter to create_index calls
Copilot Mar 18, 2026
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 Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.3" />
<PackageVersion Include="diskann-garnet" Version="1.0.23" />
<PackageVersion Include="diskann-garnet" Version="1.0.25" />
</ItemGroup>
</Project>
12 changes: 9 additions & 3 deletions libs/server/Resp/Vector/DiskANNService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Garnet.common;
using Tsavorite.core;

namespace Garnet.server
Expand Down Expand Up @@ -34,11 +35,15 @@ public nint CreateIndex(
delegate* unmanaged[Cdecl]<ulong, nint, nuint, nuint, nint, nint, byte> readModifyWriteCallback
)
{
// TODO: actually pass distance metric

unsafe
{
return NativeDiskANNMethods.create_index(context, dimensions, reduceDims, quantType, buildExplorationFactor, numLinks, (nint)readCallback, (nint)writeCallback, (nint)deleteCallback, (nint)readModifyWriteCallback);
var index = NativeDiskANNMethods.create_index(context, dimensions, reduceDims, quantType, (int)distanceMetric, buildExplorationFactor, numLinks, (nint)readCallback, (nint)writeCallback, (nint)deleteCallback, (nint)readModifyWriteCallback);
if (index == nint.Zero)
{
throw new GarnetException("Failed to create DiskANN index, native create_index returned null");
}

return index;
}
}

Expand Down Expand Up @@ -308,6 +313,7 @@ public static partial nint create_index(
uint dimensions,
uint reduceDims,
VectorQuantType quantType,
int metricType,
uint buildExplorationFactor,
uint numLinks,
nint readCallback,
Expand Down
6 changes: 3 additions & 3 deletions test/Garnet.test/DiskANN/DiskANNServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ unsafe byte ReadModifyWriteCallback(ulong context, nint keyData, nuint keyLength
var deleteFuncPtr = Marshal.GetFunctionPointerForDelegate(deleteDel);
var rmwFuncPtr = Marshal.GetFunctionPointerForDelegate(rmwDel);

var rawIndex = NativeDiskANNMethods.create_index(Context, 75, 0, VectorQuantType.XPreQ8, 10, 10, readFuncPtr, writeFuncPtr, deleteFuncPtr, rmwFuncPtr);
var rawIndex = NativeDiskANNMethods.create_index(Context, 75, 0, VectorQuantType.XPreQ8, (int)VectorDistanceMetricType.Cosine, 10, 10, readFuncPtr, writeFuncPtr, deleteFuncPtr, rmwFuncPtr);

Span<byte> id = [0, 1, 2, 3];
Span<byte> elem = Enumerable.Range(0, 75).Select(static x => (byte)x).ToArray();
Expand Down Expand Up @@ -365,7 +365,7 @@ unsafe byte ReadModifyWriteCallback(ulong context, nint keyData, nuint keyLength
var deleteFuncPtr = Marshal.GetFunctionPointerForDelegate(deleteDel);
var rmwFuncPtr = Marshal.GetFunctionPointerForDelegate(rmwDel);

var rawIndex = NativeDiskANNMethods.create_index(Context, 75, 0, VectorQuantType.XPreQ8, 10, 10, readFuncPtr, writeFuncPtr, deleteFuncPtr, rmwFuncPtr);
var rawIndex = NativeDiskANNMethods.create_index(Context, 75, 0, VectorQuantType.XPreQ8, (int)VectorDistanceMetricType.Cosine, 10, 10, readFuncPtr, writeFuncPtr, deleteFuncPtr, rmwFuncPtr);

Span<byte> id = [0, 1, 2, 3];
Span<byte> elem = Enumerable.Range(0, 75).Select(static x => (byte)x).ToArray();
Expand Down Expand Up @@ -410,7 +410,7 @@ unsafe byte ReadModifyWriteCallback(ulong context, nint keyData, nuint keyLength
{
NativeDiskANNMethods.drop_index(Context, rawIndex);

rawIndex = NativeDiskANNMethods.create_index(Context, 75, 0, VectorQuantType.XPreQ8, 10, 10, readFuncPtr, writeFuncPtr, deleteFuncPtr, rmwFuncPtr);
rawIndex = NativeDiskANNMethods.create_index(Context, 75, 0, VectorQuantType.XPreQ8, (int)VectorDistanceMetricType.Cosine, 10, 10, readFuncPtr, writeFuncPtr, deleteFuncPtr, rmwFuncPtr);
}

// Search value
Expand Down
Loading