Making sure to compare (in code) in the same manner as we compare in …

…Esent for starts with
ravendb · Nov 13, 2015 · 1d7bdba · 1d7bdba
1 parent 675b411
commit 1d7bdba
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 0 deletions.
diff --git a/Raven.Database/Storage/Esent/StorageActions/Documents.cs b/Raven.Database/Storage/Esent/StorageActions/Documents.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -418,13 +419,44 @@ public IEnumerable<JsonDocument> GetDocumentsWithIdStartingWith(string idPrefix,
             {
                 var keyFromDb = Api.RetrieveColumnAsString(session, Documents, tableColumnsCache.DocumentsColumns["key"], Encoding.Unicode);
                 if (keyFromDb.StartsWith(idPrefix, StringComparison.OrdinalIgnoreCase) == false)
+                {
+                    if (StartsWithIgnoreCaseAndSymbols(keyFromDb, idPrefix))
+                        continue;
                     yield break;
+                }
 
                 yield return ReadCurrentDocument();
                 take--;
             } while (Api.TryMoveNext(session, Documents) && take > 0);
         }
 
+        private bool StartsWithIgnoreCaseAndSymbols(string keyFromDb, string idPrefix)
+        {
+            var keyPos = 0;
+            for (int i = 0; i < idPrefix.Length; i++)
+            {
+                var idChar = idPrefix[i];
+                if(char.IsSymbol(idChar) ||
+                    char.IsPunctuation(idChar))
+                    continue;
+                char keyChar;
+                do
+                {
+                    if (keyPos >= keyFromDb.Length)
+                        return false; // too short
+                    keyChar = keyFromDb[keyPos++];
+                } while (char.IsSymbol(keyChar) || char.IsPunctuation(keyChar));
+                if(idChar == keyChar)
+                    continue;
+                // maybe different casing?
+                if(char.ToUpperInvariant(keyChar) ==
+                    char.ToUpperInvariant(idChar))
+                    continue;
+                return false;
+            }
+            return true;
+        }
+
         public Etag GetEtagAfterSkip(Etag etag, int take, CancellationToken cancellationToken)
         {
             Api.JetSetCurrentIndex(session, Documents, "by_etag");

diff --git a/Raven.Tests.MailingList/Raven.Tests.MailingList.csproj b/Raven.Tests.MailingList/Raven.Tests.MailingList.csproj
@@ -471,6 +471,7 @@
     <Compile Include="UpdatingData.cs" />
     <Compile Include="UriProperty.cs" />
     <Compile Include="UrlInIdsRepro.cs" />
+    <Compile Include="UsingLoadStartsWithAndDashSepartor.cs" />
     <Compile Include="VacancyCampaignsTests.cs" />
     <Compile Include="ValerioBorioni.cs" />
     <Compile Include="Vicente.cs" />

diff --git a/Raven.Tests.MailingList/UsingLoadStartsWithAndDashSepartor.cs b/Raven.Tests.MailingList/UsingLoadStartsWithAndDashSepartor.cs
@@ -0,0 +1,38 @@
+// -----------------------------------------------------------------------
+//  <copyright file="UsingLoadStartsWithAndDashSepartor.cs" company="Hibernating Rhinos LTD">
+//      Copyright (c) Hibernating Rhinos LTD. All rights reserved.
+//  </copyright>
+// -----------------------------------------------------------------------
+using System.Threading;
+using Raven.Json.Linq;
+using Raven.Tests.Common;
+using Xunit;
+using Xunit.Extensions;
+
+namespace Raven.Tests.MailingList
+{
+    public class UsingLoadStartsWithAndDashSeperator : RavenTest
+    {
+        [Theory]
+        [PropertyData("Storages")]
+        public void ShouldWork(string storage)
+        {
+            using (var store = NewDocumentStore(requestedStorage: storage))
+            {
+
+
+                //store.DocumentDatabase.Documents.Put("delivery-ORT0529.2", null, new RavenJObject(),
+                //  new RavenJObject(), null);
+                store.DocumentDatabase.Documents.Put("DeliveryReport-1000", null, new RavenJObject(),
+                    new RavenJObject(), null);
+
+                store.DocumentDatabase.Documents.Put("delivery-RT0753.2", null, new RavenJObject(),
+                  new RavenJObject(), null);
+
+                int nextStart = 0;
+                var docs = store.DocumentDatabase.Documents.GetDocumentsWithIdStartingWith("delivery-", null, null,0, 1024, CancellationToken.None, ref nextStart);
+                Assert.Equal(1, docs.Length);
+            }
+        }
+    }
+}