Allowing to index byte arrays and arrays of byte arrays

Raven.Database/Indexing/AnonymousObjectToLuceneDocumentConverter.cs

@@ -115,7 +115,11 @@ private IEnumerable<AbstractField> CreateFields(string name, object value, Index
 				yield return (AbstractField)value;
 				yield break;
 			}
-
+			if(value is byte[])
+			{
+				yield return CreateBinaryFieldWithCaching(name, (byte[])value, indexDefinition.GetStorage(name, defaultStorage));
+				yield break;
+			}
 
 			var itemsToIndex = value as IEnumerable;
 			if( itemsToIndex != null && ShouldTreatAsEnumerable(itemsToIndex))
@@ -277,6 +281,23 @@ private static bool ShouldTreatAsEnumerable(IEnumerable itemsToIndex)
 
 	        return true;
 	    }
+
+		private Field CreateBinaryFieldWithCaching(string name, byte[] value, Field.Store store)
+		{
+			var cacheKey = new
+			{
+				name,
+				store,
+				multipleItemsSameFieldCountSum = multipleItemsSameFieldCount.Sum()
+			};
+			Field field;
+			if (fieldsCache.TryGetValue(cacheKey, out field) == false)
+			{
+				fieldsCache[cacheKey] = field = new Field(name, value, store);
+			}
+			field.SetValue(value);
+			return field;
+		}
 		private Field CreateFieldWithCaching(string name, string value, Field.Store store, Field.Index index)
 		{
 			var cacheKey = new

Raven.Database/Indexing/Index.cs

@@ -4,6 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -168,7 +169,8 @@ private static RavenJObject CreateDocumentFromFields(Document document, IEnumera
 					{
 						return g.First();
 					}
-					return new KeyValuePair<string, RavenJToken>(g.Key, new RavenJArray(g.Select(x => x.Value)));
+					var ravenJTokens = g.Select(x => x.Value).ToArray();
+					return new KeyValuePair<string, RavenJToken>(g.Key, new RavenJArray((IEnumerable)ravenJTokens));
 				});
 			foreach (var keyValuePair in q)
 			{
@@ -179,6 +181,8 @@ private static RavenJObject CreateDocumentFromFields(Document document, IEnumera
 
 		private static KeyValuePair<string, RavenJToken> CreateProperty(Field fld, Document document)
 		{
+			if(fld.IsBinary())
+				return new KeyValuePair<string, RavenJToken>(fld.Name(), fld.GetBinaryValue());
 			var stringValue = fld.StringValue();
 			if (document.GetField(fld.Name() + "_ConvertToJson") != null)
 			{

Raven.Tests/MailingList/Vitaly.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Linq;
+using Raven.Client.Embedded;
+using Raven.Client.Indexes;
+using Xunit;
+
+namespace Raven.Tests.MailingList
+{
+	public class Vitaly
+	{
+		public class ActivityShot
+		{
+			public byte[] Thumbnail { get; set; }
+
+			public DateTimeOffset Edited { get; set; }
+		}
+
+		public class DailyActivity
+		{
+			public DateTime Date { get; set; }
+
+			public byte[][] Thumbnails
+			{
+				get;
+				set;
+			}
+		}
+
+
+		public class DailyActivityIndex : AbstractIndexCreationTask<ActivityShot, DailyActivity>
+		{
+			public DailyActivityIndex()
+			{
+				Map = activityShots => from shot in activityShots
+									   select new
+									   {
+										   Date = shot.Edited.Date,
+										   Thumbnails = new byte[][] { shot.Thumbnail }
+									   };
+
+				Reduce = results => from result in results
+									group result by result.Date into g
+									select new
+									{
+										Date = g.Key,
+										Thumbnails = from dailyActivity in g
+													 from thumbnail in dailyActivity.Thumbnails
+													 select thumbnail
+									};
+			}
+
+		}
+
+		[Fact]
+        public void Test()
+        {
+            var activityShot1 = new ActivityShot
+                                    {
+                                        Edited = new DateTime(2011, 1, 1),
+                                        Thumbnail = new byte[] { 1 }
+                                    };
+
+            var activityShot2 = new ActivityShot
+                                    {
+                                        Edited = new DateTime(2011, 10, 10),
+                                        Thumbnail = new byte[] { 2 }
+                                    };
+
+			using (var documentStore = new EmbeddableDocumentStore
+                                           {
+                                               RunInMemory = true
+                                           }.Initialize())
+            {
+                new DailyActivityIndex().Execute(documentStore);	
+
+                using (var session = documentStore.OpenSession())
+                {
+                    session.Store(activityShot1);
+                    session.Store(activityShot2);
+
+                    session.SaveChanges();
+                }
+
+                using (var session = documentStore.OpenSession())
+                {
+                    session.Query<DailyActivity, DailyActivityIndex>().Customize(x => x.WaitForNonStaleResults()).ToArray();
+                }
+            }
+
+        }
+	}
+}

Raven.Tests/Raven.Tests.csproj

@@ -590,6 +590,7 @@
     <Compile Include="MailingList\Stats.cs" />
     <Compile Include="MailingList\TimeZoneQueries.cs" />
     <Compile Include="MailingList\transformedresults_customid_test.cs" />
+    <Compile Include="MailingList\Vitaly.cs" />
     <Compile Include="MailingList\Vlad.cs" />
     <Compile Include="ManagedStorage\Attachments.cs">
       <SubType>Code</SubType>