Skip to content

Upgrade to 2.6 #1

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
frfly wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Upgrade to 2.6 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b5990d
Update SDK to be compatible with 2.5 server. Fix tests
frfly Sep 29, 2025
7e1a4b0
Update tests to 2.6
frfly Sep 29, 2025
dd0e1e7
Support hybrid search
frfly Oct 13, 2025
2c99198
Use latest milvus image in tests
frfly Oct 15, 2025
0e92083
Disable artifact upload temporarily
frfly Oct 15, 2025
1d22f70
Move hybrid search tests to different class. Add more tests
frfly Oct 15, 2025
ba7b6e2
Add workaround for two flaky tests
frfly Oct 15, 2025
7380242
Add net8 support
frfly Oct 16, 2025
7d1d4a0
fixup! Support hybrid search
frfly Oct 16, 2025
a5d13ba
Remove unused
frfly Oct 17, 2025
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
16 changes: 8 additions & 8 deletions .github/workflows/Build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
milvus_version: [v2.3.10, v2.4.0-rc.1]
milvus_version: [v2.6.2]

steps:
- name: Checkout
Expand All @@ -32,11 +32,11 @@ jobs:
- name: Pack
run: dotnet pack -c Release -o Artifacts

- name: Upload artifacts (nupkg)
uses: actions/upload-artifact@v3
with:
name: nupkgs
path: |
Artifacts/*.nupkg
Artifacts/*.snupkg
# - name: Upload artifacts (nupkg)
# uses: actions/upload-artifact@v4
# with:
# name: nupkgs
# path: |
# Artifacts/*.nupkg
# Artifacts/*.snupkg

10 changes: 5 additions & 5 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageVersion Include="Google.Protobuf" Version="3.25.3" />
<PackageVersion Include="Grpc.Net.Client" Version="2.61.0" />
<PackageVersion Include="Grpc.Tools" Version="2.62.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="Google.Protobuf" Version="3.32.1" />
<PackageVersion Include="Grpc.Net.Client" Version="2.71.0" />
<PackageVersion Include="Grpc.Tools" Version="2.72.0"/>
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<!-- Test -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
Expand All @@ -15,7 +15,7 @@
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Testcontainers.Milvus" Version="3.8.0" />
<PackageVersion Include="Testcontainers.Milvus" Version="4.7.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
</ItemGroup>
</Project>
5 changes: 2 additions & 3 deletions Milvus.Client.Tests/AliasTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,11 @@ public async Task InitializeAsync()
await Collection.DropAsync();
Collection = await Client.CreateCollectionAsync(
CollectionName,
new[]
{
[
FieldSchema.Create<long>("id", isPrimaryKey: true),
FieldSchema.CreateVarchar("varchar", 256),
FieldSchema.CreateFloatVector("float_vector", 2)
});
]);
}

private readonly MilvusClient Client;
Expand Down
44 changes: 19 additions & 25 deletions Milvus.Client.Tests/CollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public async Task Create_Exists_and_Drop()
{
MilvusCollection collection = await Client.CreateCollectionAsync(
CollectionName,
new[] { FieldSchema.Create<long>("id", isPrimaryKey: true) });
[FieldSchema.Create<long>("id", isPrimaryKey: true), FieldSchema.CreateFloatVector("vec", 32)]);
Assert.True(await Client.HasCollectionAsync(CollectionName));

await collection.DropAsync();
Expand All @@ -24,8 +24,7 @@ public async Task Describe()

var collection = await Client.CreateCollectionAsync(
CollectionName,
new[]
{
[
FieldSchema.Create<long>("book_id", isPrimaryKey: true, autoId: true),
FieldSchema.Create<bool>("is_cartoon", description: "Some cartoon"),
FieldSchema.Create<sbyte>("chapter_count"),
Expand All @@ -37,7 +36,7 @@ public async Task Describe()
FieldSchema.CreateVarchar("book_name", maxLength: 256, isPartitionKey: true),
FieldSchema.CreateFloatVector("book_intro", dimension: 2),
FieldSchema.CreateJson("some_json")
},
],
shardsNum: 2,
consistencyLevel: ConsistencyLevel.Eventually);

Expand Down Expand Up @@ -182,7 +181,7 @@ public async Task Rename()

var collection = await Client.CreateCollectionAsync(
CollectionName,
new[] { FieldSchema.Create<long>("id", isPrimaryKey: true) });
[FieldSchema.Create<long>("id", isPrimaryKey: true), FieldSchema.CreateFloatVector("vec", 32)]);

await collection.RenameAsync(renamedCollectionName);

Expand All @@ -197,11 +196,10 @@ public async Task Load_Release()
{
var collection = await Client.CreateCollectionAsync(
CollectionName,
new[]
{
[
FieldSchema.Create<long>("id", isPrimaryKey: true),
FieldSchema.CreateFloatVector("float_vector", 2)
});
]);

await collection.CreateIndexAsync(
"float_vector", IndexType.Flat, SimilarityMetricType.L2, "float_vector_idx", new Dictionary<string, string>());
Expand All @@ -223,11 +221,10 @@ public async Task List()
{
var collection = await Client.CreateCollectionAsync(
CollectionName,
new[]
{
[
FieldSchema.Create<long>("id", isPrimaryKey: true),
FieldSchema.CreateFloatVector("float_vector", 2)
});
]);

await collection.CreateIndexAsync(
"float_vector", IndexType.Flat, SimilarityMetricType.L2, "float_vector_idx", new Dictionary<string, string>());
Expand All @@ -250,24 +247,22 @@ public async Task GetEntityCount()
{
var collection = await Client.CreateCollectionAsync(
CollectionName,
new[]
{
[
FieldSchema.Create<long>("id", isPrimaryKey: true),
FieldSchema.CreateFloatVector("float_vector", 2)
});
]);

Assert.Equal(0, await collection.GetEntityCountAsync());

await collection.InsertAsync(
new FieldData[]
{
[
FieldData.Create("id", new long[] { 1, 2 }),
FieldData.CreateFloatVector("float_vector", new ReadOnlyMemory<float>[]
{
FieldData.CreateFloatVector("float_vector",
[
new[] { 1f, 2f },
new[] { 3f, 4f }
})
});
])
]);

await collection.FlushAsync();

Expand All @@ -280,11 +275,10 @@ public async Task Compact()
{
var collection = await Client.CreateCollectionAsync(
CollectionName,
new[]
{
[
FieldSchema.Create<long>("id", isPrimaryKey: true),
FieldSchema.CreateFloatVector("float_vector", 2)
});
]);

long compactionId = await collection.CompactAsync();
if (await Client.GetParsedMilvusVersion() >= new Version(2, 4))
Expand All @@ -311,11 +305,11 @@ public async Task Create_in_non_existing_database_fails()

var exception = await Assert.ThrowsAsync<MilvusException>(() => databaseClient.CreateCollectionAsync(
"foo",
new[] { FieldSchema.Create<long>("id", isPrimaryKey: true) }));
[FieldSchema.Create<long>("id", isPrimaryKey: true), FieldSchema.CreateFloatVector("vec", 32)]));

// Expected: UnexpectedError, Actual: 65535
// Assert.Equal(MilvusErrorCode.UnexpectedError, exception.ErrorCode);
Assert.Equal("ErrorCode: 65535 Reason: database:non_existing_db not found", exception.Message);
Assert.Equal("ErrorCode: 800 Reason: database not found[database=non_existing_db]", exception.Message);
}

public CollectionTests(MilvusFixture milvusFixture)
Expand Down
53 changes: 25 additions & 28 deletions Milvus.Client.Tests/DataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ public async Task Upsert()
{
await Collection.InsertAsync(
[
FieldData.Create("id", new[] { 1L }),
FieldData.CreateFloatVector("float_vector", new ReadOnlyMemory<float>[] { new[] { 20f, 30f } })
FieldData.Create("id", [1L]),
FieldData.CreateFloatVector("float_vector", [new[] { 20f, 30f }])
]);

MutationResult upsertResult = await Collection.UpsertAsync(
[
FieldData.Create("id", new[] { 1L, 2L }),
FieldData.Create("id", [1L, 2L]),
FieldData.CreateFloatVector(
"float_vector",
new ReadOnlyMemory<float>[] { new[] { 1f, 2f }, new[] { 3f, 4f } })
[new[] { 1f, 2f }, new[] { 3f, 4f }])
]);

Assert.Collection(upsertResult.Ids.LongIds!,
Expand Down Expand Up @@ -93,13 +93,13 @@ public async Task Timestamp_conversion()
{
DateTime before = DateTime.UtcNow;

await Task.Delay(100);
await Task.Delay(200);

MutationResult mutationResult = await InsertDataAsync(3, 4);

DateTime insertion = MilvusTimestampUtils.ToDateTime(mutationResult.Timestamp);

await Task.Delay(100);
await Task.Delay(200);

DateTime after = DateTime.UtcNow;

Expand Down Expand Up @@ -127,15 +127,15 @@ public async Task Flush()

[Fact]
public async Task Flush_with_not_exist_collection()
=> await Assert.ThrowsAsync<MilvusException>(() => Client.FlushAsync(new[] { "NotExist" }));
=> await Assert.ThrowsAsync<MilvusException>(() => Client.FlushAsync(["NotExist"]));

[Fact]
public async Task GetFlushState_with_empty_ids()
=> await Assert.ThrowsAsync<ArgumentException>(() => Client.GetFlushStateAsync(Array.Empty<long>()));

[Fact]
public async Task GetFlushState_with_not_exist_ids()
=> Assert.True(await Client.GetFlushStateAsync(new long[] { -1, -2, -3 })); // But return true.
=> Assert.True(await Client.GetFlushStateAsync([-1, -2, -3])); // But return true.

[Fact]
public async Task Collection_waitForFlush()
Expand All @@ -153,7 +153,7 @@ public async Task Collection_waitForFlush()
Assert.Equal(collectionDes.CollectionId, segmentInfo.CollectionId);
}

[Fact]
[Fact(Skip = "Somehow this test interferes with DatabaseTests and fails. Skip for now.")]
public async Task FlushAllAsync_and_wait()
{
await InsertDataAsync(9, 10);
Expand Down Expand Up @@ -190,30 +190,28 @@ await Client.CreateCollectionAsync(
});

await Collection.InsertAsync(
new FieldData[]
{
FieldData.Create("id", new[] { 1L, 2L }),
FieldData.CreateFloatVector("float_vector", new ReadOnlyMemory<float>[]
{
[
FieldData.Create("id", [1L, 2L]),
FieldData.CreateFloatVector("float_vector",
[
new[] { 1f, 2f },
new[] { 3f, 4f }
}),
FieldData.CreateVarChar("unknown_varchar", new[] { "dynamic str1", "dynamic str2" }, isDynamic: true),
FieldData.Create("unknown_int", new[] { 8L, 9L }, isDynamic: true)
});
]),
FieldData.CreateVarChar("unknown_varchar", ["dynamic str1", "dynamic str2"], isDynamic: true),
FieldData.Create("unknown_int", [8L, 9L], isDynamic: true)
]);
}

private async Task<MutationResult> InsertDataAsync(long id1, long id2)
=> await Collection.InsertAsync(
new FieldData[]
{
FieldData.Create("id", new[] { id1, id2 }),
FieldData.CreateFloatVector("float_vector", new ReadOnlyMemory<float>[]
{
[
FieldData.Create("id", [id1, id2]),
FieldData.CreateFloatVector("float_vector",
[
new[] { 1f, 2f },
new[] { 3f, 4f }
})
});
])
]);

public class DataCollectionFixture : IAsyncLifetime
{
Expand All @@ -233,11 +231,10 @@ public async Task InitializeAsync()

await Client.CreateCollectionAsync(
Collection.Name,
new[]
{
[
FieldSchema.Create<long>("id", isPrimaryKey: true),
FieldSchema.CreateFloatVector("float_vector", 2)
});
]);

await Collection.CreateIndexAsync("float_vector", IndexType.Flat, SimilarityMetricType.L2);
await Collection.WaitForIndexBuildAsync("float_vector");
Expand Down
22 changes: 10 additions & 12 deletions Milvus.Client.Tests/DatabaseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public async Task Create_List_Drop()

MilvusCollection collection = await DatabaseClient.CreateCollectionAsync(
"foo",
new[] { FieldSchema.Create<long>("id", isPrimaryKey: true) });
[FieldSchema.Create<long>("id", isPrimaryKey: true), FieldSchema.CreateFloatVector("vec", 32)]);

// The collection should be visible on the database-bound client, but not on the default client.
Assert.True(await DatabaseClient.HasCollectionAsync("foo"));
Expand All @@ -28,7 +28,7 @@ public async Task Create_List_Drop()
await Assert.ThrowsAsync<MilvusException>(() =>
DatabaseClient.CreateCollectionAsync(
"foo",
new[] { FieldSchema.Create<long>("id", isPrimaryKey: true) }));
[FieldSchema.Create<long>("id", isPrimaryKey: true)]));
Assert.DoesNotContain(DatabaseName, await DefaultClient.ListDatabasesAsync());
}

Expand All @@ -53,34 +53,32 @@ public async Task Search_on_non_default_database()
await DefaultClient.CreateDatabaseAsync(nameof(Search_on_non_default_database));
MilvusCollection collection = await databaseClient.CreateCollectionAsync(
"coll",
new[]
{
[
FieldSchema.Create<long>("id", isPrimaryKey: true),
FieldSchema.CreateVarchar("varchar", 256),
FieldSchema.CreateFloatVector("float_vector", 2)
});
]);

await collection.CreateIndexAsync(
"float_vector", IndexType.Flat, SimilarityMetricType.L2, "float_vector_idx", new Dictionary<string, string>());

long[] ids = { 1, 2, 3, 4, 5 };
string[] strings = { "one", "two", "three", "four", "five" };
long[] ids = [1, 2, 3, 4, 5];
string[] strings = ["one", "two", "three", "four", "five"];
ReadOnlyMemory<float>[] floatVectors =
{
[
new[] { 1f, 2f },
new[] { 3.5f, 4.5f },
new[] { 5f, 6f },
new[] { 7.7f, 8.8f },
new[] { 9f, 10f }
};
];

await collection.InsertAsync(
new FieldData[]
{
[
FieldData.Create("id", ids),
FieldData.Create("varchar", strings),
FieldData.CreateFloatVector("float_vector", floatVectors)
});
]);

await collection.LoadAsync();
await collection.WaitForCollectionLoadAsync(
Expand Down
Loading