Merge branch 'master' into dependabot/nuget/xunit.runner.visualstudio-2.8.2

Author: atakavci

src/NRedisStack/Search/Document.cs

@@ -31,6 +31,10 @@ public static Document Load(string id, double score, byte[]? payload, RedisValue
     {
         Document ret = new Document(id, score, payload);
         if (fields == null) return ret;
+        if (fields.Length == 1 && fields[0].IsNull)
+        {
+            return ret;
+        }
         for (int i = 0; i < fields.Length; i += 2)
         {
             string fieldName = fields[i]!;

tests/Doc/Doc.csproj

@@ -14,7 +14,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -26,4 +26,4 @@
     <ProjectReference Include="..\..\src\NRedisStack\NRedisStack.csproj" />
     <ProjectReference Include="..\..\tests\NRedisStack.Tests\NRedisStack.Tests.csproj" />
   </ItemGroup>
-</Project>
+</Project>

tests/NRedisStack.Tests/NRedisStack.Tests.csproj

@@ -20,17 +20,17 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="dotenv.net" Version="3.1.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NetTopologySuite" Version="2.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageReference Include="StackExchange.Redis" Version="2.8.16" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.assert" Version="2.4.1" />
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.0" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
     <PackageReference Include="Microsoft.Azure.StackExchangeRedis" Version="3.1.0" />
   </ItemGroup>
 

tests/NRedisStack.Tests/Search/SearchTests.cs

@@ -11,7 +11,6 @@
 
 
 namespace NRedisStack.Tests.Search;
-
 public class SearchTests : AbstractNRedisStackTest, IDisposable
 {
     // private readonly string key = "SEARCH_TESTS";
@@ -3313,4 +3312,53 @@ public void TestNumericLogicalOperatorsInDialect4()
         Assert.Equal(1, ft.Search(index, new Query("@version:[123 123] | @id:[456 7890]")).TotalResults);
         Assert.Equal(1, ft.Search(index, new Query("@version==123 @id==456").Dialect(4)).TotalResults);
     }
+
+    [Fact]
+    public void TestDocumentLoad_Issue352()
+    {
+        Document d = Document.Load("1", 0.5, null, new RedisValue[] { RedisValue.Null });
+        Assert.Empty(d.GetProperties().ToList());
+    }
+
+    [SkipIfRedis(Is.OSSCluster)]
+    public void TestDocumentLoadWithDB_Issue352()
+    {
+        IDatabase db = redisFixture.Redis.GetDatabase();
+        db.Execute("FLUSHALL");
+        var ft = db.FT();
+
+        Schema sc = new Schema().AddTextField("first", 1.0).AddTextField("last", 1.0).AddNumericField("age");
+        Assert.True(ft.Create(index, FTCreateParams.CreateParams(), sc));
+
+        Document droppedDocument = null;
+        int numberOfAttempts = 0;
+        do
+        {
+            db.HashSet("student:1111", new HashEntry[] { new("first", "Joe"), new("last", "Dod"), new("age", 18) });
+
+            Assert.True(db.KeyExpire("student:1111", TimeSpan.FromMilliseconds(500)));
+
+            Boolean cancelled = false;
+            Task searchTask = Task.Run(() =>
+            {
+                for (int i = 0; i < 100000; i++)
+                {
+                    SearchResult result = ft.Search(index, new Query());
+                    List<Document> docs = result.Documents;
+                    if (docs.Count == 0 || cancelled)
+                    {
+                        break;
+                    }
+                    else if (docs[0].GetProperties().ToList().Count == 0)
+                    {
+                        droppedDocument = docs[0];
+                    }
+                }
+            });
+            Task.WhenAny(searchTask, Task.Delay(1000)).GetAwaiter().GetResult();
+            Assert.True(searchTask.IsCompleted);
+            Assert.Null(searchTask.Exception);
+            cancelled = true;
+        } while (droppedDocument == null && numberOfAttempts++ < 3);
+    }
 }