Skip to content

Commit 38a88ad

Browse files
authored
Merge branch 'main' into federated-multisearch
2 parents fcf9073 + 80ab22f commit 38a88ad

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET Core
1818
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: 3.1.101
20+
dotnet-version: 8.x
2121
- name: Get the latest Meilisearch RC
2222
run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
2323
- name: Meilisearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ volumes:
55

66
services:
77
package:
8-
image: mcr.microsoft.com/dotnet/sdk:6.0
8+
image: mcr.microsoft.com/dotnet/sdk:8.0
99
tty: true
1010
stdin_open: true
1111
working_dir: /home/package

src/Meilisearch/Meilisearch.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<InvariantGlobalization>true</InvariantGlobalization>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
25+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.7.0" />
2626
<PackageReference Include="System.Net.Http.Json" Version="6.0.2" />
2727
</ItemGroup>
2828

src/Meilisearch/Stats.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ namespace Meilisearch
99
/// </summary>
1010
public class Stats
1111
{
12-
public Stats(long databaseSize, DateTime? lastUpdate, IReadOnlyDictionary<string, IndexStats> indexes)
12+
public Stats(long databaseSize, DateTime? lastUpdate, IReadOnlyDictionary<string, IndexStats> indexes, long usedDatabaseSize)
1313
{
1414
DatabaseSize = databaseSize;
1515
LastUpdate = lastUpdate;
1616
Indexes = indexes;
17+
UsedDatabaseSize = usedDatabaseSize;
1718
}
1819

1920
/// <summary>
@@ -22,6 +23,12 @@ public Stats(long databaseSize, DateTime? lastUpdate, IReadOnlyDictionary<string
2223
[JsonPropertyName("databaseSize")]
2324
public long DatabaseSize { get; }
2425

26+
/// <summary>
27+
/// Gets the total space used by the data stored in Meilisearch.
28+
/// </summary>
29+
[JsonPropertyName("usedDatabaseSize")]
30+
public long UsedDatabaseSize { get; }
31+
2532
/// <summary>
2633
/// Gets last update timestamp.
2734
/// </summary>

tests/Meilisearch.Tests/Meilisearch.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="FluentAssertions" Version="7.0.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1919
<PackageReference Include="xunit" Version="2.7.0" />
2020
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
2121
</ItemGroup>

0 commit comments

Comments
 (0)