Merge pull request #479 from microsoft/fasterlog-waitasync-end-false

[C#] Fixes to WaitAsync, list Azure device contents
microsoft · May 21, 2021 · 1b3100d · 1b3100d
2 parents 5501dfb + d10b9d5
commit 1b3100d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cs/src/core/Index/FasterLog/FasterLogIterator.cs b/cs/src/core/Index/FasterLog/FasterLogIterator.cs
@@ -116,6 +116,8 @@ public ValueTask<bool> WaitAsync(CancellationToken token = default)
 
             if (!scanUncommitted)
             {
+                if (NextAddress >= endAddress)
+                    return new ValueTask<bool>(false);
                 if (NextAddress < fasterLog.CommittedUntilAddress)
                     return new ValueTask<bool>(true);
 

diff --git a/cs/src/devices/AzureStorageDevice/AzureStorageNamedDeviceFactory.cs b/cs/src/devices/AzureStorageDevice/AzureStorageNamedDeviceFactory.cs
@@ -91,7 +91,7 @@ public IEnumerable<FileDescriptor> ListContents(string path)
                 };
             }
 
-            foreach (var entry in baseRef.ListBlobs().Where(b => b as CloudPageBlob != null)
+            foreach (var entry in baseRef.GetDirectoryReference(path).ListBlobs().Where(b => b as CloudPageBlob != null)
                 .OrderByDescending(f => ((CloudPageBlob)f).Properties.LastModified))
             {
                 yield return new FileDescriptor